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

311 commits

Author SHA1 Message Date
Mordred
bc01b0ccb1 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
goaaats
9292ee94f5 Correctly initialize m_targetId in Chara 2018-07-07 14:06:10 +02:00
Mordred
ac9845f827 Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +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
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
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
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
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
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
goaaats
3b9811ef17 Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
goaaats
2b0e101459 Streamline INI network configuration 2018-06-23 21:05:31 +02:00
Mordred
685763ae73 Merge remote-tracking branch 'origin/develop' into packet_work 2018-06-18 23:04:00 +02:00
Mordred
4b3d356a70 Emancipation from the GamePacket class, step 1 2018-06-18 23:03:39 +02:00
NotAdam
3c1bf4d328 inventoryitemack opcode and some cleanup 2018-06-17 00:39:31 +10:00
Mordred
c0fd27f73b
Merge pull request #318 from NotAdam/develop 
add item splitting and stacking
 2018-06-12 18:09:34 +02:00
NotAdam
8b6286230a add silent param to not send item obtain actrl 2018-06-12 23:11:47 +10:00
NotAdam
d4695a7b75 set IS_DELETE flag on discarded/deleted items 2018-06-12 22:57:28 +10:00
NotAdam
4023fa103f #31 & #314: Splitting and stacking items in inventory now works 2018-06-12 22:46:05 +10:00
Mordred
28840bca52
Merge pull request #317 from perize/develop 
EObj thing
 2018-06-12 06:22:28 +02:00
Perize
7662b46628 EObj anim 2018-06-12 09:29:21 +09:00
NotAdam
766340fc2d instanceCommenceTime is set by a function that returns a uint 2018-06-11 22:26:19 +10:00
NotAdam
463d56e76e remove old XMLConfig completely and implement new ConfigMgr 2018-06-11 02:34:26 +10:00
Mordred
04671e2e24 Cleanup cleanup cleanup 2018-06-03 19:31:03 +02:00
Mordred
738b09d5c5 More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
911bf39af8 Some cleanup and buildfix 2018-06-02 13:38:00 +02:00
Mordred
5afe39cf59 Removed unused functions 2018-05-29 22:12:55 +02:00
Mordred
8439b9a922 More initui adjustments 2018-05-27 16:21:52 +02:00
Mordred
e8445e7640 Initial initui fixes ( still alot to do ) and inventory fix 2018-05-27 01:28:43 +02:00
Mordred
06b5113d78 Zone-Server should now start up fine again 2018-05-22 17:42:50 +02:00