Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 17:08:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
1390621f4da88d6749e42bea0a131fae74742fa4
TrinityCore/src/server/game
History
Vincent-Michael 1390621f4d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/scripts/Commands/cs_reload.cpp
2014-04-25 23:42:40 +02:00
..
Accounts
Core/Texts:
2014-04-25 23:25:59 +02:00
Achievements
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-23 06:22:39 +02:00
Addons
Update copyright note for 2014.
2014-01-01 00:07:53 +01:00
AI
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-25 23:42:40 +02:00
AuctionHouse
Merge branch 'master' into 4.3.4
2014-01-11 17:26:22 +00:00
Battlefield
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-25 23:42:40 +02:00
Battlegrounds
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-25 23:42:40 +02:00
Calendar
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-01-26 18:22:06 +01:00
Chat
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-19 19:57:46 +02:00
Combat
Update copyright note for 2014.
2014-01-01 00:07:53 +01:00
Conditions
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-05 20:43:05 +02:00
DataStores
Core: Fix whitespace / tabs
2014-04-21 16:57:32 +02:00
DungeonFinding
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-25 23:42:40 +02:00
Entities
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-25 23:42:40 +02:00
Events
Merge branch 'master' into 4.3.4
2014-01-11 17:26:22 +00:00
Globals
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-22 20:06:40 +02:00
Grids
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-01-24 19:36:32 +01:00
Groups
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-05 20:43:05 +02:00
Guilds
Misc/Guild: Fix guild_xp_for_level structure (startup errors)
2014-04-21 17:46:53 +02:00
Handlers
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-25 23:42:40 +02:00
Instances
Core/Revert: ...
2014-01-18 01:36:12 +01:00
Loot
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-05 20:43:05 +02:00
Mails
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-05 20:43:05 +02:00
Maps
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-06 01:25:59 +02:00
Miscellaneous
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-23 06:22:39 +02:00
Movement
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-25 23:42:40 +02:00
OutdoorPvP
Merge branch 'master' into 4.3.4
2014-01-11 17:26:22 +00:00
Pools
Update copyright note for 2014.
2014-01-01 00:07:53 +01:00
PrecompiledHeaders
…
Quests
Core: Fix build due to merge resolution errors
2014-01-11 23:29:27 +00:00
Reputation
Merge branch 'master' into 4.3.4
2014-01-11 17:26:22 +00:00
Scripting
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-20 22:54:39 +02:00
Server
Core/WorldSocket: Fix crash when CMSG_AUTH_SESSION contains modified addon size value
2014-04-25 22:59:22 +02:00
Skills
Update copyright note for 2014.
2014-01-01 00:07:53 +01:00
Spells
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-25 23:42:40 +02:00
Texts
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-25 23:42:40 +02:00
Tickets
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-05 20:43:05 +02:00
Tools
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-05 20:43:05 +02:00
Warden
Core/Warden: Fix crash
2014-02-08 09:33:51 +01:00
Weather
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-01-21 21:58:30 +01:00
World
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-22 20:06:40 +02:00
CMakeLists.txt
Merge branch 'master' into 4.3.4
2014-01-11 17:26:22 +00:00