Mordred Admin 9d620d160c Merge remote-tracking branch 'origin/develop' into packet_work ... Conflicts: src/servers/sapphire_zone/Action/EventAction.cpp src/servers/sapphire_zone/Actor/Chara.cpp src/servers/sapphire_zone/Actor/EventObject.cpp src/servers/sapphire_zone/Actor/Player.cpp src/servers/sapphire_zone/Actor/PlayerInventory.cpp src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp src/servers/sapphire_zone/Zone/Zone.cpp		2018-07-03 15:01:13 +02:00
..
Config	maybe fix build	2018-06-11 03:17:16 +10:00
Crypt	Windows build fix	2017-12-18 23:10:36 +01:00
Database	Added SQL field for EquipDisplayFlags, fixed Legacy Mark	2018-05-17 20:46:11 +02:00
Exd	Zone-Server should now start up fine again	2018-05-22 17:42:50 +02:00
Logging	Moved and renamed Server_Common, now just src/common	2017-12-18 12:36:52 +01:00
Network	Merge remote-tracking branch 'origin/develop' into packet_work	2018-07-03 15:01:13 +02:00
Util	Const correct	2018-03-07 07:49:20 -03:00
CMakeLists.txt	Cleanup of cmake files	2018-03-06 22:22:19 +01:00
Common.h	Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl	2018-06-23 21:38:04 +02:00
CommonGen.cpp	Moved and renamed Server_Common, now just src/common	2017-12-18 12:36:52 +01:00
CommonGen.h	More zone refactoring, general style fixes	2018-02-14 21:11:23 +01:00
Forwards.h	More packet conversion for lobby and zone	2018-07-03 00:01:26 +02:00
Framework.cpp	WiP - implementing new framework	2018-03-09 00:06:44 +01:00
Framework.h	Additional assert in framwork	2018-03-09 11:16:36 +01:00
Version.cpp.in	Build fix... well ish...	2018-03-06 23:20:07 +01:00
Version.h	Moved and renamed Server_Common, now just src/common	2017-12-18 12:36:52 +01:00