Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 18 Packages Projects Releases Wiki Activity
22,166 Commits 2 Branches 1 Tag
b204d71cb439248731d282258f8afd155f35384a
Commit Graph
64 Commits
Author SHA1 Message Date
DDuarte b204d71cb4 Core: Fix build due to merge resolution errors 2014-01-11 23:29:27 +00:00
DDuarte 08003577de Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/Battlefield/BattlefieldMgr.cpp
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.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_nalorakk.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/ZulAman/zulaman.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Spells/spell_dk.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-01-11 17:26:22 +00:00
Shauren 15cbe5858c Core/Movement: Fixed vehicle passengers disappearing clientside 
Closes #11411
 2014-01-06 13:51:40 +01:00
Shauren 1966a78b9f Core/Movement: Backported spline stop fix from 4.3.4 branch - use Stop spline type for stopping movement instead of starting movement that ends in creature's current position 2013-11-10 18:52:20 +01:00
Shauren f517467817 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-18 21:04:31 +02:00
Shauren d9df460694 Core/Movement 
* Added wrapper methods for setting various movement flags and sending correct movement opcodes
* Made flying and falling spline flags exclusive with each other
 2013-06-18 16:47:12 +02:00
Shauren 1866c7a038 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2013-06-01 18:34:58 +02:00
Shauren 891d97ec4c Core/Movement 
* Changed speed selection for flying creatures - use MOVE_RUN by default.
* Do not add MOVEMENTFLAG_WALKING to creatures that did not have it but called .SetWalk for their movement
 2013-06-01 17:47:02 +02:00
Shauren adb78862da Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_misc.cpp
 2013-05-30 20:57:07 +02:00
Shauren 3a697d4c9f Core/Transports: Refactored methods used to calculate passenger offsets (made orientation argument optional) 2013-05-30 20:32:33 +02:00
Spp 00c1168897 Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic changes 2013-05-21 08:37:28 +02:00
Shauren 199f8b7140 Core/Movement: Use spline id generator for movement packets 2013-04-07 16:02:27 +02:00
Vincent_Michael 3c5bf554ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-13 21:48:09 +01:00
Shauren d926ad63c0 Core/Spells: Fixed charge effects with non-explicit targets 2013-02-13 20:21:26 +01:00
Vincent_Michael 943c866da9 Core: Whitespace cleanup 2013-02-07 00:02:22 +01:00
Nay 98f01c2b12 Core/Misc: Fix compile errors introduced in previous merge 
There are probably other merge issues that got through, please report them
 2013-01-28 02:54:27 +00:00
Nay b404e0bec1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/loadlib.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_assembler/CMakeLists.txt
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2013-01-28 01:04:37 +00:00
Spp d75222feca Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Packets/ByteBuffer.h
 2013-01-14 11:04:03 +01:00
Spp 802657250c Core/Misc: Apply codestyle to multiple files 2013-01-14 09:50:59 +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
Nay 82555a444c Core/Spline: Fix typo, I blame not enough Ctrl+S 2013-01-04 23:44:25 +00:00
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
Nay 24cd72c8e1 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Spells/SpellEffects.cpp
 2012-11-23 23:39:03 +00:00
Spp 1ecc55272e Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/GameObjectAI.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Pet/Pet.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
 2012-11-20 16:01:31 +01:00
Spp 7bef4ce401 Core/Misc: Reduce header dependencies - Step III 2012-11-20 15:03:56 +01:00
kaelima 677ee02b8e Core/Movement: MovementGenerator fixes. 
- vmap height search in FleeingMovementGenerator and ConfusedMovementGenerator (until we can search for a nearby position properly) Should solve #7704, needs testing
- Removed some unused code in CalculatePath and TargetedMovementGenerator. Ty faramir118
- Allow players to charge through slime and lava liquids. Closes #7967
 2012-11-07 16:42:22 +01:00
kaelima 3c13454ad7 Merge git://github.com/TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-11-05 12:02:08 +01:00
Spp 06eff94506 Merge branch 'master' into 4.3.4 
Note: Will need extra Guild-Related commit to make it work again (Added some extra data beside the merge)

Conflicts:
	src/server/game/Battlefield/BattlefieldHandler.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.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/LootHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SkillHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TaxiHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Server/WorldSession.h
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
 2012-11-04 20:17:37 +01:00
Shocker cd55d64364 Core/Spline: Improve error output for SpineInitArgs check 
by Schmoozerd
 2012-10-31 18:39:05 +02:00
kaelima f237a57f51 Fix compile. Closes #7718 2012-09-10 13:24:01 +02:00
Nay 4896a1775e Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-09-10 00:54:29 +01:00
Nay d6743c7c95 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/updates/world/2012_09_09_02_world_spell_script_names.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
 2012-09-10 00:52:35 +01:00
Shauren 83817afd99 Core/Vehicles: Improved vehicle passenger position calculation (still not complete) 2012-09-09 19:56:00 +02:00
Nay a55c7f6c84 Core: Fix build and a warning 2012-09-08 15:21:44 +01:00
Nay 242a2fdbc1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp
 2012-09-08 01:34:24 +01:00
Nay 6c1bdb3d3c Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-09-08 01:32:47 +01:00
kaelima d0f4526d71 Core/Vehicle: Improved the position fix when changing vehicle from 5eb22e5b64 
Thanks Shauren
 2012-09-07 14:00:24 +02:00
Nay 19b400761d Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
 2012-09-07 03:36:47 +01:00
Nay 407286fe81 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-09-07 03:34:23 +01:00
kaelima a2d533752c Core/MMaps: Add several safety checks to confirm a valid path generation. 
- Address some issues in TargetMovementGenerator. Thanks Chevron
 2012-09-07 04:21:11 +02:00
kaelima 5eb22e5b64 Core/Vehicles: 
- Send proper triggering flag when casting spellclick spells on vehicles (should not be fully triggered)
- Only compute non-transport positions when not finalized. (Fixes changing seat on vehicles, or changing vehicle from vehicle)
 2012-09-07 03:17:04 +02:00
Venugh e7c0d8bef0 Core/MMaps: Applied Trinity Codestyle to PathGenerator. 2012-09-05 23:47:02 +02:00
Subv 97c3e2e6c1 Core/Movement: Make MovementGenerators use pointers instead of references. cleanup 2012-08-25 22:57:55 -05:00
Subv e0abbfd86c Core/MMaps: Renamed PathFinderMovementGenerator to PathGenerator, since its not a MovementGenerator, and moved out of the MovementGenerators folder 2012-08-25 21:55:03 -05:00
Subv 9698d295b2 Core/Mmaps: Refactored some code 2012-08-24 20:03:57 -05:00
Subv 937518181f Core/Mmaps: Fixed build after last merge 2012-08-24 11:38:39 -05:00
Subv dc95ce61b4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	dep/PackageList.txt
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h
 2012-08-22 17:26:53 -05:00
Shauren e7590abce7 Core/Movement: Use MonsterMoveStop spline type to stop movement instead of sending movement to current position 2012-08-11 20:18:00 +02:00
Shauren c3e1443a13 Core/Movement: Use spline id generator 2012-08-11 20:16:58 +02:00