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

232 commits

Author SHA1 Message Date
Mordred
e7e8977d5b Persistent emotes now show properly to other players on spawn 2018-07-09 21:48:42 +02:00
Maru
a52b6803fd Emote stuff, launcher; 
Please don't look

Emote stuff;
 2018-07-09 01:29:16 -03:00
Mordred
e9891a35c0 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
58efdbb519 emotes with motion only added #329 2018-07-08 23:25:27 +02:00
NotAdam
ae895ccfc0 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-08 19:45:37 +10:00
Mordred
69a98f58df Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-08 00:43:08 +02:00
Mordred
406b69b88d Walking displays correctly 2018-07-08 00:43:03 +02:00
goaaats
02244211c4 Correctly initialize m_targetId in Chara 2018-07-07 14:06:10 +02:00
NotAdam
25b6359736 fix searchinfo update, add searchinfo ipc struct 2018-07-07 16:50:11 +10:00
Mordred
814d9e995c Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
3d09b3efc0 unlockAction now takes u16 param, unlockAction debug command added 2018-07-04 19:28:54 +10: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
57cf959c94 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
f693fa0a2f segment header types, send inrange packets and override target id 2018-07-03 20:04:12 +10:00
Mordred Admin
c7760a0dc6 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
8e6cdf0eda Removed old GamePacket 2018-07-03 09:20:09 +02:00
Mordred
30b08d5817 More packet conversion for lobby and zone 2018-07-03 00:01:26 +02:00
Mordred
70425780d5 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
27cfa2f27f change isActingAsGm const location and add const to getOnlineStatus 2018-07-02 07:31:23 +10:00
Biscuit Boy
c83c59c25d Update isActingAsGm so we don't call getOnlineStatus 3 times 2018-07-01 21:43:50 +10:00
Biscuit Boy
4909791003 add isActingAsGm in Player 2018-07-01 21:31:49 +10: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
460175f75d Merge pull request #317 from perize/develop 
EObj thing
 2018-06-12 06:22:28 +02:00
Perize
407bf76dc8 EObj anim 2018-06-12 09:29:21 +09:00
NotAdam
2452410c58 remove old XMLConfig completely and implement new ConfigMgr 2018-06-11 02:34:26 +10:00
Mordred
10a39b2625 Cleanup cleanup cleanup 2018-06-03 19:31:03 +02:00
Mordred
86b2a9cded More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
052ea5f1d2 Zone-Server should now start up fine again 2018-05-22 17:42:50 +02:00
Mordred
591b85a0ef Implemented quest flag getters and setters 2018-05-20 00:33:26 +02:00
goaaats
251ecf6d28 Added SQL field for EquipDisplayFlags, fixed Legacy Mark 2018-05-17 20:46:11 +02:00
Adam
92e03bfcdd shouldn't default to a nonexistant onlinestatus... 2018-04-24 20:36:06 +10:00
Adam
248952443f biscuit didn't copy my code correctly 😢 2018-04-24 20:34:36 +10:00
Biscuit Boy
fb8208af1e How did I not notice that.... 2018-04-20 02:22:09 +10:00
Biscuit Boy
879ce3609e Spacing should go back here 2018-04-19 23:04:31 +10:00
Biscuit Boy
6f86347aa0 Must be a fire type 2018-04-19 23:02:24 +10:00
Biscuit Boy
b760f08f29 Digital Monsters? 2018-04-19 22:50:17 +10:00
Biscuit Boy
b401c951a7 I love me some style and wording fixes 2018-04-19 22:34:45 +10:00
Biscuit Boy
3db961c726 Use that Gminvis yo 2018-04-19 22:30:23 +10:00
Biscuit Boy
7e17c6cf23 Fixed Shitty commit mistake 2018-04-19 22:27:57 +10:00
Biscuit Boy
ab7d745e65 Added status priority and made the invis check better 2018-04-19 22:22:20 +10:00
Biscuit Boy
b89ac35227 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
c24c215208 fix infinite callback loop 2018-03-20 23:56:06 +11:00
Adam
6304e097e4 eventPlay -> playScene, added playSceneChain 2018-03-20 22:08:25 +11:00
Adam
1771ed14b4 proper festival handling (woah) 2018-03-20 20:30:05 +11:00
Adam
108268b107 bgm is set correctly for instances 2018-03-15 20:48:35 +11:00
Mordred
c501a62916 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
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