Commit Graph
786 Commits
Author SHA1 Message Date
Vincent-Michael 20bbdcbde9 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-03 17:54:45 +02:00
Nyeriah d698d28a31 Scripts/SWP: Update M'uru script to EventMaps/BossAI 2014-09-03 04:22:29 -03:00
Vincent-Michael 8a97243728 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-01 09:19:57 +02:00
jackpoz dd4dbdcd16 Core/Misc: Refactor scripts to fix static analysis warnings
First batch of fixes targeting 100 issues reported by Coverity
2014-08-31 20:42:02 +02:00
Vincent-Michael f89739dab5 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-30 05:03:47 +02:00
joschiwald 831a6603d4 Core/Battleground/AV: convert trinity_strings to proper creature_text
Closes #12861
2014-08-30 03:34:35 +02:00
Vincent-Michael 06daf22e1e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/scripts/Commands/cs_guild.cpp
2014-08-29 21:18:23 +02:00
joschiwald 01380c66bf Core/Misc: some random changes after recent pull requests 2014-08-29 17:46:55 +02:00
Vincent-Michael 3a248fbfec Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h
2014-08-28 21:00:53 +02:00
Vincent-Michael eccb0ed3da Scripts/Quest: Fix some movement stuff for Quest "Death Comes From On High" 2014-08-28 20:17:43 +02:00
Vincent-Michael 741f3dde2e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
2014-08-26 19:21:22 +02:00
DDuarte 430b3adfe8 Scripts: Correct despawn time of multiple objects
WorldObject::SummonGameObject respawn time is in seconds and not milliseconds
2014-08-26 13:37:55 +01:00
Vincent-Michael 98e27a4f15 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/tools/map_extractor/System.cpp
2014-08-24 16:33:29 +02:00
Vincent-Michael 79b954a349 Core: meh, remove again whitespace :( 2014-08-24 02:46:14 +02:00
Vincent-Michael 547115476f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_warrior.cpp
2014-08-24 02:11:33 +02:00
jackpoz 7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +02:00
Shauren 42cac6796a Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Server/WorldSocket.cpp
2014-08-21 23:59:00 +02:00
Shauren 4a741258f1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h
2014-08-12 00:45:24 +02:00
MitchesD e80a19a0f1 Scripts/ScarletMonastery: rewritten InstanceScript and some bosses converted to BossAI and eventmap 2014-08-10 23:14:39 +02:00
jackpoz 8402570bb8 Scripts/Misc: Fix static analysis issues
Replace CAST_AI() macro with ENSURE_AI() when dynamic_cast is not supposed to return NULL.
2014-08-09 00:12:20 +02:00
Vincent-Michael fad2bd4f92 Core: Kill AGAIN whitespace :( 2014-08-07 07:19:06 +02:00
Vincent-Michael eb8e140f7f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-31 18:01:28 +02:00
Dr-J 9253ff7cb7 Update CMakeLists.txt 2014-07-31 00:29:54 +01:00
Dr-J 5418844f15 Delete zone_eversong_woods.cpp 2014-07-31 00:24:08 +01:00
Dr-J 5b311690d1 Remove Script from zone_eversong_woods.cpp
This cpp is now currently redundant
2014-07-31 00:12:33 +01:00
Vincent-Michael a917b6599f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
2014-07-30 22:26:59 +02:00
Dr-J 3199f2ba90 Remove Script from zone_eversong_woods.cpp
Remove Apprentice Mirvedas script from eversong woods cpp scripts as is not longer required.
2014-07-30 13:45:42 +01:00
DDuarte cdb33ab174 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
2014-07-24 17:10:21 +01:00
Ergar 40c5737200 Scripts/Karazhan: Boss Maiden of Virtue - rewrite to events and timer adjustments
Closes #12513 (PR)

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-07-24 03:58:39 +01:00
DDuarte 5193eaac87 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
2014-07-24 03:35:19 +01:00
nelegalno 7524e2dfda Scripts/WesternPlaguelands: Fix conditions to show gossip of Myranda the Hag (In Dreams quest)
Ref #7519

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-07-24 03:25:33 +01:00
Vincent-Michael 8bc519a308 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
2014-07-23 06:32:44 +02:00
jackpoz 3388587b7a Core/Misc: Replace rand() calls with SFMT 2014-07-22 21:43:19 +02:00
DDuarte 01d9681a4d Merge branch 'master' into 4.3.4
Conflicts:
	src/server/authserver/Realms/RealmList.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
2014-07-22 13:15:36 +01:00
Vincent-Michael 4e29cf74b3 Scripts/EasternKingdoms: Burn with fire (hihi) 2014-07-20 19:44:26 +02:00
Vincent-Michael e68d3b0937 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
2014-07-20 03:06:03 +02:00
MitchesD 6fdcefee31 Scripts/MagistersTerrace: reworked Selin Fireheart
* removed ancient code
* converted to EventMap
* removed illogical method in instance script
2014-07-19 22:18:41 +02:00
Shauren 909acdbac3 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist
2014-07-19 03:51:11 +02:00
Shauren 7532864264 Buildsystem/MSVC: Warning fixes
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
2014-07-17 15:42:57 +02:00
Subv dfdc19f3bc Merge branch master into boost
Conflicts:
               BattlegroundMgr.h
2014-07-13 16:52:38 -05:00
Vincent-Michael 1bc482d3d6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/scripts/Spells/spell_paladin.cpp
2014-07-12 00:24:23 +02:00
Vincent-Michael c8e75073bf Scripts/Misc: Fix some warnings vs2014 ctp (no support) 2014-07-11 20:24:55 +02:00
Vincent-Michael 4f619eb937 Core/LFG: Fix warning with vs2014 ctp (no support) 2014-07-11 17:04:01 +02:00
Vincent-Michael 495ca8c2dc Scripts/Misc: Fix some warnings with vs2014 ctp (no support) 2014-07-11 16:39:44 +02:00
Aokromes 900fb17229 Merge pull request #12417 from gerripeach/remove_old_boss
Core/Scripts: Remove script from old boss
2014-07-09 08:36:58 +02:00
Vincent-Michael 7462fa63fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-08 00:14:53 +02:00
karn 4e346f3ca5 Scripts/ScarletMonastery: Boss Arcanist Doan - rewrite to events
Closes #12418
2014-07-07 16:48:53 +02:00
Vincent-Michael 9799a88c8d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-07 09:58:43 +02:00
Shauren 408b490851 Scripts/Magister's Terrace: Fixed typo in SetEncounterState 2014-07-06 00:01:24 +02:00
karn 6c895ad692 Core/Scripts: Remove script from old boss
http://www.wowwiki.com/Highlord_Kruul
This creature was part of a bc event. he is no longer part of the game
2014-07-02 00:55:40 +02:00