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

6109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Biscuit Boy
1172861d4d 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
Mordred
ff380bde32
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
65c9647591 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
37b1500a09 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
a2caccb2ee 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
NotAdam
0bd352b50b 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
5a1830c59b 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
Mordred
1e89498d5f
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
bfab1588e0 no 2018-06-27 23:53:01 -03:00
Maru
65ea1ecac7 fix PacketContainer entrylist type; 2018-06-27 23:48:18 -03:00
Maru
f3c71b0076 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
671576b861 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
1564e8052e
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
7c1cb5f3bc
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
Mordred
4ffd002296
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
Dantestyle
088a8b03db 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
Mordred
2de00dc70a
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
goaaats
f2c2087d7b Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
goaaats
3b9811ef17 Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
goaaats
a042599a64 Add cmake objects.txt, exports.def to gitignore 2018-06-23 21:05:57 +02:00
goaaats
f414e70686 Add cmake objects.txt, exports.def to gitignore 2018-06-23 21:05:57 +02:00
goaaats
bd24cb524a Streamline INI network configuration 2018-06-23 21:05:31 +02:00
goaaats
2b0e101459 Streamline INI network configuration 2018-06-23 21:05:31 +02:00
Dantestyle
72500b83c7 update 2018-06-20 20:17:45 +02:00
Dantestyle
9c8a7f5318 update 2018-06-20 20:17:45 +02:00
Dantestyle
7c512d5d30 VS must hate me 2018-06-20 20:04:42 +02:00
Dantestyle
805eb07451 VS must hate me 2018-06-20 20:04:42 +02:00
Dantestyle
43f3530d8f typo and style 2018-06-19 23:53:02 +02:00
Dantestyle
c189089f76 typo and style 2018-06-19 23:53:02 +02:00
Mordred
8a163bd693 Merge pull request #321 from NotAdam/develop 
cleanup script includes
 2018-06-19 08:08:28 +02:00
Mordred
2860ee1640
Merge pull request #321 from NotAdam/develop 
cleanup script includes
 2018-06-19 08:08:28 +02:00
Mordred
98751e0d5c Merge remote-tracking branch 'origin/develop' into packet_work 2018-06-18 23:04:00 +02:00
Mordred
685763ae73 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
Mordred
4b3d356a70 Emancipation from the GamePacket class, step 1 2018-06-18 23:03:39 +02:00
NotAdam
0d2aeb63b1 cleanup script includes 2018-06-18 23:14:11 +10:00