df0519607c
Merge remote-tracking branch 'origin/master' into mmaps
2012-09-23 22:17:52 +01:00
95d713ac6f
Merge remote-tracking branch 'origin/master' into 4.3.4
2012-09-22 10:56:41 +01:00
a916227938
[DB/GameEvents] Correct length of Brewfest event
...
Credits goes to nelegalno
Closes #7826
2012-09-22 11:26:59 +02:00
e9a2b3f10e
Scripts/Sm: Fix quest I was a lot of things
...
(Modified - Nayd)
Closes #6295
Closes #7577
2012-09-22 02:26:55 +01:00
53cd8cf684
Rename SQL after PR merge
2012-09-22 02:07:19 +01:00
435a240a9f
Merge pull request #7551 from Gacko/utgarde
...
Utgarde Keep
2012-09-21 18:05:11 -07:00
0b7a59a98a
Merge remote-tracking branch 'origin/master' into mmaps
2012-09-22 02:03:36 +01:00
7090197c6a
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Spells/Auras/SpellAuras.cpp
2012-09-22 02:02:57 +01:00
b779aa0848
DB: Utgarde Keep - Codestyle
2012-09-21 09:29:40 +02:00
f25ff104ef
Core/DB: Utgarde Keep - Codestyle and eventmap
2012-09-21 09:20:29 +02:00
ee6ff0e5ed
Core/DB: Utgarde Keep
2012-09-20 17:45:11 +02:00
8ccb95e8c8
DB/Achievements: Dwarfageddon (10/25) repair previous fix
...
* Remake SAI in a way it will work with a broken attribute for cast while dead
* Null some fields in spell.dbc, add proper attributes in case it get fixed and fix spell radius type
* Add conditions to prevent lag
Renew commit: 61d7252
2012-09-19 21:10:58 +03:00
09b47ecad1
DB/Loot: Fix loot for VoA (thx to Gecko32 for the work)
...
closes #6833
2012-09-19 11:23:03 +02:00
863229afbe
Merge remote-tracking branch 'origin/master' into mmaps
2012-09-19 00:02:25 +01:00
63f88dd03c
DB/Creatures: Update Razorscale movement
2012-09-18 23:58:38 +01:00
def796c5c8
DB/Creatures: Update unit_flags2 for some ulduar creatures
2012-09-18 23:58:36 +01:00
0e7ed5ec85
Core/Spells: Implementing some hooks for split damage taken, fixes the limitation of dmg such auras can split, for example at Hand of Sacrifice. Might have unexpected results, but they are called unexpected for a reason.. .Author Tibbi
...
closes #6025
Made new one as https://github.com/TrinityCore/TrinityCore/pull/7423/ was closed.
2012-09-18 23:28:46 +03:00
378f83df4e
DB/Creatures: Update Razorscale movement
2012-09-18 18:20:49 +02:00
959aa4cd97
DB/Creatures: Update unit_flags2 for some ulduar creatures
2012-09-18 17:44:20 +02:00
23961d0dce
Merge remote-tracking branch 'origin/master' into mmaps
2012-09-17 23:50:08 +01:00
6568b0624d
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_druid.cpp
2012-09-17 23:49:13 +01:00
64115461fa
DB/Quests: fix The Scarlet Oracle, Demetria ( Closes #7773 ) and The Call to Command quest chain ( Closes #7673 )
...
DB/Creature: fixes sound for Twilight Lord Kelris (Closes #7309 )
2012-09-17 13:11:23 -04:00
198c0346e2
Merge pull request #7797 from Warpten/kingOfTehWorld
...
Core/Spells: Fixed King of the Jungle. (alphabetical order!)
2012-09-17 09:44:56 -07:00
80b3531890
DB/Spells: fix a typo from the previous commit. im back!
2012-09-17 12:34:11 -04:00
b7de25d170
DB/Spells: fix DoT bonus for Righteous Vengance
2012-09-17 12:23:54 -04:00
2b9232dddc
Core/Spells: Fixed King of the Jungle.
...
Closes #7098
2012-09-17 18:17:23 +02:00
d3dd3a2b83
DB/Spells: fix druid final lifebloom tick closes #6707 (thx diton)
2012-09-17 10:17:52 -04:00
2431895a54
Merge remote-tracking branch 'origin/master' into mmaps
...
Conflicts:
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
2012-09-17 00:04:07 +01:00
e3add09fb7
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
2012-09-17 00:03:12 +01:00
bb03cfb0a2
DB/Spells: Fix druid's Savage Roar
...
SpellScript was bound to the wrong spell
Closes #2669
2012-09-16 14:48:39 +01:00
72f26fe357
SQL: Rename SQL
2012-09-16 14:12:35 +02:00
5bc913d1da
SQL: Add newlines to end of file
2012-09-16 14:08:40 +02:00
59e86f8df9
DB/Creatures: Fix "Frostbrood Vanquisher" flying
...
CLoses #5927
2012-09-15 23:20:58 +02:00
d6b60ce51c
Merge pull request #7782 from Trista/master
...
DB/Skettis: Remove uneeded additions from previous commit and add con…
2012-09-15 14:16:13 -07:00
1a992bea9f
DB/Skettis: Remove uneeded additions from previous commit and add conditions
...
* The GO spawn is uneeded and so all connected with it, sorry I failed, the spell is enough
* Conditions thanks to Vincent-Michael and Shauren /noticing my retardness/
2012-09-15 23:44:18 +03:00
d079a834c4
DB/Loot: Fix typo in Ionar loot (thx DarkJaxyChan)
...
Closes #7765
2012-09-15 22:38:19 +02:00
883db2af3e
Core/Conditions: Convert CONDITION_MAP_DIFFICULTY in CONDITION_SPAWNMASK for more handling
2012-09-15 22:32:10 +02:00
a95511f35e
(TDB 335.49) Also move 4.x-only SQLs to the old directory
2012-09-15 21:18:23 +01:00
06f96f47e7
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
sql/old/3.3.5a/2012_08_06_00_world_command.sql
sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
sql/old/4.3.4/2012_08_06_00_world_command_434.sql
sql/updates/characters/2012_08_07_00_characters_characters.sql
sql/updates/characters/2012_08_07_00_characters_characters_434.sql
sql/updates/world/2012_08_06_00_world_command.sql
2012-09-15 21:13:35 +01:00
0d3554d4bf
TDB 335.49 - 2012/09/15
2012-09-15 21:03:40 +01:00
8e5578e664
Merge remote-tracking branch 'origin/master' into mmaps
2012-09-15 19:51:09 +01:00
966283168c
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
2012-09-15 19:50:11 +01:00
80006a275f
SQL: Rename SQL
2012-09-15 20:45:51 +02:00
572b644060
DB/Loot: Fix Sister Svalna loot
2012-09-15 20:32:30 +02:00
7b3ea36c8c
Merge pull request #7777 from Trista/master
...
Scripts/Oculus: Support for achievements Ruby, Emerald and Amber Void
2012-09-15 07:44:49 -07:00
0b2fb4a5a8
DB/Loot: fix startuperrors caused by previous lootidfix, porting the wrong way :)
2012-09-15 16:37:45 +02:00
548a487721
Scripts/Oculus: Support for achievements Ruby, Emerald and Amber Void
...
* Add instance achievement criteria scripts and remove from disables. Based on retail data.
* A lot more compact style and specify only for heroic, thanks to Vincent-Michael. Tested.
This involves everything needed by the achievement, however the dungeon still needs majour fixes/rewrite.
2012-09-15 17:31:57 +03:00
b9b344eb88
Merge pull request #7766 from Faq/Misc0
...
DB/SAI: correct Fix npc Scrapped Fel Reaver. thnx Expecto
2012-09-14 09:05:51 -07:00
6dd32f56a8
DB/Loot: i am full of fail
2012-09-14 11:45:14 -03:00
5bd486712b
DB/Loot: fix error from previous commit
2012-09-14 11:41:27 -03:00
Nay