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

5006 commits

Author SHA1 Message Date
NotAdam
57c1f66310 raw packet data contains an ipc header, not segment 2018-07-06 20:37:01 +10:00
NotAdam
b3651c8abd client opcode updates 2018-07-06 20:32:36 +10:00
NotAdam
24615759ce client opcode updates 2018-07-06 20:32:36 +10:00
NotAdam
228053834a incoming packet deserialization 2018-07-06 19:47:35 +10:00
NotAdam
98bb3eb436 incoming packet deserialization 2018-07-06 19:47:35 +10:00
NotAdam
c3128e4ca3 remove old xmlconfig class 2018-07-06 19:47:07 +10:00
NotAdam
a322e81a53 remove old xmlconfig class 2018-07-06 19:47:07 +10:00
Mordred
173ed8174f Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-04 17:32:18 +02:00
Mordred
d8896bf53e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-04 17:32:18 +02:00
Mordred
b1e2678362 Initui fix. Still plenty of issues in it, at least bitmasks line up again though 2018-07-04 17:31:56 +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
NotAdam
829d851317 add packet injection back 2018-07-04 22:13:06 +10:00
NotAdam
924c455f34 add packet injection back 2018-07-04 22:13:06 +10:00
NotAdam
92cfe1e2a5 unlockAction now takes u16 param, unlockAction debug command added 2018-07-04 19:28:54 +10:00
NotAdam
3d09b3efc0 unlockAction now takes u16 param, unlockAction debug command added 2018-07-04 19:28:54 +10:00
Mordred Admin
22663bb560 Updated submodules 2018-07-04 09:01:47 +02:00
Mordred Admin
fec2b8c81b Updated submodules 2018-07-04 09:01:47 +02:00
Mordred
5e280c9d05 Added another trigger def and removed some debug prints 2018-07-03 23:25:44 +02:00
Mordred
56996b73f4 Added another trigger def and removed some debug prints 2018-07-03 23:25:44 +02:00
Mordred
3c2b45507c Fixed instances 2018-07-03 23:09:36 +02:00
Mordred
d10e3f9423 Fixed instances 2018-07-03 23:09:36 +02:00
Dantestyle
ef31c62b44 [Subquests] Adjusts 2018-07-03 21:37:14 +02:00
Dantestyle
f37ac11550 [Subquests] Adjusts 2018-07-03 21:37:14 +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 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
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
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
d27877d242 More renames 2018-07-03 14:31:20 +02:00
goaaats
70d58d2484 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
goaaats
b53f03aa9f Rename ClientActorControl back to ClientTrigger 2018-07-03 14:20:51 +02:00
Mordred
3e4067452a
Merge pull request #324 from DantestyleXD/CmnDefMogLetter 
Cmndefmogletter script added
 2018-07-03 12:14:26 +02:00
Mordred
b9019876cd Merge pull request #324 from DantestyleXD/CmnDefMogLetter 
Cmndefmogletter script added
 2018-07-03 12:14:26 +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
3448218ff6 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
NotAdam
66b25b0755 check if segmentTargetOverride is nonzero before overriding target 2018-07-03 20:12:28 +10:00
NotAdam
72c071eb07 check if segmentTargetOverride is nonzero before overriding target 2018-07-03 20:12:28 +10:00
NotAdam
0ae41974b2 segment header types, send inrange packets and override target id 2018-07-03 20:04:12 +10:00
NotAdam
f693fa0a2f segment header types, send inrange packets and override target id 2018-07-03 20:04:12 +10: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
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
50ba02ed27 Removed old GamePacket 2018-07-03 09:20:09 +02:00
Mordred Admin
8e6cdf0eda Removed old GamePacket 2018-07-03 09:20:09 +02:00
Mordred
b784c9e311 More packet conversion for lobby and zone 2018-07-03 00:01:26 +02:00
Mordred
30b08d5817 More packet conversion for lobby and zone 2018-07-03 00:01:26 +02:00
Biscuit Boy
e852e73865 Tell works again and add research I found for u3b 2018-07-02 23:16:55 +10:00
Biscuit Boy
c01cf130a4 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
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
062566f848 change isActingAsGm const location and add const to getOnlineStatus 2018-07-02 07:31:23 +10:00