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

359 commits

Author SHA1 Message Date
NotAdam
479a4369ab add packet hex dump, moved gm1handler to use struct inpacket 2018-07-06 21:53:35 +10:00
NotAdam
98bb3eb436 incoming packet deserialization 2018-07-06 19:47:35 +10: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
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
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
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
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
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
goaaats
f2c2087d7b Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
goaaats
bd24cb524a Streamline INI network configuration 2018-06-23 21:05:31 +02:00
Mordred
98751e0d5c Merge remote-tracking branch 'origin/develop' into packet_work 2018-06-18 23:04:00 +02:00
Mordred
972cd05e48 Emancipation from the GamePacket class, step 1 2018-06-18 23:03:39 +02:00
NotAdam
f3a0a1533d inventoryitemack opcode and some cleanup 2018-06-17 00:39:31 +10:00
Mordred
5c7b8e31e6 Merge pull request #318 from NotAdam/develop 
add item splitting and stacking
 2018-06-12 18:09:34 +02:00
NotAdam
31c452559a add silent param to not send item obtain actrl 2018-06-12 23:11:47 +10:00
NotAdam
12dcee8b8a set IS_DELETE flag on discarded/deleted items 2018-06-12 22:57:28 +10:00
NotAdam
3ac70352d1 #31 & #314: Splitting and stacking items in inventory now works 2018-06-12 22:46:05 +10:00
Mordred
460175f75d Merge pull request #317 from perize/develop 
EObj thing
 2018-06-12 06:22:28 +02:00
Perize
407bf76dc8 EObj anim 2018-06-12 09:29:21 +09:00
NotAdam
d3871ae6ce instanceCommenceTime is set by a function that returns a uint 2018-06-11 22:26:19 +10:00
NotAdam
2452410c58 remove old XMLConfig completely and implement new ConfigMgr 2018-06-11 02:34:26 +10:00
Mordred
10a39b2625 Cleanup cleanup cleanup 2018-06-03 19:31:03 +02:00
Mordred
86b2a9cded More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
d34598d295 Some cleanup and buildfix 2018-06-02 13:38:00 +02:00
Mordred
0f1ef9fd4d Removed unused functions 2018-05-29 22:12:55 +02:00
Mordred
88a512e8b2 More initui adjustments 2018-05-27 16:21:52 +02:00
Mordred
6a784921d5 Initial initui fixes ( still alot to do ) and inventory fix 2018-05-27 01:28:43 +02:00
Mordred
052ea5f1d2 Zone-Server should now start up fine again 2018-05-22 17:42:50 +02:00
Mordred
591b85a0ef Implemented quest flag getters and setters 2018-05-20 00:33:26 +02:00
goaaats
f609a936e6 Cleanup 2018-05-17 20:48:06 +02:00