Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,110 Commits 4 Branches 146 Tags
bb60122f2c0a67fbb7e1a7e31e1be9b5722ef6ee
Commit Graph

305 Commits

Author SHA1 Message Date
Shauren
f912963b4b Tools build fix 
(cherry picked from commit 3c8210a1f3)
 2019-02-23 22:00:05 +01:00
jackpoz
7ddbc18aaf Core/MMaps: Add rcMedianFilterWalkableArea() to mmaps generation process 
Add rcMedianFilterWalkableArea() to mmaps generation process to simplify some ground/water areas
 2019-02-23 22:00:05 +01:00
Shauren
7b561373a8 Tools/mmaps_generator: Give land priority during area merges over liquids 
Closes #21700

(cherry picked from commit edb2b16f54)
 2019-02-23 22:00:05 +01:00
Shauren
8d19fcbc46 Tools/vmapextractor: Improved vmap detail level by extracting wmo doodads (tables, chairs etc) 
(cherry picked from commit fb0a1de5c1)
 2019-02-23 22:00:05 +01:00
Shauren
0e083a0356 Tools/MMapsGenerator: Cleanup duplicated definitions 
* rebuilding is not needed

(cherry picked from commit 60c4c29da5)
 2019-02-23 22:00:05 +01:00
Shauren
ecab7db7b0 Warning fix 
(cherry picked from commit cfa948193c)
 2019-02-23 22:00:05 +01:00
Shauren
8d1bb258fc Tools: 
* mapextractor - fixed compressing liquid data
* vmapextractor - fixed extracting liquids inside WMOs
* vmapextractor - implemented new WMO flags
* vmapextractor - store model type for gameobject models
* mmap_generator - fixed processing liquids broken in e5d23103f3

(cherry picked from commit 2c64bb97e6)
 2019-02-23 22:00:05 +01:00
Shauren
fd30618f12 Tools/Mapextractor: Fixed determining deep water 
(cherry picked from commit 2e648f9eb9)
 2019-02-23 22:00:05 +01:00
Shauren
e6bfa71e4d Tools/Mapextractor: Implemented liquid object detection 
(cherry picked from commit 82bf263f92)
 2019-02-23 22:00:04 +01:00
Shauren
fee666f02f Tools/Misc: Partial cherry-pick of 7b235ce6e4 2019-02-23 22:00:04 +01:00
Shauren
98949b75ed Tools/Misc: Partial cherry-pick of 457c93bc4b 2019-02-23 22:00:04 +01:00
Shauren
2924283f07 Tools/Misc: Partial cherry-pick of fe4d11c65a 2019-02-23 22:00:04 +01:00
jackpoz
e4658a1307 Tools/MMaps: Allow to specify different Recast settings for different maps 
Allow to specify different Recast settings for different maps, currently handled in GetMapSpecificConfig() as a switch statement.
Set walkableRadius to 0 in Blade's Edge Arena (Map ID 562) so the pets can walk on the thin rope between the bridge and the pillar.
 2019-01-27 15:20:38 +01:00
jackpoz
5ff88ea04a Dep/Recast: Update recastnavigation to 14b2631527 
Rebuilding mmaps IS required
 2019-01-26 20:44:27 +01:00
Treeston
fcfcb0eb6f Happy New Year, folks. It's 2019! 2019-01-01 15:45:25 +01:00
tkrokli
f6b6f57a6d Update copyright note for 2018 
Best wishes for the new year.
 2018-01-01 01:55:29 +01:00
Naios
85e460802d Build: Inherit the features and warning flags privately 
(cherry picked from commit 1285347518)
 2017-12-21 23:31:11 +01:00
Aokromes
59e94fd9bb Misc: More cleanup 2017-11-25 02:39:27 +01:00
Warpten
9614f9d8cf Merge pull request #20024 from Golrag/fix_collision 
Core/VMaps: Fix no collision triangles
 2017-11-22 15:16:36 +01:00
jackpoz
f8fd0b7a2c Tools/MMaps: Improve MMaps quality 
Lower Detail Sample Distance and Detail Sample Max Error to get more accurate MMap data, in particular mmap height.
More info about Detail Mesh at http://digestingduck.blogspot.it/2009_07_01_archive.html and http://digestingduck.blogspot.it/2009_08_01_archive.html
 2017-11-18 20:31:22 +01:00
jackpoz
7ef22e4305 Dep/Recast: Update recastnavigation to 2c85309280 2017-11-18 20:29:25 +01:00
jackpoz
64ca471734 Tools/VMaps: Fix build issue on VS2017 2017-11-18 20:28:02 +01:00
Rochet2
0a3e2339ef Tools/MMapsGenerator: Use system supported threads instead of hardcoded amount (#19255) 
- Use unsigned int for thread count
- Use std::thread::hardware_concurrency() to try estimate available threads instead of hardcoded 3 threads by default
- Print thread count always regardless of using --threads switch or not
 2017-08-08 22:52:55 +02:00
ariel-
f0357a861d Core/Tools: fix whitespace 2017-07-19 12:40:01 -03:00
keke222
15f6a02b72 Tools: Automatically create directories for tools (#17971) 2017-07-17 10:18:35 +02:00
Golrag
89d641f1e6 Core/VMaps: Fix no collision triangles 2017-07-14 18:00:51 +02:00
Rochet2
b9f276f0a0 Tools/MMapsGenerator: Get all tiles in beginning and calulate proper total tile count (#20013) 2017-07-13 17:31:24 +02:00
ariel-
85a7d5ce9a Core: ported headers cleanup from master branch 2017-06-19 23:20:06 -03:00
Golrag
c35793941b Core/VMaps: Fix LoS in Strand of the Ancients (#19847) 
Core/Collision: Fixed MOPY chunk flags enum.

Also avoid loading destructible WMOs into vmaps.

VMap re-extraction is required.

Closes #15798.
 2017-06-05 16:32:35 -05:00
jackpoz
8f2bcd79da Core/Misc: Fix static analysis issues 2017-02-25 17:07:22 +01:00
Shauren
29937aaa75 Tools/mmaps_generator: Mak percentage progress slightly more accurate 
#18832
 2017-01-14 15:16:04 +01:00
tkrokli
6a51a88767 Update Copyright notice for 2017 
Happy new year!
 2017-01-02 19:52:45 +01:00
zori
0df0cb30ca Correct Nav type for WMO objects (#18364) 
* Tools/MMaps: Correct liquid type for WMO objects

* MMaps: Update version to 6
 2016-12-03 17:48:55 +01:00
ariel-
881cd78ae3 Core/Map: missing file change in last commit 2016-12-02 20:19:04 -03:00
Mikhail Redko
3d7a86bf1e Tools/VMAPs: Fix extractor crash when some .mpq files does not exist (#18130) 2016-10-23 22:44:07 +02:00
Eilo
0a53d0b1fa Tools/mmaps_generator: Added estimated percentage progress to console output (#17798) 2016-08-21 11:44:22 +02:00
jackpoz
1d7013e0e2 Core/MMAPs: Update recast 
Update recast to 64385e9ed0
 2016-08-17 22:00:35 +02:00
jackpoz
2585c62e6f Tools/MMapGenerator: Avoid saving uninitialized padding bytes to disk 
Initialize padding bytes in MmapTileHeader struct to avoid saving uninitialized data to disk, causing issues when binary-comparing *.mmtile files.
 2016-08-17 15:07:02 +02:00
r00ty-tc
de918a0f64 Core/Maps - Improvements to Cinematic function 
- Moves to own class for reading, storage and player subclass
 - Proper destruction handling for player (ensure cinematic is ended)
 - Timeout for cinematic if it reaches past the end without completing
 - boost::filesystem::path used for path/filename transform
 - Correct for assert trigger under certain circumstances
 - Other changes previously suggested
 2016-05-11 11:56:25 +02:00
r00ty-tc
87b4533046 [Core/Maps] Activate creatures and objects during opening cinematics and other flyby 
cameras (sunwell etc).

Requires re-running map extractor to extract camera m2 files from data
files. These are very small.

Closes #4755
Closes #16772
 2016-04-14 01:34:17 +02:00
Naios
abda7a910a CMake: Use inherited dependencies in common and tools 2016-03-18 02:52:57 +01:00
Naios
f52495c66b Dep/CppFormat: Update cppformat to cppformat/cppformat@5174b8c 2016-03-16 15:36:32 +01:00
DDuarte
a41bd8e943 Tools/MMaps: Add format library linking to mmaps_generator 
(Very) partial cherry pick of ed75b0649a
 2016-03-07 17:30:06 +00:00
tkrokli
9e4cc26312 [3.3.5] Core/Logs: English text corrections 
This is an attempt to proofread standard error messages and system messages
from both core and DB. The corrections span typos, grammar and punctuation.

Because some of these messages can have multiple meanings depending on context,
this PR will stay in "WIP" status until the corrections have been validated and approved.

You are welcome to suggest improvements and files not yet included in this list.

Thanks to @Kinzcool for suggesting this line of work. :)
 2016-02-20 10:05:04 +01:00
Shauren
89d8d50b2e Core/Maps: Moved min height calculation to worldserver for more precise results 
Closes #16530
 2016-02-10 21:25:28 +01:00
Shauren
25cdc5d980 Core/Maps: Parse MFBO adt chunk to properly handle height where player counts as falling under the map 
* This fixes the height at which player is instantly killed when falling from The Frozen Throne
* Set PLAYER_FLAGS_IS_OUT_OF_BOUNDS on players under the map to enable release spirit button while still falling

Note: Extracting new maps is required
(cherry picked from commit 4f78efd463)

# Conflicts:
#	dep/PackageList.txt
#	src/server/game/DataStores/DBCStructure.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Handlers/MovementHandler.cpp
#	src/tools/map_extractor/CMakeLists.txt
#	src/tools/map_extractor/System.cpp
#	src/tools/map_extractor/adt.h
#	src/tools/map_extractor/loadlib.cpp
 2016-02-09 18:44:19 +01:00
Shauren
aa432db36d Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing) 
Note: Extracting maps is required
(cherry picked from commit db0b8bf24e)

# Conflicts:
#	src/server/game/Achievements/AchievementMgr.cpp
#	src/server/game/Chat/Chat.cpp
#	src/server/game/Conditions/ConditionMgr.cpp
#	src/server/game/DataStores/DBCStores.cpp
#	src/server/game/DataStores/DBCStores.h
#	src/server/game/DataStores/DBCfmt.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Handlers/BattleGroundHandler.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Spells/Spell.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_go.cpp
#	src/server/scripts/Commands/cs_group.cpp
#	src/server/scripts/Commands/cs_lookup.cpp
#	src/server/scripts/Commands/cs_misc.cpp
#	src/tools/map_extractor/System.cpp
#	src/tools/mmaps_generator/TerrainBuilder.cpp
 2016-02-09 18:19:28 +01:00
Rushor
923a368ac7 Update copyright note for 2016 2016-01-01 12:02:33 +01:00
jackpoz
981b871d2f Tools/MMapGenerator: Fix an edge case of infinite loop 
Fix a (pseudo) infinite loop happening when generating mmaps for single tile maps (like 249) but with vmaps not present in the correct folder. This would trigger a 18446744065119600000 (uint32 max ^ 2) iterations loop.
 2015-11-25 21:49:27 +01:00
Carbenium
49a16c9fd0 Tools/MMapGenerator: Fix some warnings reported by GCC 4.9 and MSVC 14 with W4 
* /var/lib/jenkins/jobs/tc_335_release_gcc49/workspace/src/tools/mmaps_generator/MapBuilder.cpp: In member function ‘void MMAP::MapBuilder::WorkerThread()’:
  /var/lib/jenkins/jobs/tc_335_release_gcc49/workspace/src/tools/mmaps_generator/MapBuilder.cpp:174:28: error: ‘mapId’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
               buildMap(mapId);

* variable redefinition warning
* remove 2 "using namespace std"

*NO reextraction of mmaps needed*
 2015-11-25 12:50:28 +01:00