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

128 commits

Author SHA1 Message Date
NotAdam
8a2b472554 additem returns an itemptr, handin item container 2018-08-12 22:53:21 +10:00
Mordred Admin
82ab19faae Renamed SkillHandler -> ActionHandler 2018-07-27 10:57:04 +02:00
Mordred
f5aba946be Merge remote-tracking branch 'origin/inventory_rework' into develop 2018-07-26 23:43:27 +02:00
NotAdam
d8afc7a83e remove a 2nd space in //gm gil output 2018-07-26 23:38:58 +10:00
Mordred Admin
e11f1b3f20 Finished removing old inventory class and moving stuff into player 2018-07-25 09:48:54 +02:00
Mordred
8555f3060f Not compilable atm, still moving stuff around 2018-07-24 23:58:08 +02:00
NotAdam
b8871519fe minor refactoring 2018-07-22 23:32:16 +10:00
NotAdam
9ab7d5c68a somewhat working gilshops 2018-07-22 23:20:22 +10:00
Mordred
d96c86853b Changed director trigger/function names 2018-07-17 22:39:04 +02:00
NotAdam
b856356ce7 fix sitting animating incorrectly for other clients, fixes #329 2018-07-12 21:10:02 +10:00
NotAdam
5eb846118d fix emotes which require a weapon to be unholstered 2018-07-12 20:42:28 +10:00
Mordred
c12c0b1d99 Groundwork for pose, still needs to be added to spawn / initui 2018-07-11 23:52:24 +02:00
NotAdam
c4f35b0753 sit now works correctly when doing /sit while sitting 2018-07-11 20:43:03 +10:00
NotAdam
7ee20730fa style 2018-07-10 20:25:08 +10:00
NotAdam
66fd8ba7fe fixed inter-instance gm calling, fixes #341 
as a note, calling someone into an instance has been disabled
 2018-07-10 20:22:46 +10:00
Mordred
3dcb7c3629 #329 Fixed relogging while persistent emote is on ( restting state to idle ) 2018-07-09 22:34:56 +02:00
Mordred
afbb247e1c Persistent emotes now show properly to other players on spawn 2018-07-09 21:48:42 +02:00
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
cd3e2f0b52 inventorymodifyhandler packet structure 2018-07-08 21:11:22 +10:00
NotAdam
7b1281fba4 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-08 19:45:37 +10:00
NotAdam
d1fe43fde3 add linkshell event, some cleanup 2018-07-08 12:38:08 +10:00
Mordred
5bd6e94a16 Walking displays correctly 2018-07-08 00:43:03 +02:00
NotAdam
6da1af4fb5 add tell and chat ipc structures 2018-07-07 22:27:35 +10:00
NotAdam
961621a903 cleanup 2018-07-07 17:14:30 +10:00
NotAdam
0fa55e3d9a fix searchinfo update, add searchinfo ipc struct 2018-07-07 16:50:11 +10:00
NotAdam
7607f42a67 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-07 13:41:35 +10:00
NotAdam
d561764ad1 cleanup clienttrigger ipc struct, verbose packet construction log switch 2018-07-07 13:38:15 +10:00
Mordred
ac9845f827 Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
5d8836e993 const correctness 2018-07-06 23:38:40 +10:00
NotAdam
2526ad7d90 convert more old incoming packets to structs 2018-07-06 23:36:50 +10:00
NotAdam
104b07d7fa start moving old packets to new incoming packet system 2018-07-06 22:43:54 +10:00
NotAdam
3051aaa9b4 fix typo 2018-07-06 22:43:26 +10:00
NotAdam
228053834a incoming packet deserialization 2018-07-06 19:47:35 +10:00
Mordred
3c2b45507c Fixed instances 2018-07-03 23:09:36 +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
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
goaaats
d27877d242 More renames 2018-07-03 14:31:20 +02:00
goaaats
46133d4f6f Rename ClientActorControl back to ClientTrigger 2018-07-03 14:20:51 +02:00
Mordred
464bcec7d9
Merge pull request #327 from AcedArmy/actor_rewrite 
Fixed Tell and add research I found for u3b in tell struct
 2018-07-03 12:13:19 +02: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
Biscuit Boy
e852e73865 Tell works again and add research I found for u3b 2018-07-02 23:16:55 +10: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
3daeffbb11 change [GM] chat to isActingAsGm instead of directly checking Status 2018-07-01 21:33:37 +10:00
Biscuit Boy
1172861d4d label now comes before getter in //gm teri 2018-07-01 21:31:26 +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
4b3d356a70 Emancipation from the GamePacket class, step 1 2018-06-18 23:03:39 +02:00
NotAdam
d4695a7b75 set IS_DELETE flag on discarded/deleted items 2018-06-12 22:57:28 +10:00