Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity
34,065 Commits 2 Branches 1 Tag
65a0dbadd3c8dbc00b77fab6e505873bf035c98d
Commit Graph
529 Commits
Author SHA1 Message Date
Ovahlord 65a0dbadd3 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-09-03 07:14:17 +02:00
Treeston 836a607875 Core/Scripting: Delay zone script's OnCreatureCreate until the creature has been added to map stores 2018-08-29 19:13:07 +02:00
Ovahlord 416e6b36ba Core/Creatures: merged some minor respawn standards 2018-08-29 06:26:31 +02:00
Ovahlord 853d966c5f Core/Creature: merged some missed changes for dynamic spawn regarding despawn functionality 2018-08-29 04:57:22 +02:00
Ovahlord 3f53afd39e Core/Maps: fixed several issues with liquids by merging some 335 branch commits that are taking mopg flags into account 2018-08-07 12:35:02 +02:00
Ovahlord 78e0328356 Core/Movement: fixed waypoint movement commits up to 2ce9a0a094a3d86a86a9323693c93ed6a2bbcaaf 2018-08-02 16:20:02 +02:00
Ovahlord 075a79dac1 Core/Movement: first batch of followup commits 2018-08-02 16:03:19 +02:00
Ovahlord c808b981f7 Core/Movement: merged smooth waypoint movement. Followup commits will be merged soon (tm) 2018-08-02 15:38:35 +02:00
Ovahlord d59a20701e Core/Movement: merged more movement commits and fixed build by merging the changes done to movement generators by the header cleanup 2018-08-02 13:52:12 +02:00
Ovahlord 6cea6eee77 Core/Objects: merged some CreateObject2 related commits and ported some transport changes from 335 branch 2018-07-25 15:58:27 +02:00
Ovahlord a0e288e761 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-07-23 15:57:10 +02:00
Treeston f441d36d78 Misc: Pass std::chrono types by value everywhere. 2018-07-23 13:53:13 +02:00
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