araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 19:53:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,870 Commits 17 Branches 140 Tags
489af4213332c9613e887ff84464bf00292369f3
Commit Graph

48 Commits

Author SHA1 Message Date
Nay
489af42133 Tools/MapExtractor: Add some missing includes, needed for OSX 
Closes #10454
 2013-08-06 12:49:37 +01:00
Shauren
26a22dc3ab Tools/Extractors: Fixed many false positive err=2 messages and fixed many compile warnings 2013-05-28 17:37:10 +02:00
Nay
98f01c2b12 Core/Misc: Fix compile errors introduced in previous merge 
There are probably other merge issues that got through, please report them
 2013-01-28 02:54:27 +00:00
Nay
b404e0bec1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/loadlib.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_assembler/CMakeLists.txt
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2013-01-28 01:04:37 +00:00
Nay
7a74f68c0d Tools/MapExtractor: Fix displaying of a few counts in Windows 
%zu works fine on GCC/Linux, but fails in MSVC/Windows
 2013-01-22 18:14:32 +00:00
Shauren
592513c012 Tools/Extractors: Completely skip trying to read patch archives with version lower than 15211 if selected build to extract is higher, these files should not even be present in WoW directory after patch 4.3.2 - this skips reading them if for some reason they still are there 2012-11-10 23:12:25 +01:00
Nay
4c3266c7af Tools&Core: Whitespace cleanup 
No one likes whitespace, right?
 2012-09-30 15:52:10 +01:00
Nay
874ddcb0ae Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/tools/map_extractor/System.cpp
 2012-09-03 16:11:46 +01:00
Nay
c7fed98b9d Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	dep/PackageList.txt
 2012-09-03 15:51:34 +01:00
Nay
c8a91e2559 Tools/Extractors: Fix build under GCC 4.7 2012-09-03 15:21:52 +01:00
Subv
554e88dd63 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-08-30 19:16:09 -05:00
Nay
d61f3131fb Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/shared/DataStores/DBCFileLoader.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/wdtfile.cpp
 2012-08-30 23:06:19 +01:00
Nay
5f1977cb1d Core: Fix many "errors"/warnings and coding style (1) 
Extractors, worldserver, authserver, shared and collision affected

Errors were found using Cppcheck, open-source static analysis tool
 2012-08-30 19:07:59 +01:00
Subv
4351548c75 Tools/MapExtractor: Fixed a crash caused by using a variable before it was initialized 2012-08-24 15:33:38 -05:00
Subv
4c765aad3d Core/Maps: Reduce the output map file size in the maps extractor for maps that do not have any hole information 
Core/Mmaps: Fixed swimming creatures stuck in water. (Thanks Vlad and @Chevron )
Note: Re-extract maps
 2012-08-22 18:00:58 -05:00
Subv
dc95ce61b4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	dep/PackageList.txt
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h
 2012-08-22 17:26:53 -05:00
Nay
df2d42e5c7 Tools: Use correct flags in mkdir 2012-08-21 22:23:45 +01:00
Hexit
58ee30d738 Tools: Fix compile for extractors tools on Linux 
Closes #7378
 2012-08-21 22:21:31 +01:00
LordJZ
880e708658 Tools: Proper default target build output 
Ref #7022
 2012-08-04 19:47:45 +01:00
Nay
370c982cc0 Tools/Map extractor: Use a standard format specifier when printing loaded area counts (like the map and liqtypes count) 2012-07-23 16:36:18 +01:00
Shauren
37c32c4c07 Tools: Updated default extractors client build 2012-07-14 14:03:32 +02:00
Shauren
ed6f3e2def Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x 2012-07-04 22:20:21 +02:00
Shauren
138375c045 Merged pull request #6873 2012-07-04 18:26:54 +02:00
LordJZ
7bd0540ca4 Load art.MPQ in mapextractor 2012-07-03 17:16:32 +02:00
LordJZ
568fba707c Fix vmap extractor for 15595. Now uses StormLib. Haven't checked if it works on nix though, will do later. 2012-07-03 17:16:32 +02:00
click
50bd43661c Core: Remove a few silly warnings here and there (and adjust a comment to allow System.cpp to show properly in the nano-editor) 2012-06-13 18:38:21 +02:00
Shauren
9ab6e76a78 Merge fix for map extractor 2012-05-31 00:59:40 +02:00
kaelima
3d14384c32 Merge git://github.com/TrinityCore/TrinityCore into 4.x 
Conflicts:
	dep/PackageList.txt
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.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/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Commands/cs_gps.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Logging/Log.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/CMakeLists.txt
 2012-05-30 08:01:02 +02:00
Nay
36ea485f9a Tools: Fix a typo and printf formats (there's no standard format for size_t) 2012-05-20 18:37:10 +01:00
Nay
e56b2cdd59 Core: Fix a few compile warnings 2012-05-20 17:58:35 +01:00
faramir118
c7927a7796 Tools/MapExtractor: proper type for string literals 
Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
 2012-04-11 19:54:35 +02:00
Venugh
710a617a3c Core/Tools: Store hole data. 2012-04-09 15:52:00 +02:00
Shauren
e5d23103f3 Core/Maps 
* Corrected liquid type extraction in maps - MCLQ chunk must be parsed together with MH2O (they stack)
* Fixed liquid detection in WMO objects
* Implemented LiquidType.dbc use, players will now get proper auras in special liquids
* Turned off slime damage by default (Naxxramas uses periodic damage aura for this purpose)
* Implemented liquid type overrides basing on area/zone
* Renamed final temp_gameobject_models to GameObjectModels.dtree (the temporary one produced by vmap extractor remains unaffected)

Note: Map and Vmap re-extraction is required
 2012-03-07 13:09:35 +01:00
Shauren
f0ca875a21 Tools/Extractors: Changed search method, it will no longer miss some dbc files 2012-02-21 22:39:53 +01:00
Shauren
45201fd49f Tools/Extractors: Map extractor will now also extract *.db2 files 2012-02-21 21:29:19 +01:00
Shauren
26f1abdbca And a compile fix 2012-02-21 21:12:28 +01:00
Shauren
4c2a181cdd Tools/Extractors: Map extractor will now skip world2.MPQ before patch 4.3.2 2012-02-21 21:12:00 +01:00
Shauren
5ced6edbcf Tools/Extractors: Updated map extractor to cataclysm, enjoy new maps 2012-02-20 21:40:31 +01:00
Shauren
b1e4a1b14f Core/Tools: Replaced libmpq with StormLib and made map extractor use it, you can now extract 4.2.2 dbcs with it (still not maps) 
TODO: Update ADT structure
 2012-02-20 19:12:05 +01:00
runningnak3d
905c1c0532 Tools/MapExtractor: Fix typo in areaid error output. 
Author: svetilo12
Closes 4395

--HG--
branch : trunk
 2010-10-10 17:43:47 -06:00
click
3f9dd596f7 Tools/Mapextractor: Output each processed map to a separate line (more output) - thanks to imbecile 
Closes issue #4116

--HG--
branch : trunk
 2010-09-25 21:48:17 +02:00
click
1f80c7b3c0 Sourcefile sleanups -> tabs to spaces, remove whitespace - also update the cleanupscripts very slightly 
--HG--
branch : trunk
 2010-08-08 19:45:53 +02:00
Xanadu
79622802f3 Merge. Revision history for source files should be all back now. 
--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h
 2010-07-20 02:49:28 +02:00
click
7bf807aee4 Kill off the issues with the map/dbcextractors - and a thanks to imbecile@lavabit for the comment about loadlib.h 
Just now the intent was to get it sorted out, as we might merge the tools into one "datatool" for all of this stuff.

--HG--
branch : trunk
rename : src/tools/map_extractor/loadlib/adt.cpp => src/tools/map_extractor/adt.cpp
rename : src/tools/map_extractor/loadlib/adt.h => src/tools/map_extractor/adt.h
rename : src/tools/map_extractor/loadlib/loadlib.cpp => src/tools/map_extractor/loadlib.cpp
rename : src/tools/map_extractor/loadlib/wdt.cpp => src/tools/map_extractor/wdt.cpp
rename : src/tools/map_extractor/loadlib/wdt.h => src/tools/map_extractor/wdt.h
 2010-06-23 10:16:40 +02:00
Xanadu
ffaffe3fd7 * Renamed several VS projects and the executables they produce to reflect the new naming convention. 
* Cleaned up some useless and redundant preprocessor definitions.
* Fixed the win build so that it correctly uses the mysql lib it built from the sources.
* Note that you still need to use 8615_mysql_openssl_libs.zip for the OpenSSL binaries.
* Also note that Win x64 build from the existing VS files is still fubar (mysql lib...).

--HG--
branch : trunk
 2010-06-23 01:47:41 +02:00
click
39e793b2bd Add extractors and assembler - EXTRACTION OF NEW MAPS IS REQUIRED! 
This will allow for easier testing of functionality between different
projects, ie. one set of maps/vmaps instead of 2 (saves space, saves
time and saves us some confusion).

--HG--
branch : trunk
 2010-06-11 05:01:30 +02:00
Tartalo
bddfebb0c7 add -v version option to map_extractor 
--HG--
branch : trunk
 2010-06-09 17:20:06 +02:00
click
09970c3c72 Move extractors/assemblers and the revisiongenerator around to accomodate upcoming new treestructure 
--HG--
branch : trunk
rename : src/tools/genrevision/genrevision.cpp => src/genrevision/genrevision.cpp
rename : contrib/map_extractor/CMakeLists.txt => src/tools/map_extractor/CMakeLists.txt
rename : contrib/map_extractor/README.linux => src/tools/map_extractor/README.linux
rename : contrib/map_extractor/System.cpp => src/tools/map_extractor/System.cpp
rename : contrib/map_extractor/VC90_AD.sln => src/tools/map_extractor/VC90_AD.sln
rename : contrib/map_extractor/VC90_ad.vcproj => src/tools/map_extractor/VC90_ad.vcproj
rename : contrib/map_extractor/ad => src/tools/map_extractor/ad
rename : contrib/map_extractor/ad.exe => src/tools/map_extractor/ad.exe
rename : contrib/map_extractor/adt.cpp => src/tools/map_extractor/adt.cpp
rename : contrib/map_extractor/adt.h => src/tools/map_extractor/adt.h
rename : contrib/map_extractor/dbcfile.cpp => src/tools/map_extractor/dbcfile.cpp
rename : contrib/map_extractor/dbcfile.h => src/tools/map_extractor/dbcfile.h
rename : contrib/map_extractor/debug/zlib.lib => src/tools/map_extractor/debug/zlib.lib
rename : contrib/map_extractor/libmpq/CMakeLists.txt => src/tools/map_extractor/libmpq/CMakeLists.txt
rename : contrib/map_extractor/libmpq/common.cpp => src/tools/map_extractor/libmpq/common.cpp
rename : contrib/map_extractor/libmpq/common.h => src/tools/map_extractor/libmpq/common.h
rename : contrib/map_extractor/libmpq/explode.cpp => src/tools/map_extractor/libmpq/explode.cpp
rename : contrib/map_extractor/libmpq/explode.h => src/tools/map_extractor/libmpq/explode.h
rename : contrib/map_extractor/libmpq/extract.cpp => src/tools/map_extractor/libmpq/extract.cpp
rename : contrib/map_extractor/libmpq/huffman.cpp => src/tools/map_extractor/libmpq/huffman.cpp
rename : contrib/map_extractor/libmpq/huffman.h => src/tools/map_extractor/libmpq/huffman.h
rename : contrib/map_extractor/libmpq/mpq.cpp => src/tools/map_extractor/libmpq/mpq.cpp
rename : contrib/map_extractor/libmpq/mpq.h => src/tools/map_extractor/libmpq/mpq.h
rename : contrib/map_extractor/libmpq/parser.cpp => src/tools/map_extractor/libmpq/parser.cpp
rename : contrib/map_extractor/libmpq/wave.cpp => src/tools/map_extractor/libmpq/wave.cpp
rename : contrib/map_extractor/libmpq/wave.h => src/tools/map_extractor/libmpq/wave.h
rename : contrib/map_extractor/libmpq/zconf.h => src/tools/map_extractor/libmpq/zconf.h
rename : contrib/map_extractor/libmpq/zlib.h => src/tools/map_extractor/libmpq/zlib.h
rename : contrib/map_extractor/loadlib/CMakeLists.txt => src/tools/map_extractor/loadlib/CMakeLists.txt
rename : contrib/map_extractor/loadlib/adt.cpp => src/tools/map_extractor/loadlib/adt.cpp
rename : contrib/map_extractor/loadlib/adt.h => src/tools/map_extractor/loadlib/adt.h
rename : contrib/map_extractor/loadlib/loadlib.cpp => src/tools/map_extractor/loadlib/loadlib.cpp
rename : contrib/map_extractor/loadlib/loadlib.h => src/tools/map_extractor/loadlib/loadlib.h
rename : contrib/map_extractor/loadlib/wdt.cpp => src/tools/map_extractor/loadlib/wdt.cpp
rename : contrib/map_extractor/loadlib/wdt.h => src/tools/map_extractor/loadlib/wdt.h
rename : contrib/map_extractor/mpq_libmpq.cpp => src/tools/map_extractor/mpq_libmpq.cpp
rename : contrib/map_extractor/mpq_libmpq.h => src/tools/map_extractor/mpq_libmpq.h
rename : contrib/map_extractor/release/zlib.lib => src/tools/map_extractor/release/zlib.lib
rename : contrib/vmap3_assembler/CMakeLists.txt => src/tools/vmap3_assembler/CMakeLists.txt
rename : contrib/vmap3_assembler/VC90/vmap_assembler.vcproj => src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
rename : contrib/vmap3_assembler/splitConfig.txt => src/tools/vmap3_assembler/splitConfig.txt
rename : contrib/vmap3_assembler/vmap_assembler.cpp => src/tools/vmap3_assembler/vmap_assembler.cpp
rename : contrib/vmap3_assembler/vmap_assemblerVC90.sln => src/tools/vmap3_assembler/vmap_assemblerVC90.sln
rename : contrib/vmap3_extractor/CMakeLists.txt => src/tools/vmap3_extractor/CMakeLists.txt
rename : contrib/vmap3_extractor/vmapextract/CMakeLists.txt => src/tools/vmap3_extractor/vmapextract/CMakeLists.txt
rename : contrib/vmap3_extractor/vmapextract/adtfile.cpp => src/tools/vmap3_extractor/vmapextract/adtfile.cpp
rename : contrib/vmap3_extractor/vmapextract/adtfile.h => src/tools/vmap3_extractor/vmapextract/adtfile.h
rename : contrib/vmap3_extractor/vmapextract/dbcfile.cpp => src/tools/vmap3_extractor/vmapextract/dbcfile.cpp
rename : contrib/vmap3_extractor/vmapextract/dbcfile.h => src/tools/vmap3_extractor/vmapextract/dbcfile.h
rename : contrib/vmap3_extractor/vmapextract/loadlib/loadlib.h => src/tools/vmap3_extractor/vmapextract/loadlib/loadlib.h
rename : contrib/vmap3_extractor/vmapextract/model.cpp => src/tools/vmap3_extractor/vmapextract/model.cpp
rename : contrib/vmap3_extractor/vmapextract/model.h => src/tools/vmap3_extractor/vmapextract/model.h
rename : contrib/vmap3_extractor/vmapextract/modelheaders.h => src/tools/vmap3_extractor/vmapextract/modelheaders.h
rename : contrib/vmap3_extractor/vmapextract/mpq_libmpq.cpp => src/tools/vmap3_extractor/vmapextract/mpq_libmpq.cpp
rename : contrib/vmap3_extractor/vmapextract/mpq_libmpq04.h => src/tools/vmap3_extractor/vmapextract/mpq_libmpq04.h
rename : contrib/vmap3_extractor/vmapextract/vec3d.h => src/tools/vmap3_extractor/vmapextract/vec3d.h
rename : contrib/vmap3_extractor/vmapextract/vmapexport.cpp => src/tools/vmap3_extractor/vmapextract/vmapexport.cpp
rename : contrib/vmap3_extractor/vmapextract/vmapexport.h => src/tools/vmap3_extractor/vmapextract/vmapexport.h
rename : contrib/vmap3_extractor/vmapextract/wdtfile.cpp => src/tools/vmap3_extractor/vmapextract/wdtfile.cpp
rename : contrib/vmap3_extractor/vmapextract/wdtfile.h => src/tools/vmap3_extractor/vmapextract/wdtfile.h
rename : contrib/vmap3_extractor/vmapextract/wmo.cpp => src/tools/vmap3_extractor/vmapextract/wmo.cpp
rename : contrib/vmap3_extractor/vmapextract/wmo.h => src/tools/vmap3_extractor/vmapextract/wmo.h
rename : contrib/vmap3_extractor/win/vmapExtractor3_VC90.sln => src/tools/vmap3_extractor/win/vmapExtractor3_VC90.sln
 2010-06-05 18:58:56 +02:00