Commit Graph
134 Commits
Author SHA1 Message Date
Spp a227a34947 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/AI/CoreAI/PetAI.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
2012-12-17 12:13:51 +01:00
Anton Usmansky 044e737ca7 Tools. vmap4_extractor. OSX build fix 2012-11-30 18:02:50 +02:00
Spp 404129963c Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Chat/ChatLink.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ArenaTeamHandler.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSpline.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Reputation/ReputationMgr.cpp
	src/server/game/Spells/Auras/SpellAuraDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Commands/cs_disable.cpp
	src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
	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_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
	src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/ungoro_crater.cpp
	src/server/shared/Packets/ByteBuffer.h
	src/tools/map_extractor/dbcfile.h
2012-11-27 14:15:12 +01:00
click 1d7105914a Core: Fix some silly warnings (some stupid remnants from old times that has bugged me enough)
No need to recompiling anything, it's just a visual change to make the compilers STFU about variable initializations
2012-11-27 02:24:12 +01:00
Spp 5fd7d01bde Core/Build: Remove some more unneeded code for OS X from cmake files
Core: Minor changes here and there
2012-11-12 10:29:52 +01: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 73172c67f0 Misc: Convert from CRLF to LF in cs_misc.cpp
Also cleanedup whitespace
2012-09-04 16:14:15 +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 c8a91e2559 Tools/Extractors: Fix build under GCC 4.7 2012-09-03 15:21:52 +01: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
Nay da9480557b Core: Fix a typo and whitespace cleanup 2012-08-22 22:56:31 +01: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
Nay 9e0907874e Core: Fix 4 warnings / SQL: Rename two SQL files 2012-08-20 21:54:36 +01:00
Nay 11652278df Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/tools/vmap4_extractor/vmapexport.cpp
2012-08-20 16:08:27 +01:00
Chaplain fb1ac16b0c Core/Misc: Some fixes here and there
Closes #7277
2012-08-20 11:05:50 +02: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 85135512b1 Buildsystem/Tools: Corrected vmap tool dependencies 2012-07-09 21:15:01 +02:00
Shauren 6ea13e0080 Tools/Extractors: Corrected merge errors (libmpq was removed) 2012-07-09 20:29:44 +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 23be8c4fd7 Scripts/VH: Add an 1 minute pause after each boss fight (instead of 5 seconds)
Revert one of the warning fixes (non standard C++)
2012-05-20 18:22:34 +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
Machiavelli 5d25dc8926 Tools/VmapExtractor: Don't check registry for game folder on windows, just use relative "Data" dir, similar to linux. 2012-03-17 17:51:00 +01: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
click a153e0ca06 Core: Remove some whitespace and tabs 2012-03-07 00:05:34 +01:00
E. van Harten 9610b9e53c Fixed compile issue for -DTOOLS, someone broke it again! 2012-02-27 10:54:09 +01:00
Spp 5cff9e0716 Merge branch 'master' into 4.x
Conflicts:
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/AI/CoreAI/CombatAI.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
	src/tools/vmap3_extractor/model.h
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/dbcfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
2012-02-23 13:06: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
Subv 836459ef0e Extractors: Do not show a warning in the vmap extractor when a model fails to load to avoid confusion 2012-02-12 12:45:45 -05:00
Ka0z 6627fe7203 Core/Collision: Edit source files to represent the recent changes in the extractors (v4.00 2012_02) to avoid confusion with old extractors (v3.00 2010_07) 2012-02-10 18:40:05 -03:00
Subv2112 93d199f043 Core/Collision: Ported dynamic line of sight patch by Silverice from MaNGOS and
added lots of improvements
Please re-extract vmaps
2012-02-09 13:58:22 -05:00
Venugh 057621f866 CMake: Updated year to 2012. 2012-01-07 23:10:50 +01:00
Chaplain bea649d045 Core: cleanup.
*remove some garbage
*little bit moore const func
*fix process of args in vmap3_extractor
2011-09-01 22:38:32 +03:00
click 9762c17833 Core/Buildsystem: Update copyright-headers for 2011, and adjust with the correct teamname as well. 2011-04-27 18:17:00 +02:00