1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 16:17:46 +00:00
Commit graph

652 commits

Author SHA1 Message Date
JeidoUran
880ea0a336 Added prepareZoning research + fixed typo 2019-01-06 16:32:06 +01:00
NotAdam
3349ccce42 initial move of all config items to a object 2019-01-06 23:39:42 +11:00
JeidoUran
12c053cdda Changed 'u3b' to 'isGm' and made it a bool 2019-01-06 04:48:54 +01:00
JeidoUran
dbb93a3d94 Merge branch 'develop' into crashes_fix 2019-01-06 02:14:25 +01:00
JeidoUran
15e206430a Sending a /tell while acting as a GM will send a GM Tell
GM Call was also fixed 3 commits ago, now works on players within instances
2019-01-06 02:07:40 +01:00
Mordred
b0ab052bd4 Changed sendDebug to use fmt aswell 2019-01-05 12:32:10 +01:00
NotAdam
6ef140e87d add logger message formatting 2019-01-04 21:47:19 +11:00
mordred
84d6175b20 Moved spawngroup query to prepared stmt 2019-01-04 08:54:39 +01:00
Mordred
c9468d8ad2 Automatically copy libmysql.dll to bin folder 2019-01-03 21:32:44 +01:00
mordred
e32a2ca8f7 Generate libs oos 2019-01-03 09:13:56 +01:00
mordred
3ffcf4e1fa Further cmake cleanup 2019-01-02 11:23:39 +01:00
Mordred
a25cfcd9d1 Merge remote-tracking branch 'origin/housing' into develop 2019-01-01 15:06:42 +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
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
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
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
NotAdam
66964ec8f6 fix issue where items couldn't be placed in storeroom from inv 2018-12-30 21:26:32 +11:00
NotAdam
50276dcbc3 #448 - remove deed on build 2018-12-30 17:44:03 +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
dd8290150b Merge remote-tracking branch 'upstream/dependency_injection' into housing 2018-12-29 12:43:03 +11:00
NotAdam
0acabea06e add interior housing object movement updates 2018-12-28 22:50:46 +11:00
NotAdam
2232cdddc9 add internal/external estate remodelling menus 2018-12-28 18:45:08 +11:00
NotAdam
e8d0ca63f5 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
750914f63f items can be removed from the estate and moved to storeroom/inventory 2018-12-28 11:49:36 +11:00
NotAdam
813836b1f1 base implementation of moving housing items back to player inventory
only works for internal items atm
2018-12-28 02:17:29 +11:00
NotAdam
c86371ac56 fix issue where yard items couldn't be moved properly 2018-12-27 23:49:20 +11:00
NotAdam
33bd3a7ad6 a bit of refactoring, partially working yard item movement 2018-12-27 22:28:31 +11:00
NotAdam
bda8acdf2c internal item rotation/movement done 2018-12-27 17:12:01 +11:00
NotAdam
46924ccdd5 fix container handling issue where they were created incorrectly 2018-12-27 15:52:48 +11:00
NotAdam
9f4648efa8 add internal housing item placement 2018-12-27 00:36:47 +11:00
NotAdam
9c7d0262e0 spawn internal house items from db 2018-12-26 22:39:00 +11:00
NotAdam
1f26eb9627 handle item positions better & some minor cleanup/refactoring 2018-12-26 19:34:43 +11:00
NotAdam
d3301b0b9f add external housing object placing 2018-12-26 18:11:18 +11:00
NotAdam
e58014174c fix msvc builds and cleanup some warnings 2018-12-26 13:37:13 +11:00
NotAdam
19017f6e12 remove model params from item constructor 2018-12-25 21:53:05 +11:00
NotAdam
52c35e0ccb create all estate inventories on launch 2018-12-25 21:05:13 +11:00
NotAdam
95be37add0 fix an issue where multiple items could get created at the same time
subsequently, they would get the same itemid and this would fail
2018-12-25 20:11:41 +11:00
NotAdam
99c9d5edf8 use HousingItem instead of Item for housing inventories 2018-12-23 22:43:35 +11:00
NotAdam
b124ae06b1 more refactoring + sql 2018-12-23 20:54:21 +11:00
NotAdam
2dd08e1551 housing inventories work, parts are loaded from db now
plus a shitload of cleanup and refactoring
2018-12-23 19:13:30 +11:00
Mordred
f52588cdb2 Progress... 2018-12-23 03:53:08 +01:00
NotAdam
40e3865782 cleanup old house apperance crap 2018-12-22 17:29:40 +11:00
NotAdam
8b70f79108 fix house init, some refactoring and base inventory impl 2018-12-22 14:35:42 +11:00