blub
41817bc259
Merge pull request #8917 from joschiwald/spellscripts_reorder2
...
Misc: Reorder more scripts in some script files and some cosmetic stuff
2013-01-11 17:50:48 -08:00
Vincent_Michael
7fbd6d33dd
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-12 02:38:34 +01:00
joschiwald
95f8068a6f
Misc: Reorder more scripts in some script files and some cosmetic stuff
2013-01-12 02:16:30 +01:00
Vincent_Michael
2fcd4c381c
DB/Conditions: Convert shadowstep spell script in conditions
2013-01-11 23:37:54 +01:00
Vincent_Michael
66e8d8c69e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Instances/InstanceScript.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSession.h
src/server/scripts/Spells/spell_priest.cpp
src/server/scripts/Spells/spell_rogue.cpp
2013-01-11 19:10:10 +01:00
Vincent_Michael
d6d2cb0490
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-11 14:58:57 +01:00
Vincent_Michael
ecbcca8794
Core: Whitespace cleanup
2013-01-11 14:49:38 +01:00
Vincent_Michael
6cd962ee71
Core: Fix non pch build
2013-01-11 14:21:39 +01:00
krofna
dc30c63533
Script/AQ Implement Ayamiss the Hunter and fix screwup in my Ossirian
...
Closes #8862
Signed-off-by: Nay <dnpd.dd@gmail.com >
2013-01-11 12:52:19 +00:00
joschiwald
0c16b95905
Misc: Reorder scripts in some script files and some cosmetic stuff
2013-01-11 04:18:02 +01:00
Malcrom
ddea01290c
Core/Scriptd: Rewrite :)
2013-01-10 20:50:32 -03:30
Malcrom
0b50520df7
Core/scripting: Updating Scholomance scripts
2013-01-10 20:08:30 -03:30
Blipi
ed21a589bb
Quest 4901 "Guardians of the Altar"
2013-01-11 00:26:26 +01:00
Vincent_Michael
e6c8cc91ca
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-10 14:52:34 +01:00
Warpten
c9650de789
Scripts/ZulAman: Fixed a crash caused by the grid.
...
Closes #8885 .
2013-01-10 10:41:46 +01:00
Vincent_Michael
899ffde1f9
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-09 21:15:41 +01:00
Vincent_Michael
7210ffe34d
Core: Fix warnings
2013-01-09 21:14:12 +01:00
Spp
677ed18080
Core/Dungeon Finder: Fix group (5) unable to do new dungeon after finished last dungeon
...
- Some optimizations here and there
- Drop unused columns related to dungeon rewards
- Simplify Group reward. All people inside the dungeon should get the reward, no matter how far it's from the boss
2013-01-09 15:15:42 +01:00
Vincent_Michael
9f9f797d5d
Scripts/TOCR: Fix some faction champions crash
...
Closes #8393
2013-01-08 23:01:26 +01:00
Vincent_Michael
db330750b7
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
2013-01-08 16:32:54 +01:00
Vincent_Michael
d36d2eac76
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-08 16:28:37 +01:00
Malcrom
7c5597a697
Core/Scripting: Update Scholomance Scripts
2013-01-08 00:47:20 -03:30
Malcrom
f81f8ec41b
Core/Scripting: Compile fix
2013-01-07 23:02:17 -03:30
Malcrom
43d73bebd0
Core/Scripting: Some cleanup
2013-01-07 22:48:40 -03:30
Malcrom
2a9fc5198b
Core/Scripting: Move Nightbane text to creature text
2013-01-07 22:44:09 -03:30
Malcrom
0226048686
Core/Scripting: Update Script for Postmaster Malown
2013-01-07 22:13:04 -03:30
Malcrom
0105bc849f
Core/Scripting: Misc clean up and a warning fix
2013-01-07 21:47:38 -03:30
Malcrom
70977f3097
Core/Scripting: Misc fixes
2013-01-07 20:18:47 -03:30
Malcrom
1c77eee917
Core/Scripting: Move Text for Shirrak the Dead Watcher to creature text
2013-01-07 19:50:31 -03:30
Malcrom
5ce88118ee
Core/Scripting: Move Text for Timmy the Cruel to creature text
2013-01-07 19:27:35 -03:30
Vincent_Michael
8c58184535
Core: Fix non pch build
2013-01-07 23:40:20 +01:00
Vincent_Michael
8f36383d39
Core: Fix build
2013-01-07 23:28:03 +01:00
Malcrom
a8374bd001
Core/Scripting: Some cleanup
2013-01-07 18:39:30 -03:30
blub
be5d3e5fd8
Merge pull request #8755 from krofna/crofixes
...
Script/AQ: Implement Buru the Gorger
2013-01-07 14:04:53 -08:00
blub
669e2ed20f
Merge pull request #8725 from krofna/krefixes
...
Script/AQ: Rewrite Skeram
2013-01-07 14:03:28 -08:00
Malcrom
55d3e8adaa
Core/Scripting: Move Text for Zul'jin to creature text
2013-01-07 18:14:30 -03:30
Malcrom
61fa397117
Core/Scripting: Move Text for Baron Rivendare to creature text.
2013-01-07 17:22:14 -03:30
Malcrom
3d1f61b278
Core/Scripting: Move Text for Ayamiss the Hunter to creature text
2013-01-07 16:29:20 -03:30
Malcrom
609232dfbe
Core/Scripting: Move Text for Archavon the Stone Watcher to creature text
2013-01-07 16:12:49 -03:30
Malcrom
74b4dbec3f
Core: Scripting: Convert Text for boss Archaedas to creature text
2013-01-07 15:54:11 -03:30
Malcrom
9d1ad8ab3a
Core/Scripts: Move text for Boss Akil'zon to db.
2013-01-07 15:31:38 -03:30
Malcrom
601f118f29
Core/Scripting: Move some text to creature text.
2013-01-07 14:20:52 -03:30
Malcrom
1bb8b9325a
Core/Scripting: Script Updates
2013-01-07 12:48:28 -03:30
Malcrom
0533d63a77
Core/Scripting: Gong Event updates
2013-01-07 12:34:58 -03:30
Vincent_Michael
b69dff28db
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
...
Conflicts:
src/server/game/World/World.cpp
src/server/worldserver/worldserver.conf.dist
2013-01-07 16:57:39 +01:00
blub
9ad1857e59
Merge pull request #8826 from joschiwald/mmaps_disable
...
Core/MMaps: use DisableMgr to disable pathfinding on a specific map
2013-01-07 07:52:35 -08:00
Vincent_Michael
ecedb798aa
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Conditions/ConditionMgr.h
2013-01-07 16:39:01 +01:00
Malcrom
c3166b8608
Core/scripting: Fix zulaman.cpp
2013-01-06 23:16:06 -03:30
Malcrom
14feb316e1
Core/scripting: Update zulaman script
2013-01-06 22:58:58 -03:30
Malcrom
832cd198ca
Core/scripting: More updates for gong event. Almost complete.
2013-01-06 22:39:41 -03:30
blub