mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-24 13:47:46 +00:00
Code Activity
1373 commits 10 branches 14 tags 26 MiB
Commit graph

1373 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
ae38f300e0 Merge pull request #344 from NotAdam/develop 
fixed inter-instance gm calling
 2018-07-10 12:26:05 +02: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
7fc434687c Merge pull request #343 from takhlaq/develop 
changed player.setQuestBitFlag functions to allow unsetting the bit
 2018-07-09 23:11:51 +02: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
Mordred
df090c0517 Merge pull request #342 from itsMaru/develop 
Emote stuff;
 2018-07-09 07:59:17 +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
Mordred
011a78a9b2 Merge pull request #340 from DantestyleXD/WeatherForeCast 
CmnDefWeatherForeCast script added
 2018-07-08 19:30:33 +02:00
Mordred
7a0390d38e Merge pull request #334 from NotAdam/develop 
use structs for incoming packets & some cleanup
 2018-07-08 19:30:11 +02:00
NotAdam
4bce3e8d4b inventorymodifyhandler packet structure 2018-07-08 21:11:22 +10:00
NotAdam
519b352281 opcode updates 2018-07-08 19:45:46 +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
Dantestyle
edf38453a2 CmnDefWeatherForeCast script added 2018-07-08 04:18:11 +02:00
Mordred
05afa413c9 Fixed localtime 2018-07-08 00:59:22 +02: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
Mordred
38dd184d94 Merge pull request #336 from takhlaq/develop 
fixed lobby not showing multiple characters
 2018-07-07 18:11:46 +02:00
Tahir Akhlaq
f961b962ed fixed lobby not showing multiple characters 
- updated initui for player commendations
 2018-07-07 15:24:19 +01:00
Mordred
3474354df9 Merge pull request #335 from goaaats/targetid_fix 
Correctly initialize m_targetId in Chara
 2018-07-07 14:35:56 +02:00
NotAdam
69624b5053 add tell and chat ipc structures 2018-07-07 22:27:35 +10:00
goaaats
02244211c4 Correctly initialize m_targetId in Chara 2018-07-07 14:06:10 +02: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
57c1f66310 raw packet data contains an ipc header, not segment 2018-07-06 20:37:01 +10:00
NotAdam
24615759ce client opcode updates 2018-07-06 20:32:36 +10:00
NotAdam
98bb3eb436 incoming packet deserialization 2018-07-06 19:47:35 +10:00
NotAdam
a322e81a53 remove old xmlconfig class 2018-07-06 19:47:07 +10:00
Mordred
d8896bf53e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-04 17:32:18 +02:00
Mordred
788a3a30a5 Initui fix. Still plenty of issues in it, at least bitmasks line up again though 2018-07-04 17:31:56 +02:00
Mordred
f13c0d84be Merge pull request #333 from NotAdam/develop 
packet injection & unlock action debug command
 2018-07-04 14:50:36 +02:00
NotAdam
924c455f34 add packet injection back 2018-07-04 22:13:06 +10:00
NotAdam
3d09b3efc0 unlockAction now takes u16 param, unlockAction debug command added 2018-07-04 19:28:54 +10:00
Mordred Admin
fec2b8c81b Updated submodules 2018-07-04 09:01:47 +02:00
Mordred
56996b73f4 Added another trigger def and removed some debug prints 2018-07-03 23:25:44 +02: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