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
|
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 Admin
|
c2165e5f33
|
Cleanup of cmake files
|
2018-03-06 22:22:19 +01:00 |
|
Adam
|
841e292e9b
|
director sequence/branch setters & debug command
|
2018-02-28 22:25:18 +11:00 |
|
Mordred
|
2000d5d2f8
|
Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain
|
2018-02-10 01:21:31 +01:00 |
|
Mordred
|
0cb304083d
|
More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value>
|
2018-02-07 00:00:48 +01:00 |
|
Mordred
|
0d75ba0096
|
Basic director handling for instances, just the bare minimum so far
|
2018-02-06 00:01:23 +01:00 |
|
Mordred
|
0f16ad4812
|
Another approach at event improvements
|
2018-01-09 23:50:54 +01:00 |
|