Ovahlord
0db0f35cae
Revert "Core/Entities: Some changes to LoS z checking & MotionMaster::MoveJumpTo"
...
This reverts commit 157719d4b0 .
2018-03-28 18:45:36 +02:00
Ovahlord
2cfdd3cbe0
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
...
# Conflicts:
# src/server/game/AI/CoreAI/PetAI.cpp
# src/server/game/Battlegrounds/Battleground.cpp
# src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
# src/server/game/DungeonFinding/LFGMgr.h
# src/server/game/DungeonFinding/LFGQueue.h
# src/server/game/Entities/Creature/Creature.h
# src/server/game/Entities/Pet/Pet.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/Globals/ObjectMgr.h
# 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/GuildHandler.cpp
# src/server/game/Handlers/LFGHandler.cpp
# src/server/game/Handlers/MiscHandler.cpp
# src/server/game/Handlers/NPCHandler.cpp
# src/server/game/Instances/InstanceScript.cpp
# src/server/game/Maps/Map.cpp
# src/server/game/Maps/Map.h
# src/server/game/Maps/ZoneScript.cpp
# src/server/game/Server/WorldSession.cpp
# src/server/game/Spells/SpellEffects.cpp
# src/server/game/Weather/Weather.cpp
# src/server/game/Weather/WeatherMgr.cpp
# src/server/scripts/Commands/cs_reload.cpp
# src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
# src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
# src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
# src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
# src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
# src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
# src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
# src/server/scripts/Spells/spell_dk.cpp
# src/server/scripts/Spells/spell_druid.cpp
# src/server/scripts/Spells/spell_generic.cpp
# src/server/scripts/Spells/spell_hunter.cpp
# src/server/scripts/Spells/spell_mage.cpp
# src/server/scripts/Spells/spell_pet.cpp
# src/server/scripts/Spells/spell_shaman.cpp
# src/server/scripts/Spells/spell_warrior.cpp
2018-03-28 12:35:52 +02:00
ariel-
5ff847159c
Core: header cleanup, split realmlist, boost compatibility, cotire, remove stormlib/zlib and stormlib/bzip2 and instead use dep sources
2018-03-28 04:41:59 -03:00
Ovahlord
8fd486471b
Core/Spells: fixed Sentinel passive Rage bonus
2018-03-22 21:27:02 +01:00
Ovahlord
157719d4b0
Core/Entities: Some changes to LoS z checking & MotionMaster::MoveJumpTo
2018-03-20 01:39:11 +01:00
Ovahlord
e393fe3085
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
2018-03-19 14:43:52 +01:00
Aokromes
a8151040c5
Core/Transport: Fix some teleportation issues while on transports
2018-03-19 13:18:29 +01:00
Ovahlord
b837812ff9
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
2018-03-17 21:05:34 +01:00
Ovah
16c97d35a1
Phasing
2018-03-17 19:41:20 +00:00
Ovahlord
d707a474df
Revert nullptr crash fix as it causes another crash
2018-03-17 16:44:14 +01:00
Ovalord
ddb9c2a698
Core/Units: fixed a possible crash location caused by nullpointers
2018-03-15 22:06:03 +01:00
Ovahlord
617b3a8a11
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
...
# Conflicts:
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Maps/Map.cpp
# src/server/game/Maps/Map.h
2018-03-14 08:22:00 +01:00
Ovahlord
8eda9ce7ae
Revert "Core/Spells: fixed a tempfix for vehicles vanishing after area change"
2018-03-14 08:09:01 +01:00
Keader
6da3663547
Core/Unit: Guardians no longer enter combat before reaching the target ( #19816 )
2018-03-12 12:21:46 +01:00
Ovahlord
ce4e137889
Core/Entities: Take terrain swaps into account when calculating LoS/height/area
2018-03-09 23:45:06 +01:00
Ovahlord
e44bb5f387
Core/Entities: Phase Rework (main commit)
2018-03-08 22:58:50 +01:00
Ovalord
e8bc3c5391
Core/Spells: merged DBC spell coefficient reading (commit: 1826437c094966ae339a154844df8587b2122888)
2018-02-25 20:12:22 +01:00
Ovalord
9b8b296b8a
Corrected two more comments.
2018-02-15 10:47:57 +01:00
Ovalord
6e853f2146
Removed an accidentally added duplicate comment
2018-02-15 10:28:06 +01:00
Ovalord
d4bd425306
Core/Units: reverted an unintended change
2018-02-14 20:44:46 +01:00
Ovalord
84d980742d
Core/Units: send object update before sending smsg_dismount to prevent the mount hitbox becoming huge
2018-02-14 20:40:18 +01:00
Ovalord
844450d542
Core/Movement: don't stop movements on stuns when the target is currently affected by parabolic splines
2018-02-14 14:41:34 +01:00
Ovalord
a64c9f5d0e
Revert "Core/Movement:"
...
This reverts commit 154d283d3a .
2018-02-14 10:48:01 +01:00
Ovalord
154d283d3a
Core/Movement:
...
*cyclic movement will now always use catmullrom and enter_cycle flags. Fixes visual issues when spline gets sent via update_object packet
*MoveCirclePath motion master will now always make the creature fly. According to sniffs all cyclic moving creatures are flying
*remove hack from cyclic monster_move packet. The first vertex is getting deleted by the client when using enter_cycle spline flag.
*recalculate cycle path when completing first loop to get rid of the first vertex
*implement SMSG_FLIGHT_SPLINE_SYNC opcode. according to sniffs this opcode gets sent every 5 seconds to fix client / server asynch movement issues. thx to Morgoporc for the unit.cpp part
2018-02-12 20:09:02 +01:00
Ovalord
0d3daf1120
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
2018-02-08 22:28:13 +01:00
Aokromes
3b1913a739
Revert "Core/Spells: fixed a logic mistake that was interrupting channeled spells due to movement"
...
This reverts merge request !107
2018-02-08 20:13:53 +00:00
Ovalord
420a2523b5
Core/Spells: reverted an wrong change for channeling spells
2018-02-08 21:12:11 +01:00
Ovalord
c65dc6d5ed
revert some things
2018-02-07 19:10:32 +01:00
Ovalord
f39794a5a1
Core/Spells: fixed spell damage bonus / loss from SPELL_AURA_MOD_DAMAGE_DONE_VERSUS_AURASTATE, SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS and SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN
2018-02-07 12:36:10 +01:00
Ovalord
23ff9e8d12
Core/Spells: fixed a logic mistake that was interrupting channeled spells due to movement
2018-02-07 11:15:02 +01:00
Ovalord
fb4b9bc4e3
Core/Spells: fixed a logic mistake that was interrupting channeled spells due to movement
2018-02-07 11:13:45 +01:00
Aokromes
c904859682
Core/Spells: fix Spirit of Redemption
2018-01-27 16:27:52 +01:00
Aokromes
8365119235
Core/Battleground: Dropped battleground texts from trinity_string and replaced them with proper BroadcastText
2018-01-27 16:00:38 +01:00
Ovalord
8a274f0329
Core/Spells: merged level penalty removal
2018-01-27 12:59:32 +01:00
Aokromes
7be6304306
Core/Spells: Removed outdated mechanic (spell downranking coef penalty)
2018-01-27 12:28:42 +01:00
Ovalord
716bd18135
Core/Creature: dropped advance movement until it is moved to ChaseMovementGenerator
2018-01-23 17:52:04 +01:00
Ovalord
4b6c4033c9
Core/Creatures: tempoarily disable creature replacements until it has been ported to a movement generator
2018-01-22 11:26:53 +01:00
Ovalord
09c6ed8d1e
Core/Creature: apply feedback from TC pull request
2018-01-21 16:43:28 +01:00
ariel-
49c861d064
Core/Unit: check remaining instead of full duration for Bounced by DR auras
2018-01-21 12:39:28 +01:00
Ovalord
9fdbbe851a
Core/Creature: moved reposition function to unit.cpp
2018-01-21 00:21:33 +01:00
Ovalord
b584255286
Core/Players: worgen will now learn running wild at level 20
...
*fixed transforming worgen when taking oder dealing damage
2018-01-20 17:03:04 +01:00
Ovalord
3ad64fc170
Core/Units: merged the overkill packet fix
2018-01-18 13:51:04 +01:00
Ovalord
683a74f3ea
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
2018-01-14 19:20:08 +01:00
Treeston
6522040c5e
Core/Unit: Abide UNIT_FLAG2_DISABLE_TURN on creatures. Add that flag to Kologarn (from sniff). Hi sirikfoll.
2018-01-14 07:07:20 +01:00
Aokromes
90033ee748
Core/Spells: Defined and implemented some new spell attributes
2018-01-14 06:53:36 +01:00
Ovalord
707177f761
Core/Units: updated armor formular
2018-01-11 00:36:27 +01:00
Ovalord
b7c15093a6
Core/Pets: merged funjoker's new Pet Slot system
...
* fixed packets and handling for stable master
* fixed Control Pet / Demon handling
* corrected wrong trainer spell for the Control spells
* Added base support for Assist behaivior
* corrected action bar layout
* Hunter Pets will now have the same level as their tamer (patch 4.1 change)
* corrected health stats for pets
2018-01-07 02:00:31 +01:00
Ovalord
b2945a5c58
Merge branch 'ShatteredWorld' of https://gitlab.com/Ovahlord/TrinityCore_434 into 4.3.4
2018-01-06 16:21:32 +01:00
Ovahlord
98fdf72c7b
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld
...
# Conflicts:
# src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
# src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
# src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
2018-01-02 01:23:06 +01:00
ariel-
a53af26ab6
Core/Entities: fix crash
...
- m_currentSpells and spell would be different in case cancelation of a channeled spell would remove the aura, and aura scripted to cast another channeled spell on remove
- In the above situation, we would lose reference of currentSpell and remove reference from wrong one, this was fixed by clearing the pointer before spell cancelation.
Closes #20172
2018-01-01 22:21:01 +01:00