Mordred Admin ec72cf6836 Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN ... Conflicts: CMakeLists.txt src/servers/Server_Common/Network/PacketDef/Ipcs.h src/servers/Server_Zone/Actor/PlayerQuest.cpp src/servers/Server_Zone/Actor/PlayerSql.cpp		2017-10-25 14:49:35 +02:00
..
Action	Cleanup, mount DB saving;	2017-10-18 17:54:17 +02:00
Actor	Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN	2017-10-25 14:49:35 +02:00
ContentFinder	Reimplement of CFPenaltyTime	2017-08-19 11:28:04 +09:00
DebugCommand	!unlock and !help debug commands	2017-10-21 23:41:09 +11:00
Event	more restructuring	2017-08-19 00:18:40 +02:00
Inventory	More static_cast	2017-10-22 20:51:25 -07:00
Linkshell	Fixing linkshellid to uint64_t	2017-10-23 08:33:47 -07:00
Network	Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN	2017-10-25 14:49:35 +02:00
Script	expose isincombat to scripts - isInCombat doesn't work though	2017-10-21 22:24:04 +11:00
StatusEffect	AoE refactor;	2017-09-24 21:02:29 -03:00
Zone	Status effect source reference; ActionCast battle log work; Cleaning compiler warnings;	2017-09-15 00:56:29 -03:00
CMakeLists.txt	Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN	2017-10-25 14:49:35 +02:00
Forwards.h	ActionMount;	2017-10-18 15:49:19 +02:00
mainGameServer.cpp	Build fix	2017-08-29 10:42:19 +02:00
ServerZone.cpp	Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN	2017-10-25 14:49:35 +02:00
ServerZone.h	Startup banner extracted to own function	2017-10-03 12:09:51 +02:00
Session.cpp	Merged most recent 4.1 fixes to SQL rewrites, new fields will have to be readded by hand	2017-10-11 10:16:25 +02:00
Session.h	Merged most recent 4.1 fixes to SQL rewrites, new fields will have to be readded by hand	2017-10-11 10:16:25 +02:00