Nay
863229afbe
Merge remote-tracking branch 'origin/master' into mmaps
2012-09-19 00:02:25 +01:00
Nay
139cdf5254
Small correction to readme file
2012-09-18 23:58:39 +01:00
Vincent-Michael
63f88dd03c
DB/Creatures: Update Razorscale movement
2012-09-18 23:58:38 +01:00
Shauren
361034e848
Scripts/Icecrown Citadel: Fixed Unbound Plague
...
Closes #7791
2012-09-18 23:58:37 +01:00
Vincent-Michael
def796c5c8
DB/Creatures: Update unit_flags2 for some ulduar creatures
2012-09-18 23:58:36 +01:00
Nay
92119c9c38
Small correction to readme file
2012-09-18 23:49:35 +01:00
Faq
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
Vincent-Michael
378f83df4e
DB/Creatures: Update Razorscale movement
2012-09-18 18:20:49 +02:00
Shauren
cc08d911f6
Scripts/Icecrown Citadel: Fixed Unbound Plague
...
Closes #7791
2012-09-18 18:11:22 +02:00
Vincent-Michael
959aa4cd97
DB/Creatures: Update unit_flags2 for some ulduar creatures
2012-09-18 17:44:20 +02:00
Spp
69ad5e8c4b
Fix merge error
2012-09-18 14:54:56 +02:00
Spp
761060e1f1
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/LootHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Spells/Spell.cpp
2012-09-18 14:38:44 +02:00
Spp
8c5f011e79
Core/Achievements: Force all calls to AchievementMgr be done through Player functions (Remove GetAchievementMgr)
...
Note: No real use in 3.3.5 but will be used in 4.3.4
2012-09-18 14:29:53 +02:00
Spp
c4d4beff3b
Warning fixes and some minor changes here and there
...
- Added GetAchievementPoints to AchievementMgr
2012-09-18 11:35:18 +02:00
kaelima
b5af7c5c2e
Core/Defines: Updated SpellCustomErrors and HolidayIds to 4.3.4
2012-09-18 01:31:38 +02:00
kaelima
c83d2dc406
Core/Protocol: Implemented CMSG_OPENING_CINEMATIC and enabled CMSG_GUILD_BANK_WITHDRAW_MONEY
2012-09-18 01:30:17 +02:00
Nay
23961d0dce
Merge remote-tracking branch 'origin/master' into mmaps
2012-09-17 23:50:08 +01:00
Nay
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
Nay
2e21fa6b92
Core/Dependencies: Update ACE to v6.1.4 (Windows only)
...
Tested in multiple configurations
.diff with TC changes added
2012-09-17 23:21:01 +01:00
Vincent-Michael
6ebc6b9a76
Core/SmartAI: Add missing break on 2e5e8331f3
2012-09-17 21:17:48 +02:00
Kandera
cc86f567ab
Core/SmartAI: fix SMART_ACTION_SET_FLY. was backwards :P
2012-09-17 14:29:14 -04:00
Kandera
2e5e8331f3
Core/SmartAI: add SMART_ACTION_SET_HEALTH_REGEN (102).
2012-09-17 14:11:57 -04:00
Kandera
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
kandera
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
Kandera
80b3531890
DB/Spells: fix a typo from the previous commit. im back!
2012-09-17 12:34:11 -04:00
Kandera
b7de25d170
DB/Spells: fix DoT bonus for Righteous Vengance
2012-09-17 12:23:54 -04:00
Warpten
2b9232dddc
Core/Spells: Fixed King of the Jungle.
...
Closes #7098
2012-09-17 18:17:23 +02:00
Kandera
3f64286132
Core/Spells: fix beacon of light proc thx (oMadMono)
2012-09-17 12:08:26 -04:00
Kandera
d3dd3a2b83
DB/Spells: fix druid final lifebloom tick closes #6707 (thx diton)
2012-09-17 10:17:52 -04:00
kandera
6516139290
Merge pull request #7280 from Faq/PrayerOfMending
...
Core/Spells: Only auras that has triggered spell should proc from fully absorbed damage.
2012-09-17 06:04:55 -07:00
kaelima
639f1b6788
Core/BG: Fix logical mistake in b8d55cc019.
...
Making it again possible to leave arena queues when status is STATUS_WAIT_NONE.
Closes #7749
2012-09-17 12:06:30 +02:00
Spp
25d2ab9172
Revert last change. Leaving UpdateField names "as is"
2012-09-17 12:04:35 +02:00
Spp
74aea5e055
Cosmetic: PLAYER__FIELD_KNOWN_TITLES --> PLAYER_FIELD_KNOWN_TITLES
2012-09-17 11:49:25 +02:00
Shocker
8c4feb4c4e
Core/Battlegrounds: Use correct constant for groups iterator in BattlegroundQueue::RemovePlayer (same value, correct semantics)
2012-09-17 03:54:31 +03:00
Subv
4f21324762
Merge pull request #7793 from Elron103/pull-requests
...
Core/Calendar: Add TwoSide Interaction configuration option for Calendar...
2012-09-16 17:31:13 -07:00
hexa-
6df92dad61
Core/Calendar: Add TwoSide Interaction configuration option for Calendar Invites
2012-09-17 02:13:36 +02:00
Nay
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
Nay
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
Shauren
bc912af806
Core/Spells: Defined and implemented SPELL_ATTR5_DONT_TURN_DURING_CAST.
...
This attribute controls whether unit can turn during casting spells (fixes Ingvar's Dark Smash)
2012-09-16 23:34:30 +02:00
kaelima
b6ff06a796
Script/Misc: Fix two script crashes when spawned outside instance
...
also remove redundant null check in boss_lich_king_toc and an unused variable in npc_announcer_toc10
Closes #7785
2012-09-16 17:56:18 +02:00
Warpten
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
Vincent-Michael
72f26fe357
SQL: Rename SQL
2012-09-16 14:12:35 +02:00
Vincent-Michael
5bc913d1da
SQL: Add newlines to end of file
2012-09-16 14:08:40 +02:00
Shauren
547895762d
Compile fixes
2012-09-16 00:35:48 +02:00
Vincent-Michael
59e86f8df9
DB/Creatures: Fix "Frostbrood Vanquisher" flying
...
CLoses #5927
2012-09-15 23:20:58 +02:00
Nay
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
Nay
e7155144df
Merge pull request #7781 from Sovak/resists
...
Core/Auras: Fix some spells with effect
2012-09-15 13:57:29 -07:00
thesensei
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
Vincent-Michael
d079a834c4
DB/Loot: Fix typo in Ionar loot (thx DarkJaxyChan)
...
Closes #7765
2012-09-15 22:38:19 +02:00
Vincent-Michael
883db2af3e
Core/Conditions: Convert CONDITION_MAP_DIFFICULTY in CONDITION_SPAWNMASK for more handling
2012-09-15 22:32:10 +02:00