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

2175 commits

This branch
This branch
All branches
Author SHA1 Message Date
mordred
38d6f73951 Slight cmake cleanup 2019-01-02 10:28:41 +01:00
Mordred
789127691a Merge remote-tracking branch 'origin/housing' into develop 2019-01-01 15:06:42 +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
f0202a2094 fix structs, disable market cache gen 2019-01-01 23:37:32 +11:00
NotAdam
4fcfc6ecf1 somewhat working marketboard implementation 2019-01-01 17:29:06 +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
0aa1fab9a4 correctly send marketboard item list 2019-01-01 11:51:48 +11:00
Mordred
2761a9029a Simplified some cmake logic 2018-12-31 17:30:45 +01:00
Mordred
02dca45cfe Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-12-31 13:54:48 +01:00
Mordred
ade2dece10 Moved cmake logic to root cmakelists 2018-12-31 13:54:31 +01:00
NotAdam
6ce9d9557e start of marketboard implementation 2018-12-31 23:27:21 +11:00
NotAdam
72261e465b fix storing items in the housing storerooms for real this time 2018-12-31 22:45:39 +11:00
NotAdam
6398ad4fe4 handle fc doors properly 2018-12-31 22:02:34 +11:00
NotAdam
d6da6b5e3a some housing cleanup and refactoring 2018-12-31 21:54:32 +11:00
NotAdam
bda7bc7131 fix issue where items couldn't be removed from interior storeroom 2018-12-31 21:39:43 +11:00
NotAdam
56f9687c28 drop x86 support on windows 2018-12-31 18:39:43 +11:00
Mordred
7b7fe27212
Merge pull request #465 from DantestyleXD/SubFst005_+_SubFst045 
[Quest] SubFst005 + SubFst045
 2018-12-31 00:53:26 +01:00
Dantestyle
15b034162c style 2018-12-30 19:11:30 +01:00
Dantestyle
0fc99edded [Quest] SubFst005 + SubFst045 added 2018-12-30 19:06:21 +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
46780bf5cd Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-12-30 17:36:48 +01:00
Mordred
3ffa92073d Added a new table for spawnpoints and initial data 2018-12-30 17:36:30 +01:00
NotAdam
fc9f33dd78 hide additional quarters door in private housing 2018-12-30 23:25:52 +11:00
NotAdam
144d8e8f27 standardise log names and potentially fix log folder issue on windows 2018-12-30 22:36:44 +11: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
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
Mordred
e81ddd4a50
Merge pull request #463 from NotAdam/housing 
even more housing
 2018-12-30 11:53:04 +01:00
NotAdam
4d501b4eb2 fix issue where items couldn't be placed in storeroom from inv 2018-12-30 21:26:32 +11:00
NotAdam
8964d23246 fix eobj id allocation skipping every nth index 2018-12-30 20:26:03 +11:00
NotAdam
aa70c9775f minor refactoring and zero out model cache arrays on init 2018-12-30 20:24:20 +11:00
NotAdam
4d35888b27 #448 - Place character correctly on entering a house 2018-12-30 18:48:45 +11:00
NotAdam
79ed3d63d9 #448 - remove deed on build 2018-12-30 17:44:03 +11:00
Dantestyle
5b34e5ba5d Press Enter after password and finally instant open client 2018-12-30 04:52:28 +01:00
Dantestyle
dbdd7f8dae Avoid Cmake that create C++14 build with C++17 installed 2018-12-30 02:46:35 +01:00
Mordred
c4f0623b62
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
581a4bb54f fix items being dropped from globalitem when moving to house inv 2018-12-29 21:51:43 +11:00
NotAdam
a5f1711246 store aetheryte status in house object 2018-12-29 19:38:29 +11:00
NotAdam
4e9fadcdbb update estate guest access client trigger handler 2018-12-29 19:20:47 +11:00
NotAdam
a389b39eb2 fix house building, update slot struct for house exteriors 2018-12-29 16:47:26 +11:00
NotAdam
4d9802bdbb it works (again!) 2018-12-29 13:05:13 +11:00
NotAdam
ceebb27c1c Merge remote-tracking branch 'upstream/dependency_injection' into housing 2018-12-29 12:43:03 +11:00
NotAdam
309b12dbe0 remove old todo 2018-12-29 11:52:21 +11:00
Mordred
f030e759af
Merge pull request #459 from NotAdam/housing 
[wip] housing object placement!!!!
 2018-12-29 01:12:07 +01:00
Mordred
2557ed4f90 Seems like everything works again... here is hoping 2018-12-29 00:53:52 +01:00
NotAdam
0ca7b4815e add interior housing object movement updates 2018-12-28 22:50:46 +11:00
NotAdam
34e9ba131e fix items not being able to be removed from external storeroom 2018-12-28 20:10:07 +11:00
NotAdam
e81a666258 return player to parent housing zone if logged out inside house 2018-12-28 19:45:04 +11:00
NotAdam
dd5a899c1d add internal/external estate remodelling menus 2018-12-28 18:45:08 +11:00
NotAdam
3b37d14d64 maybe fix an issue where a container wouldn't get read properly 
also some extra item crap
 2018-12-28 17:12:24 +11:00
NotAdam
c5d06025a0 send spiritbond with inventory items 2018-12-28 15:48:13 +11:00