Vincent-Michael
689b7f6d56
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-10-05 03:44:35 +02:00
MitchesD
3c103f718d
Scripts/Misc: fixed GameObjects chests in CoS and HoR
...
Fixes https://github.com/TrinityCore/TrinityCore/issues/13246
2014-10-04 16:48:15 +02:00
Vincent-Michael
339ddf5e83
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-10-04 03:29:04 +02:00
Shauren
83668e8f8f
Core/GameObjects: Implemented new gameobject type 11 (transport) states, fixes elevators in orgrimmar as well as all stoppable elevators
...
Closes #10019
Closes #12747
Closes #13194
2014-09-29 20:10:08 +02:00
sonic3000
e57fbbd308
Core/Scripts: Fix for issue https://github.com/TrinityCore/TrinityCore/issues/882#issuecomment-57065326
2014-09-28 00:13:10 +02:00
Vincent-Michael
da91ae1f22
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/zone_isle_of_queldanas.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warrior.cpp
2014-09-27 05:23:46 +02:00
Nyeriah
ace897e27b
Scripts/UtigardePinnacle: Prevent Ymiron from triggering a phase transition at death
...
...caused by the health percent multiplers used to check transitions
2014-09-26 03:10:48 -03:00
jackpoz
79b9ca4a58
Scripts/Misc: Make InstanceScript::Initialize() obsolete
...
Move all InstanceScript initialization code from Initialize() to the constructor.
InstanceScript::Initialize() is now obsolete, please don't use it anymore. The only reason it's still in the sources is for backward compatibility.
2014-09-25 22:28:20 +02:00
jackpoz
16a884d999
Core/Misc: Refactor scripts to fix static analysis warnings
...
Eighth batch of fixes targeting 80 issues reported by Coverity
2014-09-25 21:19:34 +02:00
Shauren
ea4dd2c8f4
Scripts/Icecrown Citadel
...
* Fixed Deathbringer Saurfang faction
* Fixed Coldflame faction
2014-09-25 21:15:20 +02:00
Vincent-Michael
15520e38d0
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
sql/base/dev/world_database.sql
src/server/game/Entities/Player/Player.h
2014-09-22 06:41:14 +02:00
jackpoz
6e27841382
Core/Misc: Refactor scripts to fix static analysis warnings
...
Seventh batch of fixes targeting 100 issues reported by Coverity
2014-09-21 22:15:04 +02:00
Vincent-Michael
f767aef12e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Globals/ObjectMgr.cpp
2014-09-20 22:39:37 +02:00
jackpoz
b5e3535dbf
Core/Misc: Refactor scripts to fix static analysis warnings
...
Sixth batch of fixes targeting 100 issues reported by Coverity
2014-09-20 20:21:54 +02:00
Shauren
8e288dd673
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlefield/Battlefield.h
src/server/game/Battlegrounds/ArenaScore.h
src/server/game/Battlegrounds/ArenaTeam.cpp
src/server/game/Battlegrounds/ArenaTeam.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.h
src/server/game/Battlegrounds/BattlegroundQueue.h
src/server/game/Battlegrounds/BattlegroundScore.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/DungeonFinding/LFG.h
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/DungeonFinding/LFGMgr.h
src/server/game/DungeonFinding/LFGQueue.cpp
src/server/game/DungeonFinding/LFGQueue.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Creature/GossipDef.h
src/server/game/Entities/Creature/TemporarySummon.cpp
src/server/game/Entities/DynamicObject/DynamicObject.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Object/ObjectDefines.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.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Globals/ObjectAccessor.cpp
src/server/game/Globals/ObjectAccessor.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Groups/Group.cpp
src/server/game/Groups/Group.h
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/CalendarHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/GuildHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Handlers/NPCHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Handlers/VehicleHandler.cpp
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_gm.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reset.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_generic.cpp
src/server/shared/Packets/ByteBuffer.h
2014-09-20 11:05:30 +02:00
DDuarte
cefcde9ba9
Core/Misc: Multiple static analysis issues fixed (small optimizations and clear code)
2014-09-19 03:30:02 +01:00
joschiwald
0f1f7ef401
Core/Misc: multiple changes
...
* fixed build
* apply tc codestyle to ObjectGuid class
* fixed warning
2014-09-19 03:16:59 +02:00
joschiwald
e567ab9597
Core/Texts: added TextRange parameter to creature_text
...
Ranges:
0 - Normal (Default)
1 - Area
2 - Zone
3 - Map
4 - World
Ref #13116
2014-09-18 23:33:59 +02:00
joschiwald
60176157a7
Scripts/Gundrak: cleanup InstanceScript
...
* converted Gal'Darah and Moorabi to BossAI
* add and correct some texts
* fixed altar activation spell visual
2014-09-18 00:38:28 +02:00
joschiwald
b08dcb1d99
Core/Scripts: implemented a guid map in InstanceScript, this way you can easier store guids and access its objects
2014-09-18 00:25:05 +02:00
Shauren
7d1d55124c
Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Scripting/MapScripts.cpp
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
2014-09-16 21:50:01 +02:00
Vincent-Michael
7cbaa028cd
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-09-16 21:09:19 +02:00
Shauren
9b316fe689
Core/Scripts: Fixed PCH build
2014-09-16 00:44:56 +02:00
Shauren
5ac62d9ca3
Core/Scripts: Fixed build zone_* scripts
2014-09-15 23:57:03 +02:00
Shauren
48deb443f9
Core/Scripts: Fixed build of misc scripts, only zone_* and instance_* remain
2014-09-15 22:52:09 +02:00
Shauren
a3d8f1d879
Core/Scripts: Fixed build of boss_* scripts
2014-09-15 22:07:11 +02:00
Shauren
6ce0a3107d
Core/Scripts: Changed GetGUID/SetGUID script hooks to operate on ObjectGuid class
...
Fixed compile for boss scripts starting with letters B, C and D
2014-09-15 00:23:47 +02:00
Nyeriah
e4d875a249
Scripts/ToCR: Set Anub'arak's respawn delay
...
* This needs to be done manually since he's a summon.
Closes https://github.com/TrinityCore/TrinityCore/issues/10587
2014-09-14 18:40:45 -03:00
Shauren
56f46e3ce5
Scripts
...
* Introduced GetGuidData/SetGuidData to store guids in instance scripts (GetData64/SetData64 are still there)
* CONDITION_INSTANCE_INFO: Changed existing DATA64 condition to GUID_DATA to preserve current use of this instance info type (most/all assume the data is a guid) and moved DATA64 to a different value - no db changes needed
* Fixed compile in boss scripts starting with letter A
2014-09-14 23:23:23 +02:00
Vincent-Michael
b0270d547f
Core: Remove whitespace
2014-09-14 21:42:39 +02:00
Malcrom
14367ca8c0
Scripting/Stand spell: Remove UNIT_FIELD_FLAGS change from spell script.
2014-09-14 12:37:04 -02:30
Shauren
a0e50ea35f
Core/Entities: Use ObjectGuid class in game project
2014-09-14 16:14:12 +02:00
DDuarte
a432bc7168
Merge remote-tracking branch 'origin/master' into 4.3.4
2014-09-14 14:56:35 +01:00
Malcrom
716c2918d2
Scripting/Spell Stand: Move this spell to spells generic.
2014-09-14 11:15:25 -02:30
Vincent-Michael
ca3961f987
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.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/Handlers/ChatHandler.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
2014-09-13 22:38:25 +02:00
joschiwald
59baaeec48
Core/Chat: cleanup MonsterText methods
2014-09-13 20:41:31 +02:00
Nyeriah
e746e8685c
Scripts/UtigardePinnacle: Use a generic spell to calculate the damage for Dark Slash instead
...
Thanks to @Vincent_Michael for the heads up
2014-09-13 11:10:33 -03:00
Nyeriah
12e405bedd
Scripts/UtgardePinnacle: King Ymiron
...
- Updated to EventMaps
- Replaced manual summons with proper spells
- Fixed glitch where boss would resume fight/run back to his main target before the ancestor summon roleplay was over (it might still need few adjustments i.e fire on boat is currently missing)
- Implemented damage calculation for spell Dark Slash (http://www.wowhead.com/spell=48292 ) as previously the spell would do no damage and it's BasePoints is 0
2014-09-13 10:33:51 -03:00
DDuarte
b9b2a87d42
Merge remote-tracking branch 'origin/master' into 4.3.4
2014-09-13 13:55:17 +01:00
Shauren
ce67a097bf
Core/Entities: Use new PackedGuid class
2014-09-13 01:12:16 +02:00
jackpoz
f5a3913d95
Core/Misc: Refactor scripts to fix static analysis warnings
...
Fifth batch of fixes targeting 100 issues reported by Coverity
2014-09-13 00:01:34 +02:00
Shauren
7f2cdfd166
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/authserver/Main.cpp
src/server/authserver/Server/AuthSession.cpp
src/server/authserver/Server/AuthSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/scripts/World/npcs_special.cpp
2014-09-12 20:26:46 +02:00
MitchesD
1e3aa97098
Scripts/Misc: some small changes after recent commits
2014-09-11 15:22:30 +02:00
Nyeriah
ce97e9194c
Scripts/Gundrak: Eck the Ferocious updated to EventMap/BossAI
...
- Moved his spawn handling to instance script
2014-09-11 02:39:57 -03:00
Dr-J
29951ba394
Remove CPP script for Jenny/Jezzix Geartwist
2014-09-09 21:38:05 +01:00
Dr-J
02a1c92ea7
Remove seaforium depth charge
...
Remove cpp script for seaforium depth charge ((Bury those cockroaches)).
2014-09-09 20:35:23 +01:00
Vincent-Michael
5cdea8b30c
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-09-08 22:15:42 +02:00
joschiwald
3930606032
Core/Scripts: made BossAI::CheckInRoom virtual
2014-09-08 05:02:03 +02:00
joschiwald
cfc0c50b5e
Core/Misc: dropped obsolete GameObject::GetGameObject method
2014-09-07 21:03:25 +02:00
DDuarte
6885eb4f2c
Merge remote-tracking branch 'origin/master' into 4.3.4
2014-09-07 19:36:33 +01:00