Commit Graph

7228 Commits

Author SHA1 Message Date
Shauren
5daf3d3606 Merge branch 'master' into 4.3.4 2014-07-18 21:21:17 +02:00
Aokromes
b5cb3da857 DB/Misc: Adition to 9f0ec86
By dr-j
2014-07-16 11:53:54 +02:00
Aokromes
a61cea1e54 DB/Misc: Fix Gossip on Kor'kron overseer
By dr-j, closes #12514
2014-07-16 08:37:35 +02:00
Aokromes
e373f75ceb DB/Quest: Fix Banishing Portal
By dr-j, closes #12510
2014-07-16 00:18:01 +02:00
Aokromes
9f0ec867c4 DB/Quest: Sarkoth
By dr-j, closes #12511
2014-07-16 00:11:40 +02:00
Aokromes
7be070359b DB/SAI: Adition to 70c82a3
By dr-j
2014-07-15 12:44:54 +02:00
Aokromes
d4e8eae705 DB/Creature: Stinker
By dr-j, closes #12502
2014-07-15 07:14:02 +02:00
Dr-J
3629c4128f DB/Misc: Fix Frogger (Naxxramas)
Closes #12434
2014-07-15 00:26:02 +02:00
Vincent-Michael
13ff07f121 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/scripts/Commands/cs_wp.cpp
2014-07-14 21:01:55 +02:00
Aokromes
70c82a385f DB/Creature: Script a lot of creatures
By dr-j, closes #12498
2014-07-14 19:07:47 +02:00
Aokromes
2beced7135 DB/Quest: Hive'Zora Scout Report
By dr-j, closes #781
2014-07-14 00:24:38 +02:00
Aokromes
28e0f92229 DB/Misc: Update to badac94
By dr-j
2014-07-13 23:03:39 +02:00
Aokromes
fa770897cc DB/Quest: Investigate the Alchemist Shop
Original work by Rushor, finished by dr-j, closes #9717
2014-07-13 22:40:47 +02:00
Aokromes
badac945f4 DB/Quest: Let Them Not Rise
By dr-j, closes #12484
2014-07-13 22:30:09 +02:00
Aokromes
5c9e8fa557 DB/Gameobject: Deeprun Chest
Closes #12430
2014-07-13 20:46:11 +02:00
Vincent-Michael
877fc267df DB/Player: Update player create info skills for 4.3.4 2014-07-13 00:26:03 +02:00
Aokromes
29e6765885 DB/Creature: Summoning the Princess
By dr-j, closes #12370
2014-07-12 20:31:00 +02:00
Vincent-Michael
0f5c481cd4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/SkillHandler.cpp
2014-07-12 18:08:30 +02:00
Aokromes
442a94fc68 DB/Quest: Solof's Booty
By dr-j closes #9673
2014-07-12 16:49:19 +02:00
Vincent-Michael
f185077fbf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-10 23:10:22 +02:00
Vincent-Michael
bb7233baa3 Core/LFG: Added support for display of required item level. for player / group member 2014-07-10 21:45:11 +02:00
Aokromes
2e6e7a830f DB/Misc: Adition to a8b05db 2014-07-10 13:52:16 +02:00
Vincent-Michael
44c0eb4418 DB/Misc: Fix startup errors 2014-07-10 01:45:24 +02:00
Vincent-Michael
8b071221df SQL: Fix wpp fail :/ 2014-07-10 00:51:11 +02:00
Vincent-Michael
b817515957 SQL: Fix end of line 2014-07-10 00:43:45 +02:00
Vincent-Michael
823acba5cb DB/Creature: Spawn Agatha for first undead quests 2014-07-10 00:41:55 +02:00
Aokromes
a8b05dba7d DB/Creature: Grimtotem Spirit-Shifter
By dr-j, closes #5176
2014-07-09 23:54:33 +02:00
Aokromes
5f0fe95965 DB/Quest: The Rune of Command
By dr-j, closes #3639
2014-07-09 23:17:24 +02:00
Vincent-Michael
79062dd5ae Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp
2014-07-09 21:09:47 +02:00
Vincent-Michael
c8eb69df10 Core/Player: Added support cast spell for some class spells (Warlock / Hunter pet, "Battle Stance" and "Frost Presence") on first login... 2014-07-09 20:34:39 +02:00
Aokromes
b78d0a1c6d DB/Quest: Dissension Amongst the Ranks...
By dr-j, closes #4826
2014-07-09 18:06:39 +02:00
Aokromes
e112c3248f DB/Gameobject: Template updates for gameobject 1721 (Locked ball and chain) 2014-07-09 17:47:08 +02:00
Aokromes
16afa71031 DB/Quest: Fix remaining issues with Argent Tournament Chaining
By dr-j, closes #12455
2014-07-09 17:34:23 +02:00
joschiwald
7a67d816d9 Core/Battleground:
* added a possibility to reload battleground templates
* cleaned up the template structure
* use mapids from BattlemasterList.dbc to calculate random bg
2014-07-09 16:43:56 +02:00
Aokromes
5f69fc9660 Fix typo on bb8922a 2014-07-09 15:05:09 +02:00
Aokromes
40f0964050 Fix typo on 077c6e1 2014-07-09 14:53:46 +02:00
Vincent-Michael
a96771aca6 DB/Creature: Update some wrong creature_template_addon 2014-07-09 13:52:54 +02:00
Aokromes
fc89b558cc DB/Creature: Opus must have 4 random models
Closes #12404
2014-07-09 12:56:13 +02:00
Vincent-Michael
6a6403a54e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/CMakeLists.txt
2014-07-09 10:23:14 +02:00
Aokromes
bb8922a5e4 DB/Misc: Chromie at begining of The Culling of Stratholme
By w1sht0l1v3, updates #5516
2014-07-09 08:58:27 +02:00
Aokromes
077c6e1484 DB/Creature: Eredar Deathbringer
By Hobbilis, closes #9573
2014-07-08 21:51:47 +02:00
Aokromes
7fe9c171aa DB/Quest: Get the Key
By dr-j, closes #6523
2014-07-08 21:27:17 +02:00
Aokromes
66f9528918 DB/Quest: Search and Rescue
By dr-j, closes #3349
2014-07-08 21:25:32 +02:00
Aokromes
b0361b278e DB/Quest: Meeting the Warchief completion text typo
By Crysicle, closes #12451
2014-07-08 20:46:46 +02:00
Aokromes
0bf5a8d666 DB/Quest: Envoy to the Horde missing progress
By Crysicle, closes #12450
2014-07-08 20:02:15 +02:00
Aokromes
48d284e88e DB/Quest: Heroes of Old
By dr-j, closes #3674
2014-07-08 16:17:38 +02:00
Aokromes
199c88542d DB/Misc: Brewfest Stuff
By dr-j, closes #12445
2014-07-08 15:58:48 +02:00
Vincent-Michael
f9b5cea15c SQL: Sync auth_database
thx to @Wulfr
Close #12443
2014-07-08 11:45:46 +02:00
Vincent-Michael
e5306b973f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-08 09:26:26 +02:00
Aokromes
aa5304aeb2 DB/Creature: Spawn Eris Havenfire
By dr-j, closes #2456
2014-07-08 07:14:26 +02:00