Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,007 Commits 4 Branches 146 Tags
2efc91a839dbbd11de4e9420eb975a274ab40c56
Commit Graph

442 Commits

Author SHA1 Message Date
Ovahlord
2efc91a839 Core/Maps: Fixed child/parent map crash 2018-03-30 00:08:53 +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
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
89c6777803 * Core/Phasing: fixed gameobject floor detection 
*merged a crash fix
 2018-03-22 17:36:01 +01:00
Ovahlord
85c156299b Core/Phasing: fixed gameobject floor detection 
*merged a crash fix
 2018-03-22 17:31:37 +01:00
Ovahlord
ea3937343d Merged latest phasing stuff 2018-03-19 23:58:16 +01:00
Ovahlord
20d0aa0c23 Core/Maps: synch phasing with latest PR state. Fixes a instance map crash 2018-03-19 23:49:21 +01:00
Ovahlord
e8b9a84594 Core/Phasing: reducde differences between 434 and PR 2018-03-18 17:48:08 +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
Ovah
60afe858e8 MMaps phasing 2018-03-12 18:19:19 +00:00
Ovahlord
78793ac452 Core/Entities: use PhaseShift when processing terrain updates 2018-03-12 11:08:05 +01:00
Ovahlord
4623c411be Core/Maps: fixed loading maps 2018-03-10 20:59:53 +01:00
Ovahlord
27652214b5 Core/Phasing: Rewrite GetTerrainMapId *updated phasing with latest changes 2018-03-10 16:10:48 +01:00
Ovahlord
b9d0ab6ed8 Core/Maps: Implemented loading swapped maps 2018-03-10 13:54:23 +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
dc8f263fc8 Core/Weather: merged commit 6eb9973947 2018-02-14 15:49:48 +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
Aokromes
4bd0525edd Update copyright note for 2018 2018-01-01 01:06:19 +01:00
Aokromes
4b48d0dfdc Core/Misc: minor typo and codestyle fixes 2017-12-14 13:41:06 +01:00
Aokromes
2e0f2ee3fb Core/Misc: Fix static analysis issues 2017-12-08 15:23:32 +01:00
Aokromes
1a5c0f5c3b Core/Grids: Ported cmangos/mangos-wotlk@ea99457 
(cherry picked from commit 9299e9b)
 2017-06-19 20:20:26 +02:00
Aokromes
9057cae219 So, I came in trying to fix gameobject LoS. So I restructured some stuff. 
Then it turned out that gameobject LoS is already fixed. So all this does, really, is restructure some stuff.

And remove the hack from Sapphiron because I could.
 2017-06-11 19:02:07 +02:00
Aokromes
ec49af7b59 Build fix 2017-06-09 14:11:36 +02:00
Aokromes
572021e0b3 Core/Maps: Corrected GetWaterOrGroundLevel 
* When a gameobject was above water like in ToC. It would return water level
 2017-06-09 13:29:18 +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
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
Aokromes
fc20b6934b build fix 2017-05-06 02:38:01 +02:00
Aokromes
0fbcdca05e Core/Collision: Replaced phasemask with proper phases in GameObject c… 
…ollision calculation
 2017-05-06 01:55:17 +02:00
xinef1
b88200cd58 Core/Misc: Various crash fixes 2017-05-05 01:59:34 +01:00
ariel-
c17fa0bcc5 Core/Instance: stop updating the instance resettimes based on creature respawns 2017-04-14 13:50:13 +02:00
pete318
4d65596f0d Only read and delete from corpse table for current map instance. Not for 
all. Prevents assert stop upon entering an instance on second character
after first one is a corpse in the same dungeon on different instance ID.
 2017-04-01 19:41:03 +01:00
sevi
d4c703a2e2 Core/Instance: implement the combat resurrection limit. 
Cherry Pick from 948146f3ee

I change this a bit, so that this is works right for 4.3.3 Patch. (Here isn't add charges after a specific time. Groups have from begin 1 or 3 Charges for Resurrection.)
 2017-03-19 01:55:40 +01:00
Shauren
9d4a1ddc10 Core/Maps: Adjusted WorldObject::GetGridActivationRange() to never be less than map visibility distance for active objects to ensure equal ranges for activation/deactivation of grids 
Updates #19072
 2017-02-10 05:26:38 +01:00
Aokromes
8bb777ef5c Few small optimizations here and there 2017-02-01 16:51:21 +01:00
Shauren
dc2deb8602 Core/Vmaps: Changed error message when loading outdated vmaps 
Closes #18431
Closes #18857
 2017-01-23 00:17:17 +01:00
HelloKitty
927a73a7ef Core/Vmaps: Stop M2s from occluding for spellcast LoS 
Closes #18528
 2017-01-21 14:45:30 +01:00
Aokromes
719a317a67 Update copyright note for 2017 2017-01-02 07:26:38 +01:00
Aokromes
c9965c331a Core/Maps: Fix compile on windows 
By ConradBunton
 2016-09-27 20:24:44 +02:00
treeston
3d82e5771d Map/InstanceMap: Ease up on a somewhat overzealous error message regarding instance saves. 2016-09-22 03:10:06 +02:00
Treeston
226762216a Map/Instances: Greatly simplify PermBindAllPlayers logic. (#17940) 2016-09-18 07:38:06 +02:00
Aokromes
436cdfd7c9 Core/Game: Move scheduled map scripts counter methods into MapManager 
* Since those have nothing to do with core scripts and are
  not wished inside the ScriptMgr
 2016-08-10 06:40:03 +02:00
Aokromes
5302d9112b Core/Game: Converted the game library to a shared library. 
* There is still the possibility to static link against game.
 2016-08-08 20:11:29 +02:00
Aokromes
9d7bd6ca62 Core/Misc: Even better description for logs 2016-07-20 18:30:14 +02:00
jackpoz
d9f485273c Core/VMaps: Fix some vmap height edge cases 
Fix Map::GetWaterOrGroundLevel() checking dynamic object only in phase 1 instead of current Unit phase.
Improve DynamicMapTree::getHeight() dynamic object check by casting the ray at +0.5f from the passed Z coordinate, this value will be tuned to improve even more the results.
 2016-07-20 15:45:05 +02:00
Aokromes
6ca223187b Compile fix 2016-07-19 15:46:44 +02:00
r00ty-tc
527654b512 [Core/Maps] Activate creatures and objects during opening cinematics 
As well as other flyby cameras (like sunwell etc)

Requires re-running map extractor to extract camera m2 files from data
files. These are very small.
 2016-05-18 21:31:07 +01:00
Aokromes
95018939a8 Core/Maps: Implement optional pre-loading of maps. 2016-05-16 22:24:58 +02:00
ariel-
65aec5f8f7 Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Note: additional hand-picked ports from 6.x to fix build

Conflicts:
	sql/updates/world/2016_02_22_00_world.sql
	sql/updates/world/2016_02_22_01_world.sql
	sql/updates/world/2016_02_22_02_world.sql
	sql/updates/world/2016_03_07_00_world.sql
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/game/Scripting/ScriptLoader.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Commands/cs_ticket.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/OutdoorPvP/CMakeLists.txt
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/CMakeLists.txt
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
	src/tools/mmaps_generator/CMakeLists.txt
 2016-03-11 18:32:07 -03:00