Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,138 Commits 4 Branches 146 Tags
316663807862ad2a4a24edbe8c2e508715d02cdc
Commit Graph

3238 Commits

Author SHA1 Message Date
Vincent-Michael
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
Vincent-Michael
a917461762 DB/Misc: Fix startup errors 2013-08-28 19:06:20 +02:00
joschiwald
f5f0e6439c Scripts/UtgardeKeep/Ingvar: remove hacks and fix warning 2013-08-28 17:11:14 +02:00
Nay
7135abf3a0 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2013-08-27 23:56:34 +01:00
Nay
78786c7b54 Core&Scripts: Fix clang compiler warnings 2013-08-27 23:47:03 +01:00
joschiwald
1f34284828 Scripts/UtgardeKeep: reworked InstanceScript and cleanup some boss script 2013-08-27 23:50:40 +02:00
Nay
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
joschiwald
2aa944caee Scripts/Auchindoun: add missing InstanceScripts and cleanup some boss scripts 2013-08-26 18:52:29 +02:00
Shauren
4f44cdf2b5 Core/Scripts: Fixed uninitialized variable and memory leaks 2013-08-26 17:38:02 +02:00
Nay
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
Nay
b2134dbbe3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
 2013-08-26 12:40:41 +01:00
Nay
8eaf763235 Core&Tools: Fix multiple issues found by a static code coverage tool 2013-08-26 02:00:18 +01:00
Nay
d9a136fd58 Scripts/Commands: Revert changes to cs_debug; fixes build 2013-08-25 14:38:48 +01:00
Nay
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
Nay
12973de799 Core&Tools: Fix multiple issues found by a static code coverage tool 2013-08-24 22:57:22 +01:00
Nay
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
Nay
0d44191a83 Scripts/BH: Fix non pch build - trial 2 2013-08-23 19:39:11 +01:00
Nay
9490fa5f4c Scripts/BH: Fix non pch build 2013-08-23 19:32:25 +01:00
Vincent-Michael
9461868710 Core: Fix non pch build 2013-08-23 20:09:39 +02:00
Shauren
da693bbc81 Scripts/Halls of Reflection: Fixed accessing uninitialized memory 2013-08-23 18:45:17 +02:00
Aokromes
b5362c5c45 Script/Ahnkahet: Fix warning 2013-08-23 14:47:38 +02:00
joschiwald
99081bcf54 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2013-08-22 13:48:47 +02:00
joschiwald
8e833743d4 Scripts/GruulsLair: reworked InstanceScript 
Known Issue: position desynch after creature respawn
 2013-08-22 13:47:54 +02:00
Vincent-Michael
dc86e87f25 Scripted/ShadeOfAkama: Some cleanups 2013-08-21 19:58:12 +02:00
joschiwald
a383885f5c Scripts/AhnKahet: reworked InstanceScript 2013-08-21 19:43:46 +02:00
Vincent-Michael
1e89ae1960 Core: Fix warnings and random changes 2013-08-21 18:46:52 +02:00
joschiwald
62c7e309ee Scripts/BlackTemple: reworked InstanceScript 2013-08-21 12:29:28 +02:00
joschiwald
7a14e366ac Scripts/AzjolNerub: reworked InstanceScript 2013-08-20 23:05:00 +02:00
Shauren
296da5df12 Core/Commands: Improved debug moveflags to also send associated opcodes 2013-08-20 21:16:54 +02:00
joschiwald
7e3a52bb42 Scripts/HallsOfLightning: reworked InstanceScript 2013-08-20 18:11:41 +02:00
Vincent-Michael
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
Shauren
44485a74ad Scripts/Icecrown Citadel: Fixed Ice Tomb targeting tanks in phase 3 in Sindragosa encounter 
Closes #8778
 2013-08-19 22:16:05 +02:00
joschiwald
e0f010b310 Scripts: Random script fixes and code optimizations 2013-08-19 20:03:06 +02:00
Vincent-Michael
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
Vincent-Michael
9eb01d63bd Core: Fix warnings 2013-08-18 13:54:20 +02:00
Vincent-Michael
7dbf68cbfc Scripted/Misc: Remove some whitespace 2013-08-18 02:07:13 +02:00
joschiwald
2b19ba1879 Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes 2013-08-18 01:41:10 +02:00
Vincent-Michael
c32dbd1432 Core/Spells: Fix hunter T7 4P Bonus 
Closes #8320
 2013-08-18 00:55:44 +02:00
Vincent-Michael
da1e466bd5 Core/Misc: Implemented GetObjectScale function 2013-08-17 23:47:43 +02:00
w1sht0l1v3
1ad954e215 Core/Scripts: Placeholders for instances Maraudon and Dire Maul. 
It is needed for Random Dungeon Finder credit.
 2013-08-17 19:14:48 +03:00
w1sht0l1v3
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
w1sht0l1v3
0333d22fe9 Core/Scripts: Placeholder for instance Ragefire Chasm. 
It is needed for Random Dungeon Finder credit.
 2013-08-17 15:25:09 +03:00
w1sht0l1v3
7b9f34afc5 Core/Scripts: Placeholder for instance The Stockade. 
It is needed for Random Dungeon Finder credit.
Correct entry for last encounter in the instance.
 2013-08-17 14:59:49 +03:00
Vincent-Michael
74689b1d93 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-16 18:35:54 +02:00
MitchesD
90dcb2a448 Scripts/DrakTharonKeep: update Tharon'Ja 
- update Tharon Ja to BossAI
- update one creature - cosmetic npc

Closes #10524
 2013-08-16 14:34:42 +02:00
Xanvial
01178f5958 Core/Spells: Fix paladin talent "Grand Crusader" 
Closes #9072

Signed-off-by: Vincent-Michael <Vincent_Michael@gmx.de>
 2013-08-16 00:04:52 +02:00
Vincent-Michael
21fe779dfb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-15 16:49:58 +02:00
Shauren
4d260a54ae Core/Spells: Fixed warrior T10 4p dps bonus 
Closes #493
 2013-08-15 16:39:31 +02:00
Vincent-Michael
fd10e25813 Misc: Random changes here and there 2013-08-15 07:47:31 +02:00
Vincent-Michael
d823057ab8 Scriped/BaradinHold: Small cleanup in 595fcdee70 2013-08-14 19:50:47 +02:00