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

1270 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
f414e70686 Add cmake objects.txt, exports.def to gitignore 2018-06-23 21:05:57 +02:00
goaaats
2b0e101459 Streamline INI network configuration 2018-06-23 21:05:31 +02:00
Mordred
2860ee1640
Merge pull request #321 from NotAdam/develop 
cleanup script includes
 2018-06-19 08:08:28 +02:00
NotAdam
cef9e36f97 cleanup script includes 2018-06-18 23:14:11 +10:00
Mordred
8391de9084
Merge pull request #319 from NotAdam/develop 
inventoryitemack opcode and some cleanup
 2018-06-16 17:05:47 +02:00
NotAdam
3c1bf4d328 inventoryitemack opcode and some cleanup 2018-06-17 00:39:31 +10:00
Mordred
c0fd27f73b
Merge pull request #318 from NotAdam/develop 
add item splitting and stacking
 2018-06-12 18:09:34 +02:00
NotAdam
7aa801d34b fix playtime 2018-06-12 23:46:36 +10:00
NotAdam
8b6286230a add silent param to not send item obtain actrl 2018-06-12 23:11:47 +10:00
NotAdam
d4695a7b75 set IS_DELETE flag on discarded/deleted items 2018-06-12 22:57:28 +10:00
NotAdam
4023fa103f #31 & #314: Splitting and stacking items in inventory now works 2018-06-12 22:46:05 +10:00
Mordred
28840bca52
Merge pull request #317 from perize/develop 
EObj thing
 2018-06-12 06:22:28 +02:00
Perize
7662b46628 EObj anim 2018-06-12 09:29:21 +09: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
766340fc2d instanceCommenceTime is set by a function that returns a uint 2018-06-11 22:26:19 +10:00
NotAdam
7ae386521e handin inventory container id 2018-06-11 22:15:35 +10:00
NotAdam
8e25230a83 Merge branch 'upstream/develop' 2018-06-11 17:55:13 +10: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
18740964be maybe fix build 2018-06-11 03:17:16 +10:00
NotAdam
490cab7479 formatting 2018-06-11 02:44:42 +10:00
NotAdam
5a5202dd6b add default configs 2018-06-11 02:40:15 +10:00
NotAdam
463d56e76e remove old XMLConfig completely and implement new ConfigMgr 2018-06-11 02:34:26 +10:00
NotAdam
86cdd21d6f new config class for ini files 2018-06-11 02:28:03 +10:00
NotAdam
829c5ccea4 fix compile warning 2018-06-11 02:26:26 +10:00
NotAdam
d3d02b19fd Merge branch 'origin/master' 2018-06-11 01:54:06 +10:00
NotAdam
8692dc425e Merge branch 'upstream/master' 2018-06-10 21:37:39 +10:00
Mordred
2fc83402c5
Merge pull request #305 from perize/master 
opcode
 2018-06-10 08:41:22 +02:00
Perize
3cb88883f8 opcode 2018-06-10 13:26:43 +09:00
Mordred
32131d7037 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2018-06-07 20:33:21 +02:00
Mordred
f29671911e Cleanup 2018-06-07 20:33:06 +02:00
Mordred
1bde2bd802 Fixed initui packet -> equipping gear fixed 2018-06-07 20:32:02 +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
2ac01971f9 fix incorrect type usage 2018-06-05 20:22:05 +10:00
Adam
2eb148a7b3 add new ultimate instance script 2018-06-05 20:16:35 +10:00
Mordred
52509cc3b1
Merge pull request #302 from goaaats/4-3-exdfixes 
Remove build guide from readme
 2018-06-03 20:54:32 +02:00
goaaats
6ec54f3f27
Update README.md 2018-06-03 20:47:22 +02:00
Mordred
dc64bcf9e6 Buildfix 2018-06-03 19:50:21 +02:00
Mordred
04671e2e24 Cleanup cleanup cleanup 2018-06-03 19:31:03 +02:00
Mordred
f6375f326e Reordered IPC list 2018-06-02 18:09:29 +02:00
Mordred
738b09d5c5 More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
911bf39af8 Some cleanup and buildfix 2018-06-02 13:38:00 +02:00
Mordred
6bd65843f3 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2018-05-29 22:13:01 +02:00
Mordred
5afe39cf59 Removed unused functions 2018-05-29 22:12:55 +02:00
Mordred
97881a46a8
Merge pull request #300 from NotAdam/master 
update opcodes
 2018-05-29 21:39:23 +02:00
Adam
d9782ed71a update opcodes 2018-05-29 23:33:45 +10:00
Mordred
187648d20c
Merge pull request #299 from goaaats/4-3-exdfixes 
Use generated EXD data for quest_parse
 2018-05-27 16:35:48 +02:00
Mordred
8439b9a922 More initui adjustments 2018-05-27 16:21:52 +02:00
Mordred
da11a778d6 Updateinventoryslot opcode 2018-05-27 01:31:29 +02:00
Mordred
e8445e7640 Initial initui fixes ( still alot to do ) and inventory fix 2018-05-27 01:28:43 +02:00