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

1340 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
goaaats
70d58d2484 More renames 2018-07-03 14:31:20 +02:00
goaaats
b53f03aa9f Rename ClientActorControl back to ClientTrigger 2018-07-03 14:20:51 +02:00
Mordred
b9019876cd Merge pull request #324 from DantestyleXD/CmnDefMogLetter 
Cmndefmogletter script added
 2018-07-03 12:14:26 +02:00
Mordred
6e7f1c6692 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
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
72c071eb07 check if segmentTargetOverride is nonzero before overriding target 2018-07-03 20:12:28 +10: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
Biscuit Boy
c01cf130a4 Tell works again and add research I found for u3b 2018-07-02 23:16:55 +10: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
af06875e93 Rename m_territoryInstanceMap to m_territoryIdToInstanceGuidMap 2018-07-01 21:36:35 +10:00
Biscuit Boy
569445632c change [GM] chat to isActingAsGm instead of directly checking Status 2018-07-01 21:33:37 +10:00
Biscuit Boy
4909791003 add isActingAsGm in Player 2018-07-01 21:31:49 +10:00
Biscuit Boy
2b3de5f5e6 label now comes before getter in //gm teri 2018-07-01 21:31:26 +10:00
Mordred
c3c3411565 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
6846e16fda fix formatting 2018-06-30 12:49:47 +10:00
NotAdam
200232ceed inventory item creation cleanup 2018-06-30 12:49:34 +10:00
NotAdam
820f755f17 fix added items having incorrect data 2018-06-30 12:45:41 +10:00
NotAdam
36ba7998de create larger stacks correctly, fix indent 2018-06-30 11:53:45 +10:00
Mordred
6797e61657 Zone server actually works again 2018-06-28 23:42:12 +02:00
Mordred
6d2b43e4c3 Merge pull request #325 from itsMaru/packet_work 
Fix packet object slicing;
 2018-06-28 15:19:05 +02:00
Maru
12ef194c7f no 2018-06-27 23:53:01 -03:00
Maru
65ea1ecac7 fix PacketContainer entrylist type; 2018-06-27 23:48:18 -03:00
Mordred
e9c9eaa53a Packet rework of server_zone 2018-06-28 00:07:07 +02:00
Mordred
196433ae59 Merge pull request #294 from DantestyleXD/action_return 
Return (Action 6) now work (again?)
 2018-06-26 07:56:29 +02:00
Mordred
333e1e99e0 Merge pull request #292 from DantestyleXD/ManSea002 
ManSea002 now work properly
 2018-06-26 07:55:44 +02:00
Mordred
9f13a4dc91 Merge pull request #320 from DantestyleXD/ManFst003 
[Quest] ManFst003 added
 2018-06-26 07:54:55 +02:00
Dantestyle
5b0b52482d MogLetter npcs struct add 2018-06-26 00:04:04 +02:00
Mordred
d6ec630976 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