16 commits

Author	SHA1	Message	Date
NotAdam	f24bfaf74c	fix builds with new effect packet	2018-07-21 15:54:37 +10:00
Mordred	6579a5d841	First step of inventory cleanup, moving defs to common	2018-07-20 22:39:10 +02:00
NotAdam	0305777e38	fix emotes which require a weapon to be unholstered	2018-07-12 20:42:28 +10:00
goaaats	02244211c4	Correctly initialize m_targetId in Chara	2018-07-07 14:06:10 +02:00
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
Mordred	30b08d5817	More packet conversion for lobby and zone	2018-07-03 00:01:26 +02:00
Mordred	e9c9eaa53a	Packet rework of server_zone	2018-06-28 00:07:07 +02:00
goaaats	f2c2087d7b	Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl	2018-06-23 21:38:04 +02:00
Mordred	86b2a9cded	More cleanup yet	2018-06-02 15:52:35 +02:00
Mordred	24399e31e4	WiP - implementing new framework	2018-03-09 00:06:44 +01:00
Mordred Admin	c2165e5f33	Cleanup of cmake files	2018-03-06 22:22:19 +01:00
Mordred	0833bdd76c	Merge remote-tracking branch 'origin/master' into actor_rewrite	2018-03-06 00:10:36 +01:00
Mordred	37e7c2e51b	Basic event play for directors, still buggy. Also some small fixes all around	2018-03-05 23:01:55 +01:00
Mordred	8b5d30802d	More stuff moved over to actor baseclass	2018-02-22 18:12:36 +01:00
Mordred	dc1a7e4ae1	Actors are now used as base for any entity	2018-02-22 15:31:10 +01:00
Mordred	c664c5de90	Renaming classes in preperation of actor rework	2018-02-20 22:46:44 +01:00