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

1338 commits

This branch
This branch
All branches
Author SHA1 Message Date
NotAdam
3e4582560d add packet hex dump, moved gm1handler to use struct inpacket 2018-07-06 21:53:35 +10:00
NotAdam
4897481309 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
228053834a 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
Mordred
173ed8174f 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
9ba4223e23
Merge pull request #333 from NotAdam/develop 
packet injection & unlock action debug command
 2018-07-04 14:50:36 +02:00
NotAdam
829d851317 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
Mordred Admin
22663bb560 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
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
3e4067452a
Merge pull request #324 from DantestyleXD/CmnDefMogLetter 
Cmndefmogletter script added
 2018-07-03 12:14:26 +02:00
Mordred
3866fa01fb
Merge pull request #331 from NotAdam/packet_work 
segment header types, send in range packets and override their target id
 2018-07-03 12:14:05 +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
NotAdam
66b25b0755 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
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
50ba02ed27 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
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
062566f848 change isActingAsGm const location and add const to getOnlineStatus 2018-07-02 07:31:23 +10:00
Biscuit Boy
667ab110b9 Update isActingAsGm so we don't call getOnlineStatus 3 times 2018-07-01 21:43:50 +10:00
Biscuit Boy
7ee18f713f Rename m_territoryInstanceMap to m_territoryIdToInstanceGuidMap 2018-07-01 21:36:35 +10:00
Biscuit Boy
3daeffbb11 change [GM] chat to isActingAsGm instead of directly checking Status 2018-07-01 21:33:37 +10:00
Biscuit Boy
54be80a26b add isActingAsGm in Player 2018-07-01 21:31:49 +10:00
Biscuit Boy
1172861d4d label now comes before getter in //gm teri 2018-07-01 21:31:26 +10:00
Mordred
ff380bde32
Merge pull request #326 from NotAdam/develop 
#314: fix items created via //gm item having incorrect data
 2018-06-30 08:35:45 +02:00
NotAdam
65c9647591 fix formatting 2018-06-30 12:49:47 +10:00
NotAdam
37b1500a09 inventory item creation cleanup 2018-06-30 12:49:34 +10:00
NotAdam
a2caccb2ee fix added items having incorrect data 2018-06-30 12:45:41 +10:00
NotAdam
0bd352b50b create larger stacks correctly, fix indent 2018-06-30 11:53:45 +10:00
Mordred
5a1830c59b Zone server actually works again 2018-06-28 23:42:12 +02:00
Mordred
1e89498d5f
Merge pull request #325 from itsMaru/packet_work 
Fix packet object slicing;
 2018-06-28 15:19:05 +02:00
Maru
bfab1588e0 no 2018-06-27 23:53:01 -03:00
Maru
f3c71b0076 fix PacketContainer entrylist type; 2018-06-27 23:48:18 -03:00
Mordred
671576b861 Packet rework of server_zone 2018-06-28 00:07:07 +02:00
Mordred
1564e8052e
Merge pull request #294 from DantestyleXD/action_return 
Return (Action 6) now work (again?)
 2018-06-26 07:56:29 +02:00
Mordred
7c1cb5f3bc
Merge pull request #292 from DantestyleXD/ManSea002 
ManSea002 now work properly
 2018-06-26 07:55:44 +02:00
Mordred
4ffd002296
Merge pull request #320 from DantestyleXD/ManFst003 
[Quest] ManFst003 added
 2018-06-26 07:54:55 +02:00
Dantestyle
088a8b03db MogLetter npcs struct add 2018-06-26 00:04:04 +02:00
Mordred
2de00dc70a
Merge pull request #322 from goaaats/ini_network_fixes 
zone, lobby, api: Streamline network configuration for new INI config
 2018-06-24 18:32:59 +02:00
goaaats
3b9811ef17 Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
goaaats
f414e70686 Add cmake objects.txt, exports.def to gitignore 2018-06-23 21:05:57 +02:00