5bf55eacfd
Merge remote-tracking branch 'origin/3.3.5' into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
src/server/game/Instances/InstanceScript.h
src/server/scripts/Northrend/isle_of_conquest.cpp
src/server/shared/Database/Implementation/LoginDatabase.cpp
src/server/shared/Database/Implementation/LoginDatabase.h
2014-10-19 00:18:06 +01:00
15a9c6729e
Scripts/Commands: Implement mutehistory command for GM's with requested improvements
...
Closes #13350
2014-10-18 23:34:18 +01:00
f21b55068c
Script/Spell: fix Mixology value bonus
...
Closes #13297
Fixes #2172
This might not be best solution but a better way could not be found for the moment.
2014-10-18 22:36:31 +01:00
2f016098c2
Scripts/Commands: Implement commands to set and get boss states during run time
...
Closes #13186
2014-10-18 22:05:04 +01:00
98e1e06830
Scripts/MC: Rework Shazzrah script and implement spell script
...
Closes #13317
2014-10-18 22:57:30 +02:00
5ede64260c
Core/BattlegroundIC:
...
* Fixed Catapults
* Fixed Graveyards
* Fixed Cannons on Gunships
* More Blizzlike Teleport to Gunship
* Fixed Gunship Teleport to Hangar
* Fixed Teleporters
Closes #13052
Fixes #12323 and #9557
2014-10-18 21:33:21 +01:00
e07d3ebe4e
SQL: Rename file added in PR
2014-10-18 20:58:07 +01:00
670d12722c
Merge pull request #13245 from Mihapro/4.3.4
...
DB/Quests: Fear No Evil changes
2014-10-18 18:59:31 +01:00
e806fc8a02
Core/Quest: implement Quest Tracker
2014-10-18 18:37:39 +02:00
35bd935779
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/PetitionsHandler.cpp
2014-10-18 00:32:39 +02:00
c5ef82cc48
DB/Creature: More SAI update to CmC
...
By Malcrom, master of fixes.
bye master.
2014-10-17 01:21:20 +02:00
5d50e43063
DB/Misc: Add some missing emote texts
2014-10-16 15:41:35 +01:00
4542773912
DB/Misc: Chill Nymph's Do Not Speak in Common
...
Dont know why some of the texts used by 23678 (Chill Nymph) had language 7 when both in Broadcast text and in sniff these are language 0
2014-10-15 01:43:19 +01:00
dd0f79bd26
DB/Texts: Added missing creature texts to uncomplete fixes
2014-10-13 16:31:22 -04:00
5dcdf8a0e6
DB/SAI: Prevent infinite loop
...
Just another brick in the wall... thanks @cr4st
2014-10-13 18:04:14 +02:00
1ef31ba752
Battle.net: Implemented cache stream items
2014-10-13 17:22:24 +02:00
42f5017261
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Handlers/MiscHandler.cpp
2014-10-12 21:46:40 +02:00
9922063021
DB/Loot: Xandivious (15623) - forgot item 12002
...
Thanks @Aminxhm
2014-10-12 20:09:24 +02:00
7252f11add
DB/Loot: Xandivious (15623)
2014-10-12 19:51:23 +02:00
2df0144714
Revert bfc6044
2014-10-12 19:38:56 +02:00
882cb2b32b
DB/SAI: Prevent endless loops with linked events
2014-10-12 19:31:00 +02:00
bfc6044c66
DB/Spell: Do not let Ebon Plague stack from different casters
...
Closes #12314
Updates #1818
By unholychick
2014-10-12 19:07:27 +02:00
a9cd76f101
DB/Spell: Delete no longer needed hack
...
By unholychick
2014-10-12 19:02:22 +02:00
091534dc6f
Rename SQL files. It's not November, yet.
2014-10-12 11:52:55 +02:00
02192ab870
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-10-12 02:02:07 +02:00
1e2f49082e
DB/Creature: Fix Brazie Gatz
...
By Exodius, closes #13237
2014-10-12 01:17:54 +02:00
753affc591
DB/Text: Added creature texts to Karazhan NPCs
2014-10-11 18:05:41 -04:00
9c61f2ce0c
DB/Quest: A Visit to the Doctor
...
Closes #9986
2014-10-11 22:40:04 +01:00
20549fc3b5
DB/Creature: Brazie Gatz
...
By Foldy, updates #13237
2014-10-11 22:21:07 +02:00
d02f437513
Add new line at end of file.
2014-10-11 21:27:02 +02:00
dd6b484132
DB/SAI: Make several credit spell casts working (broken due to wrong target)
2014-10-11 21:24:39 +02:00
c05a4189e2
DB/Misc: Convert Schematic: Field Repair Bot 74A to db
...
By Killyana, closes #13314
2014-10-11 18:56:37 +02:00
51f3dcd2cd
DB/Quest: The Root of all Evil
...
By @KIllyana, closes #13308
Theres a slight issue where until npc is agrod will continuously spam Aura of Rot, due to evade mechanics and the event to cast this been action 25 reset ie gets stuck in a loop.
2014-10-11 15:53:02 +01:00
e73101862b
DB/Quest: On Ruby Wings
...
By @Killyana based on original work by @Nevadas,
Closes #9683
2014-10-11 13:20:01 +01:00
402ac71ee8
DB/Creature: Fix coords for one creature
2014-10-11 05:27:14 +02:00
35b14f15e1
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-10-11 03:47:17 +02:00
5d0cc2e531
DB/Gameobject: Revert hack in cabfcb1a3d
2014-10-11 03:02:47 +02:00
ab08083d6c
DB/SAI: Fix startup errors
2014-10-11 00:29:35 +02:00
d760579dd6
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-10-10 21:43:33 +02:00
4cc5c11b7e
DB/Gameobject: add loot for Cologne/Perfume Neutralizer
2014-10-10 19:15:43 +02:00
39362fe3d4
DB/Gameobject: Add 2 more missing gameobjects
2014-10-10 19:13:31 +02:00
3b03798a48
DB/Gameobject: Add loot for The Root of All Evil
2014-10-10 18:19:14 +02:00
4888269c7f
DB/Loot: Toravon It should drop 2 Emblems of Frost in 10 and 25 player
...
By Pirricli, closes #13293
2014-10-10 18:16:25 +02:00
7a8c251c37
DB/Gameobject: Add missing gameobject
2014-10-10 17:33:14 +02:00
c63ad4ccfa
DB/Creature: fixed issue when Valkyrs (Argent Tournament) could kill their guards and players in combat distance.
2014-10-10 14:42:06 +02:00
63d7b348bb
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-10-10 05:29:06 +02:00
16cbdcde54
DB/Creature: Ravandwyr
...
* Script repeating random trick event
* Script replacement of Archmage Vargoth's Staff
Thanks to @Kittnz for getting data on last missing event.
2014-10-09 20:26:50 +01:00
ea17cfb92d
DB/Spell: Scrape Corrosive Spit
...
By Rushor and untaught, closes #12189
2014-10-09 16:55:41 +02:00
bec9e277bd
DB/Spells: Add Naxxramas teleports coords
...
By dr-j, closes #13255
2014-10-09 00:20:39 +02:00
d77ff3098e
Fix typo which was causing error about duplicate entry
2014-10-08 14:14:33 +01:00
DDuarte