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

152 commits

Author SHA1 Message Date
NotAdam
1b7d11bb43 addItem is way less retarded now, stacks are automagically filled first 2018-08-25 00:15:26 +10:00
NotAdam
0583459ed2 fix some compile warnings 2018-08-23 23:19:25 +10:00
NotAdam
347ec83ff3 additem returns an itemptr, handin item container 2018-08-12 22:53:21 +10:00
Mordred Admin
39613bfca1 Renamed SkillHandler -> ActionHandler 2018-07-27 10:57:04 +02:00
Mordred
d80753a657 Merge remote-tracking branch 'origin/inventory_rework' into develop 2018-07-26 23:43:27 +02:00
NotAdam
50121bf86b remove a 2nd space in //gm gil output 2018-07-26 23:38:58 +10:00
Mordred Admin
cdb30f1f9c Inventory code cleanup number 2, packetWrapper for slot update 2018-07-26 14:09:09 +02:00
Mordred Admin
1f5a890324 Finished removing old inventory class and moving stuff into player 2018-07-25 09:48:54 +02:00
Mordred
b85c1c244e Not compilable atm, still moving stuff around 2018-07-24 23:58:08 +02:00
NotAdam
78cd199ec8 minor refactoring 2018-07-22 23:32:16 +10:00
NotAdam
8c870d2f5d somewhat working gilshops 2018-07-22 23:20:22 +10:00
NotAdam
1594171b16 remove const constraint 2018-07-22 19:10:52 +10:00
NotAdam
b54ff95388 move common effect struct members into a shared struct for single target/aoe 2018-07-22 16:54:23 +10:00
NotAdam
778de8f154 replace old inline generation of effects packet with a wrapper 2018-07-21 23:32:10 +10:00
Mordred
6579a5d841 First step of inventory cleanup, moving defs to common 2018-07-20 22:39:10 +02:00
Mordred
e7cf9f9dbe Changed director trigger/function names 2018-07-17 22:39:04 +02:00
Maru
3032d9dc31 InitUI pose def + set val; 2018-07-14 19:32:50 -03:00
Mordred
b5bee7cfcb fixes #122 - Searchmessages wont be overwritten anymore 2018-07-12 20:01:38 +02:00
NotAdam
a1ec09db72 fix sitting animating incorrectly for other clients, fixes #329 2018-07-12 21:10:02 +10:00
NotAdam
0305777e38 fix emotes which require a weapon to be unholstered 2018-07-12 20:42:28 +10:00
Mordred
d09cdb15af Groundwork for pose, still needs to be added to spawn / initui 2018-07-11 23:52:24 +02:00
NotAdam
abbf5c11fc sit now works correctly when doing /sit while sitting 2018-07-11 20:43:03 +10:00
NotAdam
fccf3daf95 style 2018-07-10 20:25:08 +10:00
NotAdam
69a8086d7f 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
533ba50447 #329 Fixed relogging while persistent emote is on ( restting state to idle ) 2018-07-09 22:34:56 +02:00
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
4bce3e8d4b inventorymodifyhandler packet structure 2018-07-08 21:11:22 +10:00
NotAdam
ae895ccfc0 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-08 19:45:37 +10:00
NotAdam
27c11f392a add linkshell event, some cleanup 2018-07-08 12:38:08 +10:00
Mordred
406b69b88d Walking displays correctly 2018-07-08 00:43:03 +02:00
NotAdam
69624b5053 add tell and chat ipc structures 2018-07-07 22:27:35 +10:00
NotAdam
2e0fec5a10 cleanup 2018-07-07 17:14:30 +10:00
NotAdam
25b6359736 fix searchinfo update, add searchinfo ipc struct 2018-07-07 16:50:11 +10:00
NotAdam
801774e596 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-07 13:41:35 +10:00
NotAdam
c18ea5e734 cleanup clienttrigger ipc struct, verbose packet construction log switch 2018-07-07 13:38:15 +10:00
Mordred
814d9e995c Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
44eeda832b const correctness 2018-07-06 23:38:40 +10:00
NotAdam
833f4f1431 convert more old incoming packets to structs 2018-07-06 23:36:50 +10:00
NotAdam
09d00b8a7f start moving old packets to new incoming packet system 2018-07-06 22:43:54 +10:00
NotAdam
f774ba9d33 fix typo 2018-07-06 22:43:26 +10:00
NotAdam
479a4369ab add packet hex dump, moved gm1handler to use struct inpacket 2018-07-06 21:53:35 +10:00
NotAdam
98bb3eb436 incoming packet deserialization 2018-07-06 19:47:35 +10:00
NotAdam
924c455f34 add packet injection back 2018-07-04 22:13:06 +10:00
Mordred
d10e3f9423 Fixed instances 2018-07-03 23:09:36 +02: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
goaaats
70d58d2484 More renames 2018-07-03 14:31:20 +02:00