Ovahlord
daf6cfca70
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
2018-07-23 11:08:45 +02:00
Aokromes
ed6053e05c
make travis happy
2018-07-22 23:39:30 +02:00
Ovahlord
59d169e8e4
Merge branch 'dynamicSpawnMerge' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
...
# Conflicts:
# src/server/game/Entities/Creature/Creature.cpp
# src/server/game/Entities/Object/Object.cpp
# src/server/game/Maps/Map.cpp
# src/server/game/Maps/Map.h
2018-07-21 23:13:55 +02:00
Ovahlord
b976bc1187
Core/Spawns: merged Dynamic Spawning
2018-07-21 20:44:41 +02:00
Ovahlord
a241ee78e9
Core/Spells: merged some spell focussing and unit state changes
2018-04-29 12:54:38 +02:00
Ovahlord
fb465c6953
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
2018-04-09 07:29:47 +02:00
Ovahlord
a1f5d206e5
Core/Creatures: swimming creatures should not be affected by gravity
...
* add movementflags directly instead of sending a opcode
2018-04-08 18:54:49 +02:00
Ovahlord
990defbdd8
Core/Creature: move MakeInterruptable helper to creature class to make it accessible from all places with no multiple definitions
2018-04-04 02:19:45 +02:00
Ovahlord
98a7ccfab5
Tools/Mapextractor: Implemented liquid object detection
...
* Core/Vmaps: reverted position and liquid data update function from 3.3.5 and restored master handling in order to fix conflicts between the new phasing and liquid object handlings
2018-03-29 21:41:58 +02:00
ariel-
00db1e6b22
Core/Creatures: Minor HasSpell method cleanup
...
Cherry-picked improved from 5734788c0277d7f342d534dca63db0ce4e862bc5
2018-03-29 00:58:17 +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
fcdfd625c8
Core/Creature: changed back a line before the phase changes
2018-03-20 15:27:34 +01:00
Ovahlord
97cefb1cff
Revert "Core/Creatures: merged a change regarding energy regeneration"
...
This reverts commit 374a405321 .
2018-03-17 23:23:41 +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
e44bb5f387
Core/Entities: Phase Rework (main commit)
2018-03-08 22:58:50 +01:00
Ovalord
c9b5bf9534
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
2018-02-18 20:55:31 +01:00
Ovalord
6fce2ab1dc
Core/Movement: moved checks for repositioning to a own helper
2018-02-17 16:54:54 +01:00
Ovalord
374a405321
Core/Creatures: merged a change regarding energy regeneration
2018-02-17 15:49:57 +01:00
Shauren
bf2d223cc3
Build fix
2018-02-10 11:51:45 +01:00
Shauren
c385edb12d
Core/Scripts: Fixed ENSURE_AI assertion failures when used in Reset()/InitializeAI() hooks with hotswap
...
Updates #20727
2018-02-10 11:51:34 +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
Ovalord
9fdbbe851a
Core/Creature: moved reposition function to unit.cpp
2018-01-21 00:21:33 +01:00
Ovalord
4ee70e1c60
Core/Creatures: applied feedback regarding advanced movement
2018-01-20 22:26:36 +01:00
Ovalord
2deecabc17
Core/Creatures: creatures will now reposition themself if they are too close to their victim
2018-01-19 20:32:02 +01:00
Ovalord
f256d388ac
Core/Creatures: according to latest research the base aggro range is 15 yards instead of 20 yards
2018-01-19 18:21:54 +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
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
Aokromes
4bd0525edd
Update copyright note for 2018
2018-01-01 01:06:19 +01:00
Ovahlord
3e4451cab7
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld
...
# Conflicts:
# src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp
# src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp
# src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
# src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h
# src/server/scripts/Spells/spell_quest.cpp
2017-12-27 18:06:47 +01:00
ariel-
72b14ea028
Core/Spell: implement SPELL_FAILED_AURA_BOUNCED on DR spells
2017-12-26 16:58:53 +01:00
Ovalord
454c3ce065
Core/Creatures: added sparring system for creatures
2017-12-22 11:45:48 +01:00
Ovalord
9b333c2b53
Core/Creature: swimming creatures should not be affected by gravity
...
*prevent swimming creatures from being affected by falling movement generator
2017-12-18 23:47:43 +01:00
Aokromes
19ddf3e8a5
Core/Creatures: fixed school immunity unapply when updating entry and unified code
2017-12-18 15:49:44 +01:00
Aokromes
38c6eaf2d5
Core/Creature: implement school immunity for creatures in creature_template
2017-12-17 20:47:48 +01:00
Aokromes
4b48d0dfdc
Core/Misc: minor typo and codestyle fixes
2017-12-14 13:41:06 +01:00
Erik Strandberg
a3b16c040b
Port https://github.com/TrinityCore/TrinityCore/commit/f913f3bb8977c127d200d5d4a608ab434b21bbcd
2017-12-10 00:37:21 +00:00
Ovalord
6ecb9746b1
Core/Creature: merged creature extra flag for offhand attacks
2017-12-09 20:37:54 +01:00
Aokromes
5efa54d11c
Core/Misc: Fix static analysis issues
2017-12-09 00:00:27 +01:00
Ovalord
9374b07963
Core/Creature: reworked aggro radius calculation *merged from master
2017-12-08 10:03:26 +01:00
Teppic1
0e706b28b9
Core/Creatures: Remove duplicate check for evade from Creature::CanAssistTo ( #20722 )
2017-10-26 14:16:47 +02:00
Aokromes
1a5c0f5c3b
Core/Grids: Ported cmangos/mangos-wotlk@ea99457
...
(cherry picked from commit 9299e9b)
2017-06-19 20:20:26 +02:00
joschiwald
28de675dd9
Core/Misc: Added Creature::CanGiveExperience helper function
...
(cherry picked from commit c1cc0e9949a73e1cbb2640032d5d038cca051954)
2017-06-19 07:54:58 +02:00
Aokromes
f8d9d954d1
Get zone/area IDs from vmap data in the liquid update
...
* Add new method Map::getFullVMapDataForPosition to get area info and liquid info in a single vmap lookup
* Use this lookup in Map:: relocation methods to update m_areaId and m_zoneId fields on WorldObject
* Adjust GetZoneId/GetAreaId on WorldObject to always return these cached fields
* Clean up liquid state handling on Unit and Player
* Hand floor's Z coord up through GetFullTerrainStatusForPosition, use it to update a new field in WorldObject, and use that to feed a new GetFloorZ call on WorldObject.
2017-06-09 13:20:37 +02:00
Aokromes
1c6021ba96
Core/AI: Factory functions cleanup
...
- Get rid of fugly void pointers
- Streamlined AI selection code, using Permissible as it should've been instead of harcoded checks on the selector code
- Moved IdleMovementGenerator singleton to factory code
2017-06-01 13:22:24 +02:00
Treeston
16e60ba408
Partial revert of 15a207f, which was causing issues (ref #4943 and #19768 ). Instead, fix the underlying issue from 15a207f one level further down - Unit::getAttackerForHelper() shouldn't return units that we aren't in combat with (victim can be such a unit for players/player pets, which can startattack from a distance without entering combat). ( #19814 )
...
Fixes the following issues:
- Player pets would aggro neutral mobs as soon as they start autocasting (Imp's Firebolt) if they're in react range (due to victim != null, autocast counts as autoattack and sets victim)
- Neutral mobs would randomly evade when aggro switched between targets.
Closes #19768 , #19485 and #10921 .
(from PR #19814 )
2017-05-30 09:21:38 +02:00
Ryan
20726edec2
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
2017-05-19 23:49:46 +01:00