1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-06 02:37:47 +00:00
Commit graph

2347 commits

Author SHA1 Message Date
Mordred
32a0d4725a 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
fc3b473a58 Ignore new binary too 2018-12-14 13:41:20 +01:00
Mordred
3725eeda03
Merge pull request #452 from NotAdam/housing
Ignore generated script files
2018-12-14 11:24:55 +01:00
NotAdam
8721999ec6 Ignore generated script files 2018-12-14 19:49:51 +11:00
mordred
54220bf4b0 size_t warning in gamepacketnew fixed 2018-12-13 13:25:00 +01:00
mordred
886b972f22 Only use precompiled headers under linux 2018-12-13 13:01:41 +01:00
mordred
f1be739272 Update .gitignore and sql_import.sh 2018-12-13 12:47:59 +01:00
mordred
8dcbfa5365 Restructured project slightly 2018-12-13 12:40:42 +01:00
mordred
036bc5fc24 Actually run sapphire_dbm 2018-12-13 10:18:51 +01:00
mordred
4899fe9629 Appveyor should ..hopefully... be fine now 2018-12-12 14:56:37 +01:00
mordred
74c31f3f11 What about a release windows build? 2018-12-12 14:18:27 +01:00
mordred
3e7e716841 use mysqlclient for statically linking in windows 2018-12-12 14:04:04 +01:00
mordred
1123c097bb Skip input on liquidate 2018-12-12 12:36:06 +01:00
mordred
e69d112d5f Allow force mode in dbm 2018-12-12 12:23:56 +01:00
mordred
4a920de104 Use sapphire_dbm to initialize the db 2018-12-12 12:07:26 +01:00
Adam
9b865d6a3a Revert "fix appveyor project id in readme"
This reverts commit b38541b0e4.
2018-12-12 18:15:57 +11:00
Adam
b38541b0e4
fix appveyor project id in readme 2018-12-12 18:09:50 +11:00
Mordred
2ba75fec20
Updated travis link in readme 2018-12-12 08:02:58 +01:00
Mordred
a3b45ec329 Replaced build flags with proper defines 2018-12-11 23:40:47 +01:00
Mordred
10274e3064 dbm -> Initialize functional; Liquidate initial work done 2018-12-11 00:04:29 +01:00
Mordred
43892f7add More dbm... 2018-12-08 01:11:46 +01:00
Mordred
fc56a48731
Merge pull request #449 from NotAdam/housing
Cleanup and some improvements/fixes
2018-12-07 23:36:42 +01:00
NotAdam
50c262d11b new and improved™️ naming convention has been rejected 2018-12-07 23:38:45 +11:00
NotAdam
6af13f39a3 LandIdent now uses signed ints, rename housing clienttriggers, fix formatting 2018-12-07 23:34:45 +11:00
NotAdam
6ca213f437 Fix issue where housing eobj wouldn't spawn on land build - #448 2018-12-07 20:36:52 +11:00
NotAdam
f0055d2f63 fix db schema so characters get created correctly 2018-12-07 20:12:20 +11:00
NotAdam
7d712aa42e refactor getInventory -> getItemContainer 2018-12-07 20:11:59 +11:00
NotAdam
4b8783aeca adjust size type in itemcontainer to accommodate larger inventories 2018-12-07 18:22:00 +11:00
NotAdam
899b4aead3 handle internal/external housing storeroom inventory requests 2018-12-07 18:22:00 +11:00
NotAdam
c1b3e5d393 cleanup housing ClientTrigger handling 2018-12-07 18:22:00 +11:00
Mordred
66c3aba1f6 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
b0f265bd9f
Merge pull request #447 from NotAdam/housing
More housing and gilshop fix
2018-12-04 19:31:09 +01:00
NotAdam
ef7a448ebc housing item containers and some minor cleanup/refactoring 2018-12-04 23:00:49 +11:00
NotAdam
e2b7012f3d fix shops only charging you the cost of 1 item even if you buy multiple 2018-12-04 22:27:54 +11:00
NotAdam
1905e0af2b show house greetings on ward selection ui 2018-12-04 22:20:41 +11:00
NotAdam
ea42e1ceba housing containers 2018-12-04 21:47:27 +11:00
Mordred
cd1a1feccd
Merge pull request #446 from NotAdam/housing
more housing
2018-12-02 18:27:50 +01:00
NotAdam
96c38f09df make the client marketboard ipc names clearer 2018-12-03 00:23:07 +11:00
NotAdam
f6f01a9ab8 market board item history packet 2018-12-03 00:11:26 +11:00
NotAdam
f61c6dd5e9 marketboard packets 2018-12-02 23:40:18 +11:00
NotAdam
b89a21120a some marketboard shit 2018-12-02 23:26:21 +11:00
NotAdam
d66d1e8d55 fix wrong placename when buying plot and some logmessage cleanup 2018-12-02 21:08:38 +11:00
NotAdam
d49eab1c1c fix housing furnishings menu not closing properly 2018-12-02 19:44:38 +11:00
NotAdam
394d8e2b28 only spawn/lookup house instance if player chooses to enter 2018-12-02 18:50:06 +11:00
NotAdam
e290febcc4 remove house instances that haven't had a player for 60 seconds 2018-12-02 18:05:50 +11:00
NotAdam
76662f6e2c minor cleanup and track house zone player activity 2018-12-02 17:27:59 +11:00
NotAdam
c13a0b14ed cleanup and document storeroom status actrl 2018-12-02 16:42:46 +11:00
NotAdam
6219455591 when exiting an instance, return the player to correct ward 2018-12-02 15:32:22 +11:00
NotAdam
d0dc247d64 fix zoning in/out of houses 2018-12-02 14:59:33 +11:00
NotAdam
97781b484d Merge remote-tracking branch 'upstream/housing' into housing 2018-12-02 13:50:45 +11:00