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

1595 commits

Author SHA1 Message Date
Mordred
05afa413c9 Fixed localtime 2018-07-08 00:59:22 +02:00
Mordred
bc01b0ccb1 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-08 00:43:08 +02:00
Mordred
69a98f58df Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-08 00:43:08 +02:00
Mordred
5bd6e94a16 Walking displays correctly 2018-07-08 00:43:03 +02:00
Mordred
406b69b88d Walking displays correctly 2018-07-08 00:43:03 +02:00
Tahir Akhlaq
4889f8c1a9 fixed lobby not showing multiple characters 
- updated initui for player commendations
 2018-07-07 15:24:19 +01:00
Tahir Akhlaq
f961b962ed fixed lobby not showing multiple characters 
- updated initui for player commendations
 2018-07-07 15:24:19 +01:00
NotAdam
6da1af4fb5 add tell and chat ipc structures 2018-07-07 22:27:35 +10:00
NotAdam
69624b5053 add tell and chat ipc structures 2018-07-07 22:27:35 +10:00
NotAdam
0fa55e3d9a fix searchinfo update, add searchinfo ipc struct 2018-07-07 16:50:11 +10:00
NotAdam
25b6359736 fix searchinfo update, add searchinfo ipc struct 2018-07-07 16:50:11 +10:00
NotAdam
7607f42a67 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-07 13:41:35 +10:00
NotAdam
801774e596 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-07 13:41:35 +10:00
NotAdam
d561764ad1 cleanup clienttrigger ipc struct, verbose packet construction log switch 2018-07-07 13:38:15 +10:00
NotAdam
c18ea5e734 cleanup clienttrigger ipc struct, verbose packet construction log switch 2018-07-07 13:38:15 +10:00
Mordred
ac9845f827 Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
Mordred
814d9e995c Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
2526ad7d90 convert more old incoming packets to structs 2018-07-06 23:36:50 +10:00
NotAdam
833f4f1431 convert more old incoming packets to structs 2018-07-06 23:36:50 +10:00
NotAdam
104b07d7fa start moving old packets to new incoming packet system 2018-07-06 22:43:54 +10:00
NotAdam
09d00b8a7f start moving old packets to new incoming packet system 2018-07-06 22:43:54 +10:00
NotAdam
3051aaa9b4 fix typo 2018-07-06 22:43:26 +10:00
NotAdam
f774ba9d33 fix typo 2018-07-06 22:43:26 +10:00
NotAdam
3e4582560d add packet hex dump, moved gm1handler to use struct inpacket 2018-07-06 21:53:35 +10:00
NotAdam
479a4369ab 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
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
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 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
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