mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-04 01:37:47 +00:00
Code Activity
1533 commits 10 branches 14 tags 26 MiB
Commit graph

27 commits

Author SHA1 Message Date
Mordred
89a9b16555 Code style adjusted for 2 spaces and various other small things, checkout CodeStyle.xml for details 2018-08-29 21:40:59 +02:00
Mordred
7f7588ef1f Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
Mordred Admin
a3d5dc8c26 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 Admin
50ba02ed27 Removed old GamePacket 2018-07-03 09:20:09 +02:00
Mordred
b784c9e311 More packet conversion for lobby and zone 2018-07-03 00:01:26 +02:00
Mordred
671576b861 Packet rework of server_zone 2018-06-28 00:07:07 +02:00
goaaats
3b9811ef17 Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
Mordred
28840bca52
Merge pull request #317 from perize/develop 
EObj thing
 2018-06-12 06:22:28 +02:00
Perize
7662b46628 EObj anim 2018-06-12 09:29:21 +09:00
Mordred
04671e2e24 Cleanup cleanup cleanup 2018-06-03 19:31:03 +02:00
Mordred
738b09d5c5 More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
83cb17610c WiP - implementing new framework 2018-03-09 00:06:44 +01:00
Mordred Admin
b91e711834 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Mordred
22402651e9 Basic event play for directors, still buggy. Also some small fixes all around 2018-03-05 23:01:55 +01:00
Adam
6255df16f2 fix rotation in objectspawn ipc and send it too 2018-03-04 17:41:17 +11:00
Mordred
78d660a1ce Object despawning added 2018-03-01 23:17:35 +01:00
Adam
810d71f262 move eobj/player spawnindex generation to common manager 2018-03-02 02:55:02 +11:00
Adam
d024f0a396 fix eobj out of bounds allocation client crash 2018-02-28 23:53:20 +11:00
Mordred
e4d6711ad4 Fixed eobjects getting incorrect ids, fixed actors not properly removing from cells 2018-02-28 00:03:26 +01:00
Adam
4afc9e91b7 eobj interaction callbacks, eobj spawning fixed, sastasha instance eobjs 2018-02-27 02:13:01 +11:00
Adam
4137379853 fix possible null pointer access & eobj state update 2018-02-25 21:46:34 +11:00
Mordred
8cf15061d0 Fixed eventObject not using correct object id 2018-02-24 15:21:18 +01:00
Mordred
65242d2dee Added onEnterTerritory for IC, also changed the way IC is called 2018-02-24 15:19:32 +01:00
Mordred
acee4d4b51 EObjects are now given a name and can be retrieved using it 2018-02-24 00:07:07 +01:00
Mordred
f9722b5e2e EventObjects are not properly spawned and initialized 2018-02-23 23:47:21 +01:00
Mordred
692ca9d56e More stuff moved over to actor baseclass 2018-02-22 18:12:36 +01:00
Mordred
7073211411 Started stripping actors - readding after rewrite 2018-02-20 23:42:09 +01:00