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

1968 commits

Author SHA1 Message Date
AriAvery
ac2dcaec93 rename trigger (working) + build preset (starting) 2018-11-12 08:32:30 +01:00
Mordred
c5c76ebe13 Fixed initial housing settings and added another logmessage upon land purchase 2018-11-11 23:55:34 +01:00
Mordred
570b92313a Merge branch 'housing' of https://github.com/SapphireMordred/Sapphire into housing 2018-11-11 17:21:02 +01:00
Mordred
382bc91f53 Only allow buying one private land 2018-11-11 17:20:47 +01:00
mordred
eb49dc378d Travis fix 2018-11-11 15:37:57 +01:00
AriAvery
6181ced227 fixed errors 2018-11-11 14:53:19 +01:00
AriAvery
d46d4fe068 fixes 2018-11-11 14:34:56 +01:00
AriAvery
aa9e1e2450 Signs + rename 2018-11-11 14:27:39 +01:00
XeAri
67b1b2edd6
Merge pull request #2 from SapphireMordred/housing
Some additions
2018-11-11 12:38:19 +01:00
Mordred
492aaae449 Some additions 2018-11-11 12:10:57 +01:00
XeAri
93ee3d1e27
Merge pull request #1 from SapphireMordred/housing
Housing
2018-11-11 10:47:21 +01:00
Mordred
3cb4e79211 Cleanup and errorhandling 2018-11-10 23:47:19 +01:00
Mordred
ca87619161
Merge pull request #422 from XeAri/housing
Housing fixes
2018-11-10 22:26:25 +01:00
Mordred
2cd15779cd
Fixed typos 2018-11-10 22:04:40 +01:00
XeAri
cb828c051d
:/ 2018-11-10 19:15:04 +01:00
XeAri
97724d1871
Merge branch 'housing' into housing 2018-11-10 19:11:43 +01:00
AriAvery
6c004eef76 House fixes 2 2018-11-10 19:00:41 +01:00
AriAvery
dadc8184e9 House fixes 2018-11-10 19:00:13 +01:00
Mordred
155b59785b Start of land interaction 2018-11-10 12:48:19 +01:00
Mordred
61edc8248b Actually send gc information, too 2018-11-09 21:36:40 +01:00
mordred
721b1c745a Merge branch 'housing' of https://github.com/SapphireMordred/Sapphire into housing 2018-11-09 11:27:57 +01:00
Mordred
b6195c99fb
Merge pull request #421 from XeAri/housing
housing handler fix
2018-11-09 11:13:10 +01:00
AriAvery
07750857bf housing handler fix 2018-11-09 11:11:32 +01:00
mordred
872139b3ef Merge remote-tracking branch 'origin/develop' into housing 2018-11-09 11:10:34 +01:00
Mordred
910113c35f
Merge pull request #420 from XeAri/housing
added housing item UI
2018-11-09 10:58:35 +01:00
AriAvery
3d494e6949 fixes 2018-11-09 10:53:11 +01:00
AriAvery
191bb15332 removed senseless case 2018-11-09 10:39:56 +01:00
AriAvery
964ec2afa3 :/ 2018-11-09 10:00:36 +01:00
AriAvery
0ad312aed9 added min prices 2018-11-09 09:49:43 +01:00
AriAvery
6525a8e4f1 fixed style 2 2018-11-08 22:19:26 +01:00
AriAvery
aee2d26efc fixed style 2018-11-08 22:17:25 +01:00
AriAvery
38f1cb0d89 added housing debugHandler 2018-11-08 10:54:37 +01:00
AriAvery
df9a1c3697 class fix 2018-11-07 13:16:25 +01:00
AriAvery
cd589033ad More stuff 2018-11-07 11:59:59 +01:00
AriAvery
150a3f8a64 added Land Update function 2018-11-07 11:56:49 +01:00
AriAvery
b1fdff5400 added devaluation timer 2018-11-07 11:08:07 +01:00
AriAvery
e43ae8ed2e removed space 2018-11-07 10:49:02 +01:00
AriAvery
6ca53568d0 some fix 2018-11-07 09:27:57 +01:00
AriAvery
7b5057f99b added housing item UI 2018-11-07 09:05:03 +01:00
Mordred
a72f3b122c Sending quest info on loading finish, fixes housing login crash 2018-11-06 23:36:34 +01:00
Mordred
1f1b524d6f Fixed various small offset issues / packet sizes 2018-11-06 23:25:37 +01:00
mordred
bd0cf1718a Field size fix 2018-11-06 13:05:39 +01:00
mordred
8456067730 Create lookup for housing zones by landsetId, load housing zone from stored territoryId in player 2018-11-06 11:11:07 +01:00
mordred
c0a0594463 Added getter and setter for territoryId to player 2018-11-06 10:48:46 +01:00
mordred
c9242a04a4 Store and load territoryID 2018-11-06 10:36:45 +01:00
Mordred
ce26c04f3c
Merge pull request #419 from NotAdam/develop
correctly copy default config file if it doesn't exist
2018-11-06 08:49:37 +01:00
NotAdam
8e23292e82 correctly copy default config file if it doesn't exist 2018-11-06 18:35:02 +11:00
Mordred
fe2a6b8052 Expanded debug string 2018-11-05 23:39:08 +01:00
Mordred
5ffb8fd65e Use territoryType instead of TerritoryId, also refactor variables to reflect the change 2018-11-05 23:07:39 +01:00
Mordred
0f9320d9ea
Merge pull request #418 from NotAdam/housing
housing sql & //gm terri improvements
2018-11-05 13:24:10 +01:00