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

6606 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
a25cfcd9d1 Merge remote-tracking branch 'origin/housing' into develop 2019-01-01 15:06:42 +01:00
Mordred
789127691a Merge remote-tracking branch 'origin/housing' into develop 2019-01-01 15:06:42 +01:00
Mordred
8bf71e90d5 Merge pull request #468 from NotAdam/housing 
fix a few housing related inventory issues
 2019-01-01 14:47:44 +01:00
Mordred
43e02b33e2
Merge pull request #468 from NotAdam/housing 
fix a few housing related inventory issues
 2019-01-01 14:47:44 +01:00
NotAdam
4673a8122e fix structs, disable market cache gen 2019-01-01 23:37:32 +11:00
NotAdam
f0202a2094 fix structs, disable market cache gen 2019-01-01 23:37:32 +11:00
NotAdam
cd19435876 somewhat working marketboard implementation 2019-01-01 17:29:06 +11:00
NotAdam
4fcfc6ecf1 somewhat working marketboard implementation 2019-01-01 17:29:06 +11:00
NotAdam
717acba9cb fix oob error on market board result lists and correctly sort the items 2019-01-01 14:19:44 +11:00
NotAdam
a37525d002 fix oob error on market board result lists and correctly sort the items 2019-01-01 14:19:44 +11:00
NotAdam
50d1d9d492 correctly send marketboard item list 2019-01-01 11:51:48 +11:00
NotAdam
0aa1fab9a4 correctly send marketboard item list 2019-01-01 11:51:48 +11:00
Mordred
959c2d4319 Simplified some cmake logic 2018-12-31 17:30:45 +01:00
Mordred
2761a9029a Simplified some cmake logic 2018-12-31 17:30:45 +01:00
Mordred
941cbde510 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-12-31 13:54:48 +01:00
Mordred
02dca45cfe Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-12-31 13:54:48 +01:00
Mordred
589205d41e Moved cmake logic to root cmakelists 2018-12-31 13:54:31 +01:00
Mordred
ade2dece10 Moved cmake logic to root cmakelists 2018-12-31 13:54:31 +01:00
NotAdam
af7a769433 start of marketboard implementation 2018-12-31 23:27:21 +11:00
NotAdam
6ce9d9557e start of marketboard implementation 2018-12-31 23:27:21 +11:00
NotAdam
d421888a07 fix storing items in the housing storerooms for real this time 2018-12-31 22:45:39 +11:00
NotAdam
72261e465b fix storing items in the housing storerooms for real this time 2018-12-31 22:45:39 +11:00
NotAdam
1c890a43bf handle fc doors properly 2018-12-31 22:02:34 +11:00
NotAdam
6398ad4fe4 handle fc doors properly 2018-12-31 22:02:34 +11:00
NotAdam
a04d01be90 some housing cleanup and refactoring 2018-12-31 21:54:32 +11:00
NotAdam
d6da6b5e3a some housing cleanup and refactoring 2018-12-31 21:54:32 +11:00
NotAdam
b7fcf6080c fix issue where items couldn't be removed from interior storeroom 2018-12-31 21:39:43 +11:00
NotAdam
bda7bc7131 fix issue where items couldn't be removed from interior storeroom 2018-12-31 21:39:43 +11:00
NotAdam
e101c80faf drop x86 support on windows 2018-12-31 18:39:43 +11:00
NotAdam
56f9687c28 drop x86 support on windows 2018-12-31 18:39:43 +11:00
Mordred
4e91ff005a Merge pull request #465 from DantestyleXD/SubFst005_+_SubFst045 
[Quest] SubFst005 + SubFst045
 2018-12-31 00:53:26 +01:00
Mordred
7b7fe27212
Merge pull request #465 from DantestyleXD/SubFst005_+_SubFst045 
[Quest] SubFst005 + SubFst045
 2018-12-31 00:53:26 +01:00
Dantestyle
3b4d83429a style 2018-12-30 19:11:30 +01:00
Dantestyle
15b034162c style 2018-12-30 19:11:30 +01:00
Dantestyle
470b0c867f [Quest] SubFst005 + SubFst045 added 2018-12-30 19:06:21 +01:00
Dantestyle
0fc99edded [Quest] SubFst005 + SubFst045 added 2018-12-30 19:06:21 +01:00
Mordred
803fcfe4de Merge pull request #464 from NotAdam/housing 
hide fc doors in private houses, fix log issue on windows
 2018-12-30 17:46:08 +01:00
Mordred
30afbf73d1
Merge pull request #464 from NotAdam/housing 
hide fc doors in private houses, fix log issue on windows
 2018-12-30 17:46:08 +01:00
Mordred
058e17d272 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-12-30 17:36:48 +01:00
Mordred
46780bf5cd Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-12-30 17:36:48 +01:00
Mordred
b2b38d2f10 Added a new table for spawnpoints and initial data 2018-12-30 17:36:30 +01:00
Mordred
3ffa92073d Added a new table for spawnpoints and initial data 2018-12-30 17:36:30 +01:00
NotAdam
06afdfb79e hide additional quarters door in private housing 2018-12-30 23:25:52 +11:00
NotAdam
fc9f33dd78 hide additional quarters door in private housing 2018-12-30 23:25:52 +11:00
NotAdam
d21b0018dc standardise log names and potentially fix log folder issue on windows 2018-12-30 22:36:44 +11:00
NotAdam
144d8e8f27 standardise log names and potentially fix log folder issue on windows 2018-12-30 22:36:44 +11:00
Mordred
5d3ec2f588 Merge pull request #461 from DantestyleXD/develop 
Avoid Cmake that create C++14 build with C++17 installed
 2018-12-30 11:53:59 +01:00
Mordred
30ef495a0a
Merge pull request #461 from DantestyleXD/develop 
Avoid Cmake that create C++14 build with C++17 installed
 2018-12-30 11:53:59 +01:00
Mordred
53738fb434 Merge pull request #462 from DantestyleXD/launcher 
[Launcher] Press Enter after password and finally instant open client
 2018-12-30 11:53:48 +01:00
Mordred
0e1f5c176f
Merge pull request #462 from DantestyleXD/launcher 
[Launcher] Press Enter after password and finally instant open client
 2018-12-30 11:53:48 +01:00