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

5422 commits

Author SHA1 Message Date
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
NotAdam
72c071eb07 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
NotAdam
f693fa0a2f 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
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
50ba02ed27 Removed old GamePacket 2018-07-03 09:20:09 +02:00
Mordred Admin
8e6cdf0eda 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
Mordred
30b08d5817 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
Biscuit Boy
c01cf130a4 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
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
062566f848 change isActingAsGm const location and add const to getOnlineStatus 2018-07-02 07:31:23 +10:00
Biscuit Boy
27cfa2f27f 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
c83c59c25d 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
af06875e93 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
569445632c 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
4909791003 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
Biscuit Boy
2b3de5f5e6 label now comes before getter in //gm teri 2018-07-01 21:31:26 +10:00
NotAdam
65c9647591 fix formatting 2018-06-30 12:49:47 +10:00
NotAdam
6846e16fda 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
200232ceed 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
820f755f17 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
NotAdam
36ba7998de 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
6797e61657 Zone server actually works again 2018-06-28 23:42:12 +02:00
Maru
bfab1588e0 no 2018-06-27 23:53:01 -03:00
Maru
12ef194c7f no 2018-06-27 23:53:01 -03:00
Maru
f3c71b0076 fix PacketContainer entrylist type; 2018-06-27 23:48:18 -03:00
Maru
65ea1ecac7 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
e9c9eaa53a 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
196433ae59 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
333e1e99e0 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
Mordred
9f13a4dc91 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