araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 06:00:10 -04:00
Code Issues Packages Projects Releases Wiki Activity
21,105 Commits 17 Branches 140 Tags
b2134dbbe300f6b0ff55d551295a56a67748056f
Commit Graph

6026 Commits

Author SHA1 Message Date
Nay b2134dbbe3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
 2013-08-26 12:40:41 +01:00
Filip a4fcbd1a36 DB/SAI: Ribbly Screwspigot (4136) 
Fixes #6911
 2013-08-26 02:01:23 +02:00
Filip 608f9e7a54 DB/SAI: Out of Body Experience (12327) 
Fixes #3084
 2013-08-26 01:27:54 +02:00
Filip eeb2102d5f DB/Sai: Make cauldrons reward buffs 2013-08-25 18:48:24 +02:00
Nay a7527b3b48 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/tools/map_extractor/mpq_libmpq04.h
 2013-08-25 14:12:32 +01:00
raczman ba22baebbd Core/Auth: Implement time-based token for user login as described in RFC 6238. 
New column in account table is a base32 of token key bytes,
coincidentally it is the same format Google's Authenticator Android app uses.
If you want that to work, set system time on server correctly and use ntpd.

Closes #10527

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-08-25 14:02:40 +01:00
Vincent-Michael 174efdf05f DB/Creature: Fix startup errors 2013-08-25 02:15:08 +02:00
Filip 61016dcc66 DB/SAI: Cannot Reproduce (13320,13355) & Retest Now (13321,13322,13356,13357) 2013-08-24 20:17:18 +02:00
Filip 5a06f3c90c DB/SAI: The Last of Her Kind credit update 
By @untaught, fixes #10254
 2013-08-24 18:00:46 +02:00
Filip adaf5b3d48 DB/Conditions: Awakening Rod 2013-08-24 17:37:00 +02:00
Filip 4d098b0871 [DB/SAI] Sleeping Giants (11432 & 11433) 2013-08-24 16:34:23 +02:00
Filip 95bdde84d9 [DB/Errors] Really fix a few more errors. 2013-08-23 20:00:55 +02:00
Filip 04707b1287 [DB/Errors] Fix a few DB errors. 2013-08-23 18:11:11 +02:00
Filip 97a9b7695a [DB/SAI]: I've Got a Flying Machine! (11390) 
Fixes #6609
 2013-08-22 16:59:56 +02:00
Filip ce7ac33a42 [DB/SAI] Vile Like Fire! 
Fixes #6524
 2013-08-22 15:53:31 +02:00
Vincent-Michael 34cd8e808e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
 2013-08-20 17:48:18 +02:00
Filip d74b8f0a1a DB: Fixup for last file name 2013-08-20 00:46:56 +02:00
Shauren 8ae88954aa Delete 2013_08_19_02_world_sai.sql 
Removed file which broke the repo (tab in name)
 2013-08-20 00:31:05 +02:00
Filip 651285173d [DB/MISC]: To Rule The Skies (23061) & Onyx Scales 2013-08-19 23:46:39 +02:00
joschiwald e0f010b310 Scripts: Random script fixes and code optimizations 2013-08-19 20:03:06 +02:00
Vincent-Michael 9727cc49ef Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-19 15:05:11 +02:00
Filip 5ec04483cb [DB/SAI] Rejek: First Blood 
Fixes #6113
 2013-08-19 01:17:14 +02:00
Vincent-Michael f16f427c48 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2013-08-18 18:13:14 +02:00
Vincent-Michael c32dbd1432 Core/Spells: Fix hunter T7 4P Bonus 
Closes #8320
 2013-08-18 00:55:44 +02:00
Filip 865353e4a6 [DB/MISC] Spawn entry for TEMP Blackhoof Village Windmill 2013-08-17 23:28:32 +02:00
WishToDie 6a7ac8cef9 Fix typo in commit 7c7f19228e 2013-08-18 00:05:02 +03:00
w1sht0l1v3 1ad954e215 Core/Scripts: Placeholders for instances Maraudon and Dire Maul. 
It is needed for Random Dungeon Finder credit.
 2013-08-17 19:14:48 +03:00
w1sht0l1v3 7c7f19228e Core/Scripts: Placeholders for instances The Slave Pens and The Underbog. 
It is needed for Random Dungeon Finder credit.
 2013-08-17 17:50:33 +03:00
Filip 08133c7fef [DB/MISC] Appropriate GO id 2013-08-17 14:31:31 +02:00
w1sht0l1v3 0333d22fe9 Core/Scripts: Placeholder for instance Ragefire Chasm. 
It is needed for Random Dungeon Finder credit.
 2013-08-17 15:25:09 +03:00
w1sht0l1v3 7b9f34afc5 Core/Scripts: Placeholder for instance The Stockade. 
It is needed for Random Dungeon Finder credit.
Correct entry for last encounter in the instance.
 2013-08-17 14:59:49 +03:00
Filip 918427dcb1 [DB/SAI]: Unleash the Raptors (11147) 
Fixes #9728
 2013-08-16 22:45:23 +02:00
Filip 724f843d55 Merge pull request #10553 from MitchesD/creature_addon 
DB/Creature: Add missing creature_addon
 2013-08-16 13:40:16 -07:00
MitchesD 5a7fb5a6cf DB/Creature: Add missing creature_addon 2013-08-16 22:12:34 +02:00
Filip a4f7f43319 DB Error fixes. 2013-08-16 21:33:39 +02:00
Vincent-Michael 74689b1d93 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-16 18:35:54 +02:00
Filip 99a3df6e20 [DB/SAI]: Digging Through Bones (10922) 
Fixes #3231
 2013-08-16 16:13:53 +02:00
MitchesD 90dcb2a448 Scripts/DrakTharonKeep: update Tharon'Ja 
- update Tharon Ja to BossAI
- update one creature - cosmetic npc

Closes #10524
 2013-08-16 14:34:42 +02:00
Xanvial 01178f5958 Core/Spells: Fix paladin talent "Grand Crusader" 
Closes #9072

Signed-off-by: Vincent-Michael <Vincent_Michael@gmx.de>
 2013-08-16 00:04:52 +02:00
Vincent-Michael 443940c084 DB/Spells: Fix shaman talent "Tidal Waves" drop charges with effect 1 2013-08-15 22:41:53 +02:00
Vincent-Michael 21fe779dfb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-15 16:49:58 +02:00
Shauren 4d260a54ae Core/Spells: Fixed warrior T10 4p dps bonus 
Closes #493
 2013-08-15 16:39:31 +02:00
Vincent-Michael 0e966c11e2 SQL: Add missing newline in 5890f95f7c 2013-08-15 16:21:31 +02:00
Kirkhammett 43c218ad21 [DB/SAI]: Lumber Hack (12050) 2013-08-15 15:59:18 +02:00
Kirkhammett e0e236967b Revert "Lumber Hack (12050)" 
This reverts commit 40ec7f7979.
 2013-08-15 15:56:44 +02:00
Kirkhammett 40ec7f7979 Lumber Hack (12050) 
Fixes #4560
 2013-08-15 15:55:19 +02:00
Vincent-Michael 8b0cec3d55 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Spells/SpellInfo.cpp
 2013-08-15 08:13:08 +02:00
Discover- 8c961687a0 Core/SmartAI: Implement SMART_EVENT_FRIENDLY_HEALTH_PCT. 
On current clean TDB, there are a total of 106 creatures using
   SMART_EVENT_FRIENDLY_HEALTH (non-PCT) which has a flat first parameter, but
   only 8 of these use the event correctly (and therefore only 8 of them
   actually work).

Closes #10520
 2013-08-15 01:18:10 +01:00
ZxBiohazardZx 22d07db886 DB/commit: the mining is also useable for 434, thus removed the _335 tag 2013-08-15 01:04:29 +02:00
Vincent-Michael 65e345dab7 DB/Gameobject: Spawn or respawn missing or bad spawned gameobjects "Coldwind Tree" / "Poster Knife" 2013-08-14 20:21:11 +02:00