Commit Graph

29 Commits

Author SHA1 Message Date
Shauren
7e801595f4 Core/Maps: Restored DataDir functionality accidendally removed earlier 2015-05-09 00:10:56 +02:00
Shauren
ed75b0649a Tools: Modified output files of all extractors to use 4 characters for map id and changed name format of map files to include a separator between values '_' that makes tokenization possible
* This fixes generating mmaps for maps with id >= 1000
* Fixed a crash happening when unloading last phased mmap tile
* Removed remaining references to libmpq in CMakeLists

Reextracting maps/vmaps/mmaps IS REQUIRED after this commit
2015-05-07 00:07:44 +02:00
Shauren
38def5969a Warning fixes 2015-04-10 17:54:45 +02:00
Vincent-Michael
20ab76a2cb Core: Whitespace cleanup 2015-04-08 02:27:20 +02:00
Gacko
835163746c Fix warning 2015-03-30 21:15:43 +02:00
Rat
eebc468e62 Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x
Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
2015-03-24 20:01:02 +01:00
click
ff50abca8a Core: Move some MMAPS-related INFO-messages to DEBUG
(cherry picked from commit a854e17690)
2015-03-18 00:16:29 +00:00
Rat
e677cf7157 Core/Phases: crashfix 2015-03-16 19:27:32 +01:00
Rat
a68f19af56 Core/Phases: Mmaps now use the swapped terrain's mmtiles for all units if available. 2015-03-16 16:54:47 +01:00
Shauren
e15ba34444 Core/Misc: Cleaned up data truncation warnings 2015-03-08 22:04:34 +01:00
Vincent-Michael
ab90f74486 Update copyright note for 2015
Happy new year
2015-01-01 00:28:09 +01:00
Vincent_Michael
ad8c046916 Core/Revert: ... 2014-01-18 01:36:12 +01:00
DDuarte
08003577de Merge branch 'master' into 4.3.4
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/Battlefield/BattlefieldMgr.cpp
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Spells/spell_dk.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
2014-01-11 17:26:22 +00:00
Vincent_Michael
20004050bc Update copyright note for 2014.
Happy new year.
2014-01-01 00:07:53 +01:00
jackpoz
85218f4436 Tools/MeshExtractor: Fix warnings 2013-12-31 01:09:09 +01:00
Vincent_Michael
8658b5338c Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/PathGenerator.cpp
2013-12-20 17:39:13 +01:00
Spp
94e2b9332a Core/Logging: Remove LOG_FILTER_XXX defines with it's value (remember logger names are case-sensitive) 2013-11-08 10:50:51 +01:00
Sebastian Valle
d74dcabd85 Core/MMaps: Started this new branch as my playground for mmaps.
Made some refactoring
Free memory taken by mmaps when a map is destroyed.
2013-10-03 17:47:38 -05:00
kaelima
aa645683b8 Core/MMAPS: Update recastnavigation!
* Complete changelog can be found at http://code.google.com/p/recastnavigation/
* Adjusted a few config values

Important:
* New mmaps extraction is required
* Folder size will be increased
2013-06-17 05:11:56 +02:00
Spp
00c1168897 Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic changes 2013-05-21 08:37:28 +02:00
Shauren
7d46703413 Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-17 21:30:02 +02:00
Spp
d1677b2db0 Core/Logging: Performance-related tweaks to logging system
All sLog->out* functions (except outCommand atm) are replaced with TC_LOG_* macros.
    Memleak fix
2013-05-13 15:07:36 +02:00
Vincent_Michael
65cd79dc77 Core/Misc: Update headers to 2013 2013-01-14 17:42:06 +01:00
Spp
5f15600e7a Core/Build: Fix linking and sooo many compile warnings 2013-01-09 13:13:39 +01:00
kaelima
a2d533752c Core/MMaps: Add several safety checks to confirm a valid path generation.
- Address some issues in TargetMovementGenerator. Thanks Chevron
2012-09-07 04:21:11 +02:00
Subv
ccdca77740 Core/Mmaps: Fixed unloading mmap tiles, the x and y were swapped. thanks to MaNGOS for original implementation, and thanks to @Chevron for noticing. 2012-09-05 16:05:26 -05:00
Subv
937518181f Core/Mmaps: Fixed build after last merge 2012-08-24 11:38:39 -05:00
Venugh
8368112f45 Try to check existance of mmaps folder. 2012-04-09 18:05:35 +02:00
Venugh
eae627f752 Core:
+ add mmaps files.
+ add the generator for movement.
2012-04-09 14:51:03 +02:00