Retriman
|
4596fc776e
|
Core/Script: Update spelldifficulty for Boss Anubarak
|
2012-09-30 18:43:10 -04:00 |
|
Retriman
|
2e75ecd74b
|
Core/Script:
* Update creature_text for boss Jedoga Shadowseeker
|
2012-09-30 17:32:48 -04:00 |
|
Nay
|
97163a2496
|
Merge pull request #7918 from Retriman/master
Core/Script: Update creature_text for boss Herald Volazj
|
2012-09-30 08:32:59 -07:00 |
|
Retriman
|
6591dd6b10
|
Core/Script:
* Update creature_text for boss Herald Volazj
thanks @Aokromes, for soundId text
|
2012-09-30 11:29:31 -04:00 |
|
Nay
|
4c3266c7af
|
Tools&Core: Whitespace cleanup
No one likes whitespace, right?
|
2012-09-30 15:52:10 +01:00 |
|
Nay
|
94c8c7ec4e
|
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Battlefield/BattlefieldMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
|
2012-09-30 15:46:00 +01:00 |
|
Nay
|
746252fe4e
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-30 15:43:20 +01:00 |
|
Nay
|
8a18449a74
|
SQL: Rename file merged in PR; Core: cleanup whitespace and tabs
|
2012-09-30 15:33:56 +01:00 |
|
Retriman
|
8110ab1ed5
|
Core/Script:
* Update creature_text for boss Elder Nadox
* Clean Space
work whitch @Durotar
|
2012-09-30 01:28:36 -04:00 |
|
durotar
|
49179651b1
|
Core/Script: update creature_text for boss Mimiron
|
2012-09-29 14:07:52 -05:00 |
|
Subv
|
6b23d2f771
|
Core/Build: Fixed build
|
2012-09-28 19:08:01 -05:00 |
|
Subv
|
a706b8027a
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
|
2012-09-28 17:56:08 -05:00 |
|
Kandera
|
cb8fc503dd
|
Core/Battlefield: revert part of previous commit to fix build.
|
2012-09-28 10:41:44 -04:00 |
|
Subv
|
431db10e1a
|
Core/Battlefield: fix world states on player login for wintergrasp
|
2012-09-28 09:44:34 -04:00 |
|
kaelima
|
753f43718e
|
Address a few compile errors. Correct spacing in HandleMmapPathCommand.
|
2012-09-28 15:04:47 +02:00 |
|
w1sht0l1v3
|
f2e92b81a3
|
Core/Scripts: Some fixes for Razorscale.
|
2012-09-28 01:37:34 +03:00 |
|
durotar
|
7e1ee7afb1
|
Core/Script: update creature_text for Custodian of Time (quest 10277)
|
2012-09-27 12:45:39 -05:00 |
|
Nay
|
6dae8a5a49
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-25 09:27:08 +01:00 |
|
Nay
|
15c05ed771
|
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
|
2012-09-25 09:26:48 +01:00 |
|
Vincent-Michael
|
118825601b
|
Core/Spells: fix misdirection removal on cancel. Closes #7776
|
2012-09-24 12:39:02 -04:00 |
|
Xanvial
|
1c1405cb25
|
Core/Scripts: fix rotface oozes from spawning after death. Closes #7736
|
2012-09-24 12:35:09 -04:00 |
|
Kandera
|
3cf359068e
|
Core/Spells: Fix things from commit da4067cb30 thx dracosvk
|
2012-09-24 12:16:37 -04:00 |
|
faq
|
58d3758f4c
|
Core/Spell: Correcting previos PR. splitamount is already calculated in core and removing not in. variable
|
2012-09-24 18:35:10 +03:00 |
|
faq
|
da4067cb30
|
Implementing split dmg cap to Divine Sacrifice. Author Tibbi
+correcting previos sql
Closes #6024
|
2012-09-24 18:18:30 +03:00 |
|
kandera
|
a4e3709dd3
|
Merge pull request #7811 from Faq/SplitDamage2
Core/Spells: Implementing some hooks for split damage taken, fixes the l...
|
2012-09-24 05:24:01 -07:00 |
|
Nay
|
df0519607c
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-23 22:17:52 +01:00 |
|
Nay
|
1f79ac8c30
|
Merge remote-tracking branch 'origin/master' into 4.3.4
|
2012-09-23 22:17:12 +01:00 |
|
Nay
|
a7386bd1b3
|
Scripts: Fix some code style issues in scripts
|
2012-09-23 22:16:28 +01:00 |
|
Nay
|
e4d08c1186
|
Merge pull request #7555 from Gacko/quest11648
Core: Quest - The art of persuasion
|
2012-09-23 07:48:40 -07:00 |
|
Gacko
|
2da0af9595
|
Core: Utgarde Keep - Shadow Axe - MovementInform
|
2012-09-23 16:44:11 +02:00 |
|
Gacko
|
39a704671d
|
Core: Utgarde Keep - Last corrections
|
2012-09-23 16:10:46 +02:00 |
|
Warpten
|
a2c9c4098a
|
Core/Spells: Fixed Soulwell getting two charges removed (or more) per click.
|
2012-09-22 21:28:37 +02:00 |
|
Nay
|
95d713ac6f
|
Merge remote-tracking branch 'origin/master' into 4.3.4
|
2012-09-22 10:56:41 +01:00 |
|
Gacko
|
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 |
|
Nay
|
435a240a9f
|
Merge pull request #7551 from Gacko/utgarde
Utgarde Keep
|
2012-09-21 18:05:11 -07:00 |
|
Gacko
|
f25ff104ef
|
Core/DB: Utgarde Keep - Codestyle and eventmap
|
2012-09-21 09:20:29 +02:00 |
|
Shocker
|
993fb5b4a6
|
Core/Spells: Fix SPELL_AURA_MOD_CURRENCY_GAIN
|
2012-09-21 01:02:18 +03:00 |
|
Gacko
|
ee6ff0e5ed
|
Core/DB: Utgarde Keep
|
2012-09-20 17:45:11 +02:00 |
|
Nay
|
863229afbe
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-19 00:02:25 +01:00 |
|
Shauren
|
361034e848
|
Scripts/Icecrown Citadel: Fixed Unbound Plague
Closes #7791
|
2012-09-18 23:58:37 +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 |
|
Shauren
|
cc08d911f6
|
Scripts/Icecrown Citadel: Fixed Unbound Plague
Closes #7791
|
2012-09-18 18:11:22 +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 |
|
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 |
|
Warpten
|
2b9232dddc
|
Core/Spells: Fixed King of the Jungle.
Closes #7098
|
2012-09-17 18:17:23 +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 |
|