1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 22:57:45 +00:00
Commit graph

1991 commits

Author SHA1 Message Date
Mordred
d6deff3d2e Fixed binary build path for binaries under windows, changed the way entriesd in the framework are created to hopefully get better errorhandling in world 2018-12-16 14:26:38 +01:00
mordred
e7b3f4ae3f Ignore new binary too 2018-12-14 13:41:20 +01:00
Mordred
2d66cc5012 Merge pull request #452 from NotAdam/housing
Ignore generated script files
2018-12-14 11:24:55 +01:00
NotAdam
064855c8d6 Ignore generated script files 2018-12-14 19:49:51 +11:00
mordred
4df42c718b size_t warning in gamepacketnew fixed 2018-12-13 13:25:00 +01:00
mordred
241d066bf3 Only use precompiled headers under linux 2018-12-13 13:01:41 +01:00
mordred
726c122bab Update .gitignore and sql_import.sh 2018-12-13 12:47:59 +01:00
mordred
ea64b65331 Restructured project slightly 2018-12-13 12:40:42 +01:00
mordred
1750159247 Actually run sapphire_dbm 2018-12-13 10:18:51 +01:00
mordred
8b937414a4 Appveyor should ..hopefully... be fine now 2018-12-12 14:56:37 +01:00
mordred
a89def6f4a What about a release windows build? 2018-12-12 14:18:27 +01:00
mordred
ecb486e7c7 use mysqlclient for statically linking in windows 2018-12-12 14:04:04 +01:00
mordred
762d7a941d Skip input on liquidate 2018-12-12 12:36:06 +01:00
mordred
18ae25521c Allow force mode in dbm 2018-12-12 12:23:56 +01:00
mordred
90831ea089 Use sapphire_dbm to initialize the db 2018-12-12 12:07:26 +01:00
Adam
2f03d9e656 Revert "fix appveyor project id in readme"
This reverts commit ca0db7c584.
2018-12-12 18:15:57 +11:00
Adam
ca0db7c584 fix appveyor project id in readme 2018-12-12 18:09:50 +11:00
Mordred
bd18cffdda Updated travis link in readme 2018-12-12 08:02:58 +01:00
Mordred
bfacc85e96 Replaced build flags with proper defines 2018-12-11 23:40:47 +01:00
Mordred
b37262e374 dbm -> Initialize functional; Liquidate initial work done 2018-12-11 00:04:29 +01:00
Mordred
de77e94e56 More dbm... 2018-12-08 01:11:46 +01:00
Mordred
c58edb540d Merge pull request #449 from NotAdam/housing
Cleanup and some improvements/fixes
2018-12-07 23:36:42 +01:00
NotAdam
9e412306b6 new and improved™️ naming convention has been rejected 2018-12-07 23:38:45 +11:00
NotAdam
3f372d3aa1 LandIdent now uses signed ints, rename housing clienttriggers, fix formatting 2018-12-07 23:34:45 +11:00
NotAdam
86fb678b0c Fix issue where housing eobj wouldn't spawn on land build - #448 2018-12-07 20:36:52 +11:00
NotAdam
795c8280d5 fix db schema so characters get created correctly 2018-12-07 20:12:20 +11:00
NotAdam
703049e14f refactor getInventory -> getItemContainer 2018-12-07 20:11:59 +11:00
NotAdam
60e372b232 adjust size type in itemcontainer to accommodate larger inventories 2018-12-07 18:22:00 +11:00
NotAdam
b49b5ab15a handle internal/external housing storeroom inventory requests 2018-12-07 18:22:00 +11:00
NotAdam
60f5fd580e cleanup housing ClientTrigger handling 2018-12-07 18:22:00 +11:00
Mordred
23226f0e44 Fixed small event issues. Changed sapphire to use new DB setup. Database has to be created using the schema.sql and inserts.sql 2018-12-07 00:06:59 +01:00
Mordred
338032b700 Merge pull request #447 from NotAdam/housing
More housing and gilshop fix
2018-12-04 19:31:09 +01:00
NotAdam
60e643dd0e housing item containers and some minor cleanup/refactoring 2018-12-04 23:00:49 +11:00
NotAdam
cee0ca87b4 fix shops only charging you the cost of 1 item even if you buy multiple 2018-12-04 22:27:54 +11:00
NotAdam
ed3ada4020 show house greetings on ward selection ui 2018-12-04 22:20:41 +11:00
NotAdam
2c89d7923d housing containers 2018-12-04 21:47:27 +11:00
Mordred
23b5d4ce21 Merge pull request #446 from NotAdam/housing
more housing
2018-12-02 18:27:50 +01:00
NotAdam
0b137d740f make the client marketboard ipc names clearer 2018-12-03 00:23:07 +11:00
NotAdam
c30ce5deb1 market board item history packet 2018-12-03 00:11:26 +11:00
NotAdam
b3810069d0 marketboard packets 2018-12-02 23:40:18 +11:00
NotAdam
48c0f96ce6 some marketboard shit 2018-12-02 23:26:21 +11:00
NotAdam
61ee5bb16a fix wrong placename when buying plot and some logmessage cleanup 2018-12-02 21:08:38 +11:00
NotAdam
29dbc7fb19 fix housing furnishings menu not closing properly 2018-12-02 19:44:38 +11:00
NotAdam
78fd15f0af only spawn/lookup house instance if player chooses to enter 2018-12-02 18:50:06 +11:00
NotAdam
b91f41ba29 remove house instances that haven't had a player for 60 seconds 2018-12-02 18:05:50 +11:00
NotAdam
150eb3317b minor cleanup and track house zone player activity 2018-12-02 17:27:59 +11:00
NotAdam
f589ff0815 cleanup and document storeroom status actrl 2018-12-02 16:42:46 +11:00
NotAdam
aded517eb0 when exiting an instance, return the player to correct ward 2018-12-02 15:32:22 +11:00
NotAdam
e198705503 fix zoning in/out of houses 2018-12-02 14:59:33 +11:00
NotAdam
29b968d096 Merge remote-tracking branch 'upstream/housing' into housing 2018-12-02 13:50:45 +11:00