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

2179 commits

This branch
This branch
All branches
Author SHA1 Message Date
mordred
266aefaa62 Take windows build path out of compiler.cmake 2019-01-02 15:28:24 +01:00
mordred
4c7ddf1beb Updated gitignore for moved config 2019-01-02 15:22:06 +01:00
mordred
2ed9d84bd0 True out of source build now possible. 2019-01-02 15:09:59 +01:00
mordred
3ffcf4e1fa Further cmake cleanup 2019-01-02 11:23:39 +01:00
mordred
551efcfe9a Slight cmake cleanup 2019-01-02 10:28:41 +01:00
Mordred
a25cfcd9d1 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
NotAdam
4673a8122e 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
717acba9cb 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
Mordred
959c2d4319 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
589205d41e 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
d421888a07 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
a04d01be90 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
e101c80faf 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
Dantestyle
3b4d83429a style 2018-12-30 19:11:30 +01:00
Dantestyle
470b0c867f [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
058e17d272 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
NotAdam
06afdfb79e 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
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
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
7ec29b0505 Merge pull request #463 from NotAdam/housing 
even more housing
 2018-12-30 11:53:04 +01:00
NotAdam
66964ec8f6 fix issue where items couldn't be placed in storeroom from inv 2018-12-30 21:26:32 +11:00
NotAdam
35db5865a2 fix eobj id allocation skipping every nth index 2018-12-30 20:26:03 +11:00
NotAdam
e758797213 minor refactoring and zero out model cache arrays on init 2018-12-30 20:24:20 +11:00
NotAdam
e418e61b4a #448 - Place character correctly on entering a house 2018-12-30 18:48:45 +11:00
NotAdam
50276dcbc3 #448 - remove deed on build 2018-12-30 17:44:03 +11:00
Dantestyle
dcf5e55c78 Press Enter after password and finally instant open client 2018-12-30 04:52:28 +01:00
Dantestyle
e1b91b8664 Avoid Cmake that create C++14 build with C++17 installed 2018-12-30 02:46:35 +01:00
Mordred
bd8fcfc0a8 Merge pull request #460 from NotAdam/housing 
merge dependency_injection into housing + some minor housing fixes
 2018-12-29 18:37:55 +01:00
NotAdam
d6d8edf57c fix items being dropped from globalitem when moving to house inv 2018-12-29 21:51:43 +11:00
NotAdam
b5b49f4d8c store aetheryte status in house object 2018-12-29 19:38:29 +11:00
NotAdam
d4f431b37a update estate guest access client trigger handler 2018-12-29 19:20:47 +11:00
NotAdam
7a135768d1 fix house building, update slot struct for house exteriors 2018-12-29 16:47:26 +11:00
NotAdam
6a3e38fa9a it works (again!) 2018-12-29 13:05:13 +11:00
NotAdam
dd8290150b Merge remote-tracking branch 'upstream/dependency_injection' into housing 2018-12-29 12:43:03 +11:00
NotAdam
861c7e5bc8 remove old todo 2018-12-29 11:52:21 +11:00
Mordred
f88bcfe8d5 Merge pull request #459 from NotAdam/housing 
[wip] housing object placement!!!!
 2018-12-29 01:12:07 +01:00
Mordred
c345033aa5 Seems like everything works again... here is hoping 2018-12-29 00:53:52 +01:00
NotAdam
0acabea06e add interior housing object movement updates 2018-12-28 22:50:46 +11:00
NotAdam
34ae82a562 fix items not being able to be removed from external storeroom 2018-12-28 20:10:07 +11:00