fca4a5448a
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-10-07 14:30:37 +02:00
a0c637f52a
Core/Scripts: added some OVERRIDEs
2013-09-25 16:37:43 +02:00
ae221b0f02
Scripts/SteamVault: reworked InstanceScript
2013-09-23 22:00:42 +02:00
974bf5c427
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Accounts/RBAC.h
src/server/game/Battlegrounds/ArenaTeam.cpp
2013-09-11 22:35:45 +02:00
625e47e9d3
Scripts/Murmur: Remove unused field
...
Remove unused class field.
2013-09-11 20:00:29 +02:00
ce742dc7a0
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/Battleground.h
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Guilds/Guild.cpp
2013-09-09 18:26:31 +02:00
e8675dd4ed
Scripts/Blood Furnace: Fix possible compile errors on old VS versions
2013-09-07 15:17:56 +01:00
d25c2e7f5b
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Guilds/Guild.h
src/server/game/Spells/SpellMgr.cpp
src/tools/map_extractor/loadlib.cpp
2013-09-05 16:46:14 +02:00
07d793b94b
Core/Misc: Fixed some more issues found by static code analysis tools.
2013-09-03 17:31:02 -05:00
97fc632b9d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Server/WorldSession.cpp
2013-09-01 23:48:40 +02:00
79d1b7f543
Scripts/Misc: Removed unused fields and fixed a warning about uninitialized value
2013-09-01 20:33:52 +02:00
224c5c5d3d
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/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/World/World.h
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
src/server/worldserver/worldserver.conf.dist
2013-08-30 21:43:02 +02:00
7776016106
Core/Quests: Remove CastedCreatureOrGO method
...
- Remove EAI's ACTION_T_CAST_EVENT and ACTION_T_CAST_EVENT_ALL
- Remove SAI's SMART_ACTION_CALL_CASTEDCREATUREORGO
- Split QUEST_TRINITY_FLAGS_KILL_OR_CAST into QUEST_TRINITY_FLAGS_KILL and QUEST_TRINITY_FLAGS_CAST
- Assign QUEST_TRINITY_FLAGS_CAST to all the quests that were using RequiredSpellCastX
- (unrelated) Fix a warning in Player.cpp
- Replace CastedCreatureOrGO usage in scripts by KilledMonsterCredit
TODO: Convert the two EAI scripts commented out in the .sql to proper SAI
Closes #10667
2013-08-30 19:32:08 +01:00
3166638078
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
2013-08-28 19:24:01 +02:00
78786c7b54
Core&Scripts: Fix clang compiler warnings
2013-08-27 23:47:03 +01:00
14d80d269d
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Globals/ObjectMgr.cpp
2013-08-27 16:10:11 +01:00
2aa944caee
Scripts/Auchindoun: add missing InstanceScripts and cleanup some boss scripts
2013-08-26 18:52:29 +02:00
2050a36b58
SAI & Scripts: Fix unitialized values found by Valgrind
...
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x19B3031: boss_skarvald_the_constructor::boss_skarvald_the_constructorAI::UpdateAI(unsigned int) (boss_skarvald_dalronn.cpp:217)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x19B3948: boss_dalronn_the_controller::boss_dalronn_the_controllerAI::UpdateAI(unsigned int) (boss_skarvald_dalronn.cpp:388)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x15E2FCC: SmartScript::ProcessAction(SmartScriptHolder&, Unit*, unsigned int, unsigned int, bool, SpellInfo const*, GameObject*) (SmartScript.cpp:144)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191CB98: dummy_dragonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:961)
==3064== by 0x191D242: npc_shadron::npc_shadronAI::UpdateAI(unsigned int) (boss_sartharion.cpp:1122)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x19AE913: boss_ymiron::boss_ymironAI::UpdateAI(unsigned int) (boss_ymiron.cpp:215)
==3064== Use of uninitialised value of size 8
...
==3064== by 0x18A9F4A: boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() (boss_illidan.cpp:1805)
==3064== Conditional jump or move depends on uninitialised value(s)
...
==3064== by 0x18A9F4A: boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() (boss_illidan.cpp:1805)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191CB98: dummy_dragonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:961)
==3064== by 0x191CE88: npc_tenebron::npc_tenebronAI::UpdateAI(unsigned int) (boss_sartharion.cpp:1027)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191CB98: dummy_dragonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:961)
==3064== by 0x191D5B8: npc_vesperon::npc_vesperonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:1220)
==3064== Conditional jump or move depends on uninitialised value(s)
...
==3064== by 0x1868F59: boss_lady_vashj::boss_lady_vashjAI::Reset() (boss_lady_vashj.cpp:206)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191C14C: dummy_dragonAI::MovementInform(unsigned int, unsigned int) (boss_sartharion.cpp:802)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x1046986: Position::NormalizeOrientation(float) (Object.h:388)
...
==3064== by 0x17D9463: boss_malchezaar::boss_malchezaarAI::SummonInfernal(unsigned int) (boss_prince_malchezaar.cpp:373)
2013-08-26 16:13:26 +01:00
a7527b3b48
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/tools/map_extractor/mpq_libmpq04.h
2013-08-25 14:12:32 +01:00
a0a377a0ce
Scripts: Fix two issues found by Valgrind
...
==3400== Invalid write of size 8
==3400== at 0x1241C32: instance_ahnkahet::GetInstanceScript(InstanceMap*) const (instance_ahnkahet.cpp:54)
...
==3400== Conditional jump or move depends on uninitialised value(s)
==3400== at 0xB5DEAE: std::tr1::_Hashtable<unsigned long, std::pair<unsigned long const, Creature*>, std::allocator<std::pair<unsigned long const, Creature*> >, std::_Select1st<std::pair<unsigned long const, Creature*> >, std::equal_to<unsigned long>, std::tr1::hash<unsigned long>, std::tr1::__detail::_Mod_range_hashing, std::tr1::__detail::_Default_ranged_hash, std::tr1::__detail::_Prime_rehash_policy, false, false, true>::_M_find_node(std::tr1::__detail::_Hash_node<std::pair<unsigned long const, Creature*>, false>*, unsigned long const&, unsigned long) const (hashtable.h:830)
==3400== by 0xBDA4CA: std::tr1::_Hashtable<unsigned long, std::pair<unsigned long const, Creature*>, std::allocator<std::pair<unsigned long const, Creature*> >, std::_Select1st<std::pair<unsigned long const, Creature*> >, std::equal_to<unsigned long>, std::tr1::hash<unsigned long>, std::tr1::__detail::_Mod_range_hashing, std::tr1::__detail::_Default_ranged_hash, std::tr1::__detail::_Prime_rehash_policy, false, false, true>::find(unsigned long const&) (hashtable.h:698)
==3400== by 0xBDA5BF: HashMapHolder<Creature>::Find(unsigned long) (ObjectAccessor.h:67)
==3400== by 0xCB5C03: Map::GetCreature(unsigned long) (ObjectAccessor.h:114)
==3400== by 0xB6E6EF: Unit::GetCreature(WorldObject&, unsigned long) (Unit.cpp:13023)
==3400== by 0x10F0790: boss_hydross_the_unstable::boss_hydross_the_unstableAI::Reset() (boss_hydross_the_unstable.cpp:164)
2013-08-24 01:54:37 +01:00
99081bcf54
Merge branch 'master' of github.com:TrinityCore/TrinityCore
2013-08-22 13:48:47 +02:00
8e833743d4
Scripts/GruulsLair: reworked InstanceScript
...
Known Issue: position desynch after creature respawn
2013-08-22 13:47:54 +02:00
dc86e87f25
Scripted/ShadeOfAkama: Some cleanups
2013-08-21 19:58:12 +02:00
a383885f5c
Scripts/AhnKahet: reworked InstanceScript
2013-08-21 19:43:46 +02:00
1e89ae1960
Core: Fix warnings and random changes
2013-08-21 18:46:52 +02:00
62c7e309ee
Scripts/BlackTemple: reworked InstanceScript
2013-08-21 12:29:28 +02:00
34cd8e808e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
2013-08-20 17:48:18 +02:00
e0f010b310
Scripts: Random script fixes and code optimizations
2013-08-19 20:03:06 +02:00
f16f427c48
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/CMakeLists.txt
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
src/server/scripts/Spells/spell_hunter.cpp
2013-08-18 18:13:14 +02:00
7dbf68cbfc
Scripted/Misc: Remove some whitespace
2013-08-18 02:07:13 +02:00
2b19ba1879
Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes
2013-08-18 01:41:10 +02:00
da1e466bd5
Core/Misc: Implemented GetObjectScale function
2013-08-17 23:47:43 +02:00
7c7f19228e
Core/Scripts: Placeholders for instances The Slave Pens and The Underbog.
...
It is needed for Random Dungeon Finder credit.
2013-08-17 17:50:33 +03:00
bb9614d00d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
2013-08-10 17:58:53 +02:00
8acefbff8c
Scripted: Use now override for instance scripts
2013-08-10 17:42:12 +02:00
2c6f5e1b61
Scripted: Remove Whitespace/Tabs
2013-08-09 20:37:09 +02:00
80d7c093eb
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-08-08 20:56:27 +02:00
090f348d59
Scripting/Sethekk Halls: Move Boss Anzu from EAI to CPP and some cleanup.
2013-08-07 18:53:17 -02:30
2daa8ed56f
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Spells/spell_generic.cpp
2013-08-07 20:07:05 +02:00
1e8fd6489d
Core: Fix non pch build
2013-08-07 18:44:23 +02:00
0667e89005
Scripts/DrakTharonKeep: add some spellscripts, add yells to novos, and do some cosmetic changes
2013-08-07 17:31:36 +02:00
f4815fbf80
Scripting/Mana Tombs: Move Yor scripting from EAI to CPP.
2013-08-07 11:42:13 -02:30
c0fc0f237f
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/shared/DataStores/DBCFileLoader.h
2013-08-07 11:59:51 +02:00
75e6c40630
Core/Misc: Rename some no name enums
2013-08-06 21:16:05 +02:00
39cce3344c
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
2013-08-02 14:41:33 +02:00
ac10589eda
Core/Misc: Fixed some issues found by Coverity Scan
2013-08-01 21:31:11 +02:00
56bd42dcf1
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/World/World.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
2013-07-15 18:04:04 +02:00
7104e3c70f
Core: Fix build
2013-07-15 17:44:32 +02:00
de193fc80d
Scripted: Add some missing override
2013-07-15 15:14:01 +02:00
baeecba6c9
Core: Fix build
2013-07-15 01:07:02 +02:00
Shauren