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

6588 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
NotAdam
cef9e36f97 cleanup script includes 2018-06-18 23:14:11 +10:00
Dantestyle
939117d584 [Quest] ManFst003 added 2018-06-17 19:22:18 +02:00
Dantestyle
82da50d69e [Quest] ManFst003 added 2018-06-17 19:22:18 +02:00
Mordred
f0c0ae3c24 Merge pull request #319 from NotAdam/develop 
inventoryitemack opcode and some cleanup
 2018-06-16 17:05:47 +02:00
Mordred
8391de9084
Merge pull request #319 from NotAdam/develop 
inventoryitemack opcode and some cleanup
 2018-06-16 17:05:47 +02:00
NotAdam
f3a0a1533d inventoryitemack opcode and some cleanup 2018-06-17 00:39:31 +10:00
NotAdam
3c1bf4d328 inventoryitemack opcode and some cleanup 2018-06-17 00:39:31 +10:00
Dantestyle
7716fe8f54 [ Quest ] Now they work fine 2018-06-12 23:57:36 +02:00
Dantestyle
12ab33d5d1 [ Quest ] Now they work fine 2018-06-12 23:57:36 +02:00
Mordred
5c7b8e31e6 Merge pull request #318 from NotAdam/develop 
add item splitting and stacking
 2018-06-12 18:09:34 +02:00
Mordred
c0fd27f73b
Merge pull request #318 from NotAdam/develop 
add item splitting and stacking
 2018-06-12 18:09:34 +02:00
NotAdam
a9ac2ca4c2 fix playtime 2018-06-12 23:46:36 +10:00
NotAdam
7aa801d34b fix playtime 2018-06-12 23:46:36 +10:00
NotAdam
31c452559a add silent param to not send item obtain actrl 2018-06-12 23:11:47 +10:00
NotAdam
8b6286230a 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
d4695a7b75 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
NotAdam
4023fa103f #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
Mordred
28840bca52
Merge pull request #317 from perize/develop 
EObj thing
 2018-06-12 06:22:28 +02:00