mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-08 19:57:46 +00:00
Code Activity
1862 commits 10 branches 14 tags 26 MiB
Commit graph

231 commits

Author SHA1 Message Date
Maru
542541b1f6 Emote stuff, launcher; 
Please don't look

Emote stuff;
 2018-07-09 01:29:16 -03:00
Mordred
f6d387c161 Emotes can now be interrupted, getting in and out of persistant emotes including /sit should work fine, too #329 2018-07-08 23:44:37 +02:00
Mordred
a5191c2b4f emotes with motion only added #329 2018-07-08 23:25:27 +02:00
NotAdam
7b1281fba4 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-08 19:45:37 +10:00
Mordred
bc01b0ccb1 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-08 00:43:08 +02:00
Mordred
5bd6e94a16 Walking displays correctly 2018-07-08 00:43:03 +02:00
goaaats
9292ee94f5 Correctly initialize m_targetId in Chara 2018-07-07 14:06:10 +02:00
NotAdam
0fa55e3d9a fix searchinfo update, add searchinfo ipc struct 2018-07-07 16:50:11 +10:00
Mordred
ac9845f827 Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
92cfe1e2a5 unlockAction now takes u16 param, unlockAction debug command added 2018-07-04 19:28:54 +10: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
b28a4e6776
Merge pull request #323 from goaaats/actor_control_redo 
common, zone: Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl
 2018-07-03 14:38:57 +02:00
NotAdam
0ae41974b2 segment header types, send inrange packets and override target id 2018-07-03 20:04:12 +10:00
Mordred Admin
b2aeed0f8a Merge remote-tracking branch 'origin/develop' into packet_work 
Conflicts:
	src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
	src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
 2018-07-03 09:32:14 +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
d4133f19d9
Merge pull request #287 from AcedArmy/actor_rewrite 
Fixed making new zones and done some more gm stuff
 2018-07-02 11:34:47 +02:00
Biscuit Boy
062566f848 change isActingAsGm const location and add const to getOnlineStatus 2018-07-02 07:31:23 +10:00
Biscuit Boy
667ab110b9 Update isActingAsGm so we don't call getOnlineStatus 3 times 2018-07-01 21:43:50 +10:00
Biscuit Boy
54be80a26b add isActingAsGm in Player 2018-07-01 21:31:49 +10: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
NotAdam
463d56e76e remove old XMLConfig completely and implement new ConfigMgr 2018-06-11 02:34:26 +10: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
06b5113d78 Zone-Server should now start up fine again 2018-05-22 17:42:50 +02:00
Mordred
522010881d Implemented quest flag getters and setters 2018-05-20 00:33:26 +02:00
goaaats
b2621bd5d6 Added SQL field for EquipDisplayFlags, fixed Legacy Mark 2018-05-17 20:46:11 +02:00
Adam
24a2de55e1 shouldn't default to a nonexistant onlinestatus... 2018-04-24 20:36:06 +10:00
Adam
7a64e5f33f biscuit didn't copy my code correctly 😢 2018-04-24 20:34:36 +10:00
Biscuit Boy
6a6f5b4349 How did I not notice that.... 2018-04-20 02:22:09 +10:00
Biscuit Boy
c78e33c53f Spacing should go back here 2018-04-19 23:04:31 +10:00
Biscuit Boy
e4b9db8853 Must be a fire type 2018-04-19 23:02:24 +10:00
Biscuit Boy
77cb5d7d50 Digital Monsters? 2018-04-19 22:50:17 +10:00
Biscuit Boy
168cc7409b I love me some style and wording fixes 2018-04-19 22:34:45 +10:00
Biscuit Boy
10eec1f954 Use that Gminvis yo 2018-04-19 22:30:23 +10:00
Biscuit Boy
51a1c020a1 Fixed Shitty commit mistake 2018-04-19 22:27:57 +10:00
Biscuit Boy
f815e3e3d2 Added status priority and made the invis check better 2018-04-19 22:22:20 +10:00
Biscuit Boy
22abaf9d23 Added a whole lot of GM Stuff 
Added Icons, Added Invis, Added Chat Types for what we have now
 2018-04-18 21:00:20 +10:00
Adam
a1c531932c fix infinite callback loop 2018-03-20 23:56:06 +11:00
Adam
dd8ed62430 eventPlay -> playScene, added playSceneChain 2018-03-20 22:08:25 +11:00
Adam
d7006574ac proper festival handling (woah) 2018-03-20 20:30:05 +11:00
Adam
093f23c5c4 bgm is set correctly for instances 2018-03-15 20:48:35 +11:00
Mordred
855ae3e961 Instance join cutscene will no longer mess up the player, removed wrong field from event start, cotire server_zone only when using linux 2018-03-12 23:51:17 +01: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
ec0335b64a Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +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