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

6793 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
NotAdam
8692dc425e Merge branch 'upstream/master' 2018-06-10 21:37:39 +10:00
Mordred
28d6839fd0 Merge pull request #305 from perize/master 
opcode
 2018-06-10 08:41:22 +02:00
Mordred
2fc83402c5
Merge pull request #305 from perize/master 
opcode
 2018-06-10 08:41:22 +02:00
Perize
4cd71f53fd opcode 2018-06-10 13:26:43 +09:00
Perize
3cb88883f8 opcode 2018-06-10 13:26:43 +09:00
Mordred
e2aab50155 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2018-06-07 20:33:21 +02:00
Mordred
32131d7037 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2018-06-07 20:33:21 +02:00
Mordred
2d5d0debca Cleanup 2018-06-07 20:33:06 +02:00
Mordred
f29671911e Cleanup 2018-06-07 20:33:06 +02:00
Mordred
78f8cdbaf5 Fixed initui packet -> equipping gear fixed 2018-06-07 20:32:02 +02:00
Mordred
1bde2bd802 Fixed initui packet -> equipping gear fixed 2018-06-07 20:32:02 +02:00
Mordred
9792c87da0 Merge pull request #303 from NotAdam/master 
add new ultimate instance script
 2018-06-05 12:23:56 +02:00
Mordred
9c599c217d
Merge pull request #303 from NotAdam/master 
add new ultimate instance script
 2018-06-05 12:23:56 +02:00
Adam
17018d6ccb fix incorrect type usage 2018-06-05 20:22:05 +10:00
Adam
2ac01971f9 fix incorrect type usage 2018-06-05 20:22:05 +10:00
Adam
c1be28e9d3 add new ultimate instance script 2018-06-05 20:16:35 +10:00