Commit Graph

9086 Commits

Author SHA1 Message Date
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
Nay
d0e4e20265 Merge pull request #8825 from joschiwald/vmapspelligno
Core/VMaps: drop "vmap.ignoreSpellIds" in config
this is not longer necessary since we use SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS
2013-01-07 07:36:40 -08:00
Malcrom
161caf860b Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2013-01-06 23:17:41 -03:30
Malcrom
c3166b8608 Core/scripting: Fix zulaman.cpp 2013-01-06 23:16:06 -03:30
Nay
5f28502c0a Merge pull request #8738 from joschiwald/spell_proc_conditions
Core/Conditions: implement CONDITION_SOURCE_TYPE_SPELL_PROC and use it i...
2013-01-06 18:29:55 -08:00
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
Valcorb
8743e9d368 Fix a small typo 2013-01-07 00:55:11 +01:00
Valcorb
8d9476fd9c Make sure that "guardians" also gain the owner's speed 2013-01-06 22:35:25 +01:00
Malcrom
3710ca5faf Core/Scripting: Small fix to Zul'Aman script Thanks joschiwald. 2013-01-06 12:38:26 -03:30
Malcrom
8361931b37 Core/Scripting: Move Kirtonos pathing to db looks smoother. 2013-01-06 12:04:02 -03:30
Malcrom
90c182dce4 Core/Scripting: Fix silly error 2013-01-06 01:08:25 -03:30
Malcrom
82d4559507 Core/Script: Update Gong Event 2013-01-06 01:05:25 -03:30
Malcrom
ed83397a67 Core/Scripts: Some cleanup of Zul'aman Instance script. Gong event in progress and will allow doors to open. 2013-01-05 20:15:46 -03:30
Malcrom
385940aeea Core/Scripting: Fix typo 2013-01-05 18:10:14 -03:30
Vincent_Michael
ff3928ca6d Core: Fix warnings 2013-01-05 20:30:57 +01:00
Gacko
ea72933608 Fix non PCH build 2013-01-05 19:10:18 +01:00
Gacko
c86230208f Script: Novos rewrite 2013-01-05 18:03:11 +01:00
Vincent_Michael
d5163d846f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.cpp
2013-01-05 17:01:46 +01:00
Vincent_Michael
24e0eb1812 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2013-01-05 16:55:17 +01:00
Vincent_Michael
7dd0cd4403 Core: Fix non pch build 2013-01-05 16:33:28 +01:00
Machiavelli
b52346522e Core/Vehicles: Add some internal checks in vehicle code to prevent crashable behaviour caused by scripts or other areas of the core. 2013-01-05 15:40:36 +01:00
Shauren
32fa3f6018 Merge pull request #8848 from NightQuest/save_hook
Core/Scripts: Created a hook for when a player is about to be saved.
2013-01-05 05:16:30 -08:00
Shauren
f6b6558814 Scripts/Firelands: Fixed a *major* mistake in previous commit 2013-01-05 13:14:44 +01:00
Shauren
7e29e0d2b2 Scripts/Firelands: Implemented Alysrazor's trash event 2013-01-05 00:59:33 +01:00
Nay
82555a444c Core/Spline: Fix typo, I blame not enough Ctrl+S 2013-01-04 23:44:25 +00:00
Malcrom
3661353e12 Core/Scripting: Fix Typo. 2013-01-04 19:58:16 -03:30
Nay
a509aea659 Core/Misc: Fix a couple of warnings, some of them performance related
Errors were found using Cppcheck, open-source static analysis tool
2013-01-04 23:14:14 +00:00
Malcrom
e0a5aabaf7 Core/Scripting: Update Kirtonos script. 2013-01-04 19:41:57 -03:30
Subv
bb1c955c8b Scripts/HallsOfOrigination: Added script for Anraphet and the Vault of Lights.
Some bugs might still remain.
Crumbling Ruin spell has a problem with radius handling.
2013-01-04 18:07:56 -05:00
Nay
8ac5b3b7d6 Core/Player: Prevent a crash in CastedCreatureOrGO and add an assertion to KilledMonster 2013-01-04 21:15:18 +00:00
Nay
e5945402ad Core/Misc: Use ASSERT (custom, better macro) instead of the C macro assert() 2013-01-04 20:59:24 +00:00
Machiavelli
9f32cd44e4 Update src/server/game/Achievements/AchievementMgr.cpp
Prevent achievement completion log spam.
2013-01-04 18:37:15 +01:00
Malcrom
bf19adec0f Core/Scripts: Some cleanup for boss_kirtonos_the_herald script 2013-01-04 12:34:35 -03:30
Malcrom
306d59cb51 Core/Scripting: Add a few includes to boss_kirtonos_the_herald. 2013-01-04 07:25:32 -03:30
Malcrom
e8ca1d5cd1 Core/Scripting: Add Kirtonos The Herald to c++ scripting. Combat still not finished. 2013-01-04 01:00:51 -03:30
Subv
ef9f2aca0d Merge pull request #8753 from MrSmite/Pet_SpeedFix
Fix pets lagging behind and despawning
2013-01-03 17:04:50 -08:00
Vincent_Michael
8db66bfefd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-04 01:27:51 +01:00
Vincent_Michael
0f71fd8e23 Core: Fix build 2013-01-03 23:48:50 +01:00
Vincent_Michael
00ca57e2cf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Commands/cs_reload.cpp
2013-01-03 23:41:36 +01:00
Vincent_Michael
a28d2d22f3 Core: Fix non pch build 2013-01-03 23:40:12 +01:00
Nay
9394dc10b4 Core/Scripts: Drop gameobject_scripts table - empty, deprecated and no longer needed 2013-01-03 19:18:26 +00:00
Shauren
59e4f6eb05 Core/SmartScripts: Fixed SAI targets 10 & 14 (SMART_TARGET_CREATURE_GUID, SMART_TARGET_GAMEOBJECT_GUID)
Note: If you used these targets to perform actions across maps, it will not work anymore, this functionality is deprecated as it was not safe.
2013-01-03 19:22:12 +01:00
Vincent_Michael
f6ee4e3769 Core: Fix build 2013-01-03 18:15:23 +01:00
Vincent_Michael
6889f7cde6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
2013-01-03 18:07:53 +01:00
Vincent_Michael
fe6dc5c3cd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-03 18:05:45 +01:00
Vincent_Michael
6a29a957dd Core/Spells: Rename SPELL_EFFECT_PLAYER_NOTIFICATION to SPELL_EFFECT_PLAY_SOUND 2013-01-03 18:00:26 +01:00
Vincent_Michael
eba9abd2ee Core/Spells: Update no fly zone for wintergrasp 2013-01-03 17:37:39 +01:00
Vincent_Michael
aa43ecd18d Core/Spells: Removed no fly zone for dalaran 2013-01-03 16:58:38 +01:00