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

244 commits

Author SHA1 Message Date
NotAdam
8c870d2f5d somewhat working gilshops 2018-07-22 23:20:22 +10:00
NotAdam
e3539fda75 extremely broken gilshop implementation 2018-07-22 22:11:03 +10:00
NotAdam
778de8f154 replace old inline generation of effects packet with a wrapper 2018-07-21 23:32:10 +10:00
NotAdam
f24bfaf74c fix builds with new effect packet 2018-07-21 15:54:37 +10:00
Mordred
6579a5d841 First step of inventory cleanup, moving defs to common 2018-07-20 22:39:10 +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
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
0b88f63aa9 persist emotes now persist through logout/login 2018-07-11 18:07:48 +10:00
Tahir Akhlaq
cf184bda51 changed player.setQuestBitFlag functions to allow unsetting the bit 2018-07-09 21:53:23 +01: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
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