Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
34,528 Commits 4 Branches 146 Tags
65fd7ce2824312c8b70ec288f4c6a2cd5696f411
Commit Graph

483 Commits

Author SHA1 Message Date
Ovahlord
65fd7ce282 Core/Maps: use m_parrentTerrainMap for GetWaterOrGroundLevel and added another difference fixup from 335 branch 2019-02-24 12:50:46 +01:00
Ovahlord
5661b4347b Core/Maps: corrected grid height value return to solve multiple undermap issues 2019-02-24 01:39:25 +01:00
Ovahlord
fda1f556af Core/DataStores: use generated member names for AreaTable.dbc 
*load all fields of AreaTable.dbc
 2019-02-24 00:51:54 +01:00
Ovahlord
1e4cc2293a Core/Datastores: use generated member names for MapEntry fields 
* load all dbc fields of MapEntry
 2019-02-24 00:14:44 +01:00
Ovahlord
b0c37b25cc Core/Movement: ported some undermap fixups from a TC pull request 2019-02-23 22:37:17 +01:00
Ovahlord
068ff5e92d Core/Maps: restore old map pointer 2019-02-22 22:18:32 +01:00
Ovahlord
785b6c9837 Core/Maps: use correct map pointer to get grids in GetWaterOrGroundLevel 2019-02-20 02:04:01 +01:00
Ovahlord
911f8636c9 Core/Objects: fixed remaining differences for collision height code and fixed an issue that was causing units getting summoned in the air 2019-02-19 17:56:35 +01:00
Ovahlord
8b8568a76a Core/Movement: fixed differences between 335 and 434 branch 2019-02-18 03:39:34 +01:00
Ovahlord
eb15db4522 Core/Movement: first part of porting the new creature hover handling 2019-02-18 01:52:15 +01:00
Ovahlord
50a91bd590 Core/Movement: merged Collision height handling from 335 branch to reduce the probability that creatures are falling under the map 2019-02-17 23:40:24 +01:00
Ovahlord
431e6027c6 Core/Spells: restore the pointer check for grid maps to make sure that we will never see a nullpointer ever again 2019-02-10 17:58:23 +01:00
Ovahlord
d3aa72471e Core/Maps: removed GetBaseMap in order to fix a gridmap crash 2019-02-09 22:23:10 +01:00
Ovahlord
4cd6767b96 Core/Maps: reverted the last grid change for child terrain map 2019-02-05 20:12:54 +01:00
Ovahlord
c94c6ab72c Core/Maps: make sure that the grid of the terrain map's parent is loaded when entering terrainswaped zones. This fixes loading vmaps and mmaps for terrain swapped maps 2019-01-26 11:29:10 +01:00
Ovahlord
5229a734dd Core/Transports: ported transport refactoring 
* this implements full support for stoppable transports as well as serverside transport position tracking
* fixed several vehicle related issues
* fixed gameobject passengers not being displayed as transport passengers
* pets, dynamic objects and other summons are not added as transport passengers and will now properly be displayed
Todo:
- Deeprun Tram visual issues needs to be resolved
- Lady Deathwhisper's elevator needs some additional research
 2018-11-21 12:04:26 +01:00
Ovahlord
1a1790b737 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScript.cpp
#	src/server/game/Skills/Archaeology/ArchaeologySites.cpp
#	src/server/scripts/Spells/spell_mage.cpp
 2018-09-17 15:43:22 +02:00
Aokromes
47d7f7be1c kill whitespaces 2018-09-09 16:41:58 +02:00
Ovahlord
fcd789128c Core/Maps: merged a crash fix for spawn group activation 
* merged a change to recreate instance maps from orphaned saves
 2018-08-29 22:56:03 +02:00
Treeston
6420e84773 Core/Maps: Fix a crash when spawning a spawn group 2018-08-29 19:26:10 +02:00
Ovahlord
416e6b36ba Core/Creatures: merged some minor respawn standards 2018-08-29 06:26:31 +02:00
Ovahlord
5e380763aa Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	src/server/game/DungeonFinding/LFGMgr.h
#	src/server/game/Maps/Map.h
#	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
 2018-08-28 04:41:18 +02:00
Ovahlord
9b75d09a7a Core/Spells: reworked and fixed Combat Resurrection system 
* use SPELL_FAILED_IN_COMBAT_RES_LIMIT_REACHED to notify resurrecting player if no resurrection charges are left
* removed mechanics that are not used for Cataclysm
 2018-08-20 02:17:45 +02:00
Ovahlord
9ad9d7c518 Core/Spells: reworked and fixed Combat Resurrection system 
* use SPELL_FAILED_IN_COMBAT_RES_LIMIT_REACHED to notify resurrecting player if no resurrection charges are left
* removed mechanics that are not used for Cataclysm
 2018-08-19 03:43:45 +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
Treeston
64780d7b31 visibility range check, fac4700 follow-up 2018-07-29 19:04:21 +02:00
Treeston
6cb585aa96 Core/Maps: Continue updating creatures that own auras applied to players. Closes #22110. 2018-07-29 19:00:09 +02:00
Ovahlord
83fb611b47 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-07-26 17:37:05 +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
Treeston
fb6acb3415 visibility range check, fac4700 follow-up 2018-07-24 11:18:25 +02:00
Treeston
c58246d981 Core/Maps: Continue updating creatures that own auras applied to players. Closes #22110. 2018-07-24 11:18:07 +02:00
Ovahlord
f9ca7d5dcf Core/Maps: fixed a crash regarding terrain swap grids 2018-07-22 15:50:32 +02:00
Ovahlord
4692c0ff6f Core/Maps: restored some older codes until the corresponding commits has been merged and (fixed?) a crash regarding terrain swap map area id's 2018-07-22 00:49:23 +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
cfee8a09a1 Core/Maps: Fixed loading vmaps and mmaps in instances 
(ported commit b773d9997b)
 2018-05-06 18:47:51 +02:00
Ovahlord
fbcb423f60 Tools: merged Master tools updates 2018-04-24 18:45:23 +02:00
Ovahlord
e8586b0bcb Tools/mmaps_generator: fixed processing liquids broken in e5d23103f3 2018-04-08 16:30:22 +02:00
Ovahlord
9c3f274491 Revert tools changes 2018-04-08 14:59:53 +02:00
Ovahlord
459bfdbddc Tools: 
*ported master commits:
2c64bb97e6
a71d4b70ff
cfa948193c
 2018-04-08 09:46:14 +02:00
Ovahlord
261fbb29e8 Core/Creatures: fixed a issue where creatures that are walking on puddles are considered swimming so their gravity got enabled. 2018-03-30 00:29:13 +02:00
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