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
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
Perize
407bf76dc8 EObj anim 2018-06-12 09:29:21 +09:00
Perize
7662b46628 EObj anim 2018-06-12 09:29:21 +09:00
Dantestyle
6c6100170c Merge branch 'master' of https://github.com/DantestyleXD/Sapphire into Gridania_subquests 2018-06-11 22:04:40 +02:00
Dantestyle
5a1812773d Merge branch 'master' of https://github.com/DantestyleXD/Sapphire into Gridania_subquests 2018-06-11 22:04:40 +02:00
Mordred
d3bea5748c Merge pull request #307 from NotAdam/develop 
quest item handin inventory container id
 2018-06-11 14:46:39 +02:00
Mordred
a10875e51b
Merge pull request #307 from NotAdam/develop 
quest item handin inventory container id
 2018-06-11 14:46:39 +02:00
NotAdam
d3871ae6ce instanceCommenceTime is set by a function that returns a uint 2018-06-11 22:26:19 +10:00
NotAdam
766340fc2d instanceCommenceTime is set by a function that returns a uint 2018-06-11 22:26:19 +10:00
NotAdam
0e1dd12535 handin inventory container id 2018-06-11 22:15:35 +10:00
NotAdam
7ae386521e handin inventory container id 2018-06-11 22:15:35 +10:00
NotAdam
0568acae59 Merge branch 'upstream/develop' 2018-06-11 17:55:13 +10:00
NotAdam
8e25230a83 Merge branch 'upstream/develop' 2018-06-11 17:55:13 +10:00
Mordred
cb2e45a5a4 Merge pull request #306 from NotAdam/develop 
remove xmlconfig and implement new configmgr
 2018-06-11 09:49:09 +02:00
Mordred
598d913ba9
Merge pull request #306 from NotAdam/develop 
remove xmlconfig and implement new configmgr
 2018-06-11 09:49:09 +02:00
NotAdam
84542b3927 maybe fix build 2018-06-11 03:17:16 +10:00
NotAdam
18740964be maybe fix build 2018-06-11 03:17:16 +10:00
NotAdam
fd170f08dd formatting 2018-06-11 02:44:42 +10:00
NotAdam
490cab7479 formatting 2018-06-11 02:44:42 +10:00
NotAdam
0d7281e211 add default configs 2018-06-11 02:40:15 +10:00
NotAdam
5a5202dd6b add default configs 2018-06-11 02:40:15 +10:00
NotAdam
2452410c58 remove old XMLConfig completely and implement new ConfigMgr 2018-06-11 02:34:26 +10:00
NotAdam
463d56e76e remove old XMLConfig completely and implement new ConfigMgr 2018-06-11 02:34:26 +10:00
NotAdam
c034e4ca79 new config class for ini files 2018-06-11 02:28:03 +10:00
NotAdam
86cdd21d6f new config class for ini files 2018-06-11 02:28:03 +10:00
NotAdam
44c85b3136 fix compile warning 2018-06-11 02:26:26 +10:00
NotAdam
829c5ccea4 fix compile warning 2018-06-11 02:26:26 +10:00
NotAdam
c62499363d Merge branch 'origin/master' 2018-06-11 01:54:06 +10:00
NotAdam
d3d02b19fd Merge branch 'origin/master' 2018-06-11 01:54:06 +10:00
NotAdam
11de5be42d Merge branch 'upstream/master' 2018-06-10 21:37:39 +10:00