Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,109 Commits 4 Branches 146 Tags
2e586bc520e7eda2387e850c3c0049e6daa880de
Commit Graph

365 Commits

Author SHA1 Message Date
Vincent-Michael
2e586bc520 Core: Header cleanup in game/*/*.cpp 2015-07-25 20:18:42 +02:00
Naios
026ceb85b9 Core/Logging: Enable perfect forwarding for logging format and args. 
* Handle timestamp parsing though cppformat.
* Change a wrong forward -> move
 2015-07-22 00:32:28 +02:00
jackpoz
1915a4ad49 Core/Instances: Fix some Instance Lock chat messages 
Always send a Welcome type Instance Lock chat message when entering an instance instead of changing type based on remaining time.
Fix scheduled warning message to always send "Your instance lock for ... will expire in 0 minutes." even if there are hours left, issue added in 4193806dba , closes #11519 .
Update warning messages based on remaining time so that the most meaning is always used (6 hours left, 59 minutes left, etc).

(cherry picked from commit fae8269589)

Conflicts:
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Maps/Map.cpp
 2015-07-12 12:47:43 +01:00
Shauren
18e4ab6911 Core/Maps: Fixed crash in Map::SendObjectUpdates - items were not properly removed from Map::_updateObjects because player was removed from world first 
Closes #14673
 2015-05-15 00:08:40 +02:00
Shauren
5c5cb3e555 Core/Transports: Moved teleporting transports to Map::DelayedUpdate 2015-05-13 22:09:54 +02:00
Shauren
7e801595f4 Core/Maps: Restored DataDir functionality accidendally removed earlier 2015-05-09 00:10:56 +02:00
Shauren
5b725db033 Core/Garrisons: Basics for garrisons 2015-05-08 00:03:15 +02:00
Shauren
0972552e84 Core/Players: Do not clear m_clientGUIDs when using seamless teleport to properly receive DestroyObjects block 2015-05-07 00:18:19 +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
68bd33b654 Core/Player: Implemented seamless teleporting 2015-05-01 15:44:43 +02:00
Shauren
ca83e14f8b Core/Entities: Reworked guid scopes 
* Added ObjectGuid traits to easily access whether guid type can be generated globally (ObjectMgr) or not
* This adds separate (per map) guid sequences depending on object type
* Ported map object container from cmangos/mangos-wotlk@a2d396eb0b
* Added type container visitor for TypeUnorderedMapContainer
* Implemented helper function to erase unique pairs from multimap containers
* Moved object storage of all objects except players and transports to map level
* Added containers linking database spawn id with creature/gameobject in world
* Renamed DBTableGuid to spawnId
* Added a separate spawn id sequence generator for creatures and gameobjects - this will be used in db tables
* Moved building SMSG_UPDATE_OBJECT - updatefields changes broadcast to map update
 2015-04-28 21:19:46 +02:00
Rat
3660c3a37f Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
 2015-03-29 11:25:48 +02:00
Shauren
8cfb542ee4 Core/PacketIO: Updated values of all known server opcodes 2015-03-27 22:21:24 +01: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
b0ee48370d Core: INFO->DEBUG level changes - forgot one in Map.cpp 
(cherry picked from commit ad7b33a47f)
 2015-03-18 00:33:40 +00:00
click
c235835827 Core: Change some map-specific INFO-messages over to to DEBUG or ERROR 
(cherry picked from commit ec6bec6bc4)

Conflicts:
	src/server/game/Maps/Map.cpp
 2015-03-18 00:16:21 +00:00
Rat
8f3a80c1cf Core/Phases: Ported new phasing system from 4.3.4 branch and fixed some map swap logic 2015-03-16 07:28:49 +01:00
MitchesD
c6718dc120 Core/PacketIO: updated and enabled SMSG_PLAY_MUSIC 2015-03-11 20:04:57 +01:00
click
324c5fd7b7 Core/Logs: Throw a little more sensible textoutput when missing maps/vmaps (the old text was a tad confusing mixing maps and vmaps etc). 
(cherry picked from commit 4999864c4a)
 2015-02-22 06:12:47 +00:00
Nayd
6f7d048765 Core/Packets: Update and enable SMSG_WEATHER 2015-01-28 13:58:40 +00:00
Shauren
5fed109cbf Core/Loot: Implemented automatic assignment of Heroic/Mythic item bonuses when dropped in appropriate instance difficulty 2015-01-24 20:28:42 +01:00
Shauren
faa583c784 Core/Maps: Updated map difficulties 2015-01-10 01:35:47 +01:00
Vincent-Michael
ab90f74486 Update copyright note for 2015 
Happy new year
 2015-01-01 00:28:09 +01:00
Intel
b5236a6cdc Core/DataStores: Updated AreaTable.dbc 
Signed-off-by: Nayd <dnpd.dd@gmail.com>
 2014-11-15 04:27:35 +00:00
Intel
fa0983dfa3 Core/DataStores: Updated all remaining dbc/db2 except Item.db2, Item-sparse.db2 
Signed-off-by: Nayd <dnpd.dd@gmail.com>
 2014-11-15 04:27:34 +00:00
Intel
d666e77ae8 Core/DataStores: More converted dbcs 2014-11-09 01:27:59 +02:00
Intel
e1cb43e831 Core/DataStores: Fixed build after rename 2014-11-05 23:33:56 +02:00
Shauren
7afab9f783 Core/Entities: Updated HighGuid values 2014-10-27 12:03:35 +01:00
Shauren
9e1930959d Core/Entities: Changed object lowguid to uint64 2014-10-26 02:57:28 +02:00
Shauren
a97bd333fe Core/Entities: Removed Object::GetGUIDLow() 2014-10-23 00:29:16 +02:00
Shauren
68f45e8734 Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64 2014-10-21 21:09:15 +02:00
Shauren
457c93bc4b Tools/Extractors: Updated vmap_extractor for 6.0.2 2014-10-19 14:02:08 +02:00
Vincent-Michael
42f5017261 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
 2014-10-12 21:46:40 +02:00
jackpoz
bb046ce4ed Core/Maps: Apply const-correctness to GridMap::loadData() 2014-10-12 20:01:27 +02:00
Vincent-Michael
63d7b348bb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-10 05:29:06 +02:00
Shauren
67f9d916cb Build: Fixed game & collision depending on each other for linking 2014-10-09 23:01:31 +02:00
Shauren
b781a4dc33 Core/Logging: Replaced direct calls to GetCounter() in logs with ToString() 2014-10-08 17:59:27 +02:00
Shauren
8e288dd673 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.h
	src/server/game/Battlegrounds/BattlegroundScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/DungeonFinding/LFG.h
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/DungeonFinding/LFGQueue.cpp
	src/server/game/DungeonFinding/LFGQueue.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Creature/GossipDef.h
	src/server/game/Entities/Creature/TemporarySummon.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Globals/ObjectAccessor.h
	src/server/game/Globals/ObjectMgr.cpp
	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/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reset.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_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-09-20 11:05:30 +02:00
Shocker
80f77977f1 Core/Grids: Replace some magic numbers with constants 
(P.S.: That's why! @cs_misc.cpp)
 2014-09-19 18:03:49 +03:00
DDuarte
cefcde9ba9 Core/Misc: Multiple static analysis issues fixed (small optimizations and clear code) 2014-09-19 03:30:02 +01:00
Shauren
878073d516 Core/Logging: Fixed incorrect usage of guid in logs 2014-09-16 20:47:08 +02:00
Shauren
a0e50ea35f Core/Entities: Use ObjectGuid class in game project 2014-09-14 16:14:12 +02:00
Vincent-Michael
741f3dde2e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
 2014-08-26 19:21:22 +02:00
Shocker
549ac332d5 Core/Maps: Don't use EnsureGridCreated_i() for base map in Map::LoadMap, use EnsureGridCreated() which is thread safe because although the LoadMap() call probably came from a thread safe EnsureGridCreated() call from the current map instance, multiple map instances can load grids for the same base map in the same time, and each of them has it's own mutex, therefore we should rely on the basemap's mutex 2014-08-26 14:19:19 +03:00
Vincent-Michael
547115476f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-08-24 02:11:33 +02:00
jackpoz
7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +02:00
Shauren
4a741258f1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.h
	src/server/game/Entities/Object/Updates/UpdateData.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/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-08-12 00:45:24 +02:00
DDuarte
df3b08d140 Core/Server: Use nullptr instead of 0 where pointers are expected 2014-08-09 21:32:26 +01:00
Shauren
2cba07d6a1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h
 2014-07-27 20:59:22 +02:00
Shauren
6f272ea5b7 Core/Network: Optimized packet sending by removing unneccessary memory copying 2014-07-27 17:46:46 +02:00