Ruckneum/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity
10,888 Commits 10 Branches 0 Tags 343 MiB
cc-heightmap
Commit Graph

7787 Commits

Author SHA1 Message Date
Crypto City
c7a56048e0 game: enable resize flag if anything is selected 2020-06-29 23:33:31 +00:00
Crypto City
3ede1a8e52 daemon: fix print_bc synopsis line 2020-06-29 22:23:00 +00:00
Crypto City
5b705e9ad0 cc: make hunts get less meat (and cost less labour) 2020-06-29 22:16:08 +00:00
Crypto City
149a1f8ff3 cc: increase food spoil rate a bit 2020-06-29 22:16:08 +00:00
Crypto City
dfc8d77b67 game: add a "no wallet" link in spectator mode and a quick intro text 2020-06-29 22:16:08 +00:00
Crypto City
16aa25cc1b game: add wallet creation capability 2020-06-29 22:16:08 +00:00
Crypto City
f6af276e28 Revert "tx_pool: temporary crash if we can't get a batch txn" 
This reverts commit 422f80ff86.
 2020-06-29 22:16:08 +00:00
Crypto City
05785d3789 cc: add town square bonus 2020-06-29 22:16:08 +00:00
Crypto City
d48350f09d game: make building settings read only if we're not the owner 2020-06-29 22:16:08 +00:00
Crypto City
c86f0826ce tx_pool: print spammy error only once 2020-06-29 22:16:08 +00:00
Crypto City
eefd589d20 mine all txes in offline mode 2020-06-29 22:16:08 +00:00
Crypto City
8716536b01 store/restore palette in derelict/removed buildings in game update 2020-06-29 22:16:08 +00:00
Crypto City
def2faacfe Revert "cryptonote_basic: make cc signature unprunable" 
This reverts commit c7ce18cfdb.
 2020-06-29 22:16:08 +00:00
Crypto City
ef2b4e7e8b Revert "cryptonote_basic: fix calculating hashes from pruned" 
This reverts commit 232164bb45.
 2020-06-29 22:16:08 +00:00
Crypto City
48015c885a game: plug undo/redo keys in 2020-06-29 22:16:08 +00:00
Crypto City
cbab2212ee game: fix ellipse selection on windows 2020-06-29 22:16:08 +00:00
Crypto City
817a25d011 cc: decrease labour cost for military buildings 2020-06-29 22:16:08 +00:00
Crypto City
6ed94ef015 tx_pool: don't complain about timed out txes, just ignore them 2020-06-29 22:16:08 +00:00
Crypto City
5311bb9ae9 game: better history pagination when filtering 2020-06-29 22:16:08 +00:00
Crypto City
2d598ed64e cc: make research cost decrease much slower with time 2020-06-29 22:16:08 +00:00
Crypto City
155acfe9d6 cc: decrease amount of food produced a bit 2020-06-29 22:16:08 +00:00
Crypto City
904f8cb920 game: add current top height in node section 2020-06-29 22:16:08 +00:00
Crypto City
513a9a9d20 cc: tweak moose/bear regeneration down a bit 2020-06-29 22:16:08 +00:00
Crypto City
1434ac8f5e cc: tweak heating needs a bit 2020-06-29 22:16:08 +00:00
Crypto City
4801700ddb rpc: fix test typo in relay_tx 2020-06-29 22:16:08 +00:00
Crypto City
fffeb1bdae cc: allow hunting with a population less than actual 2020-06-29 22:16:08 +00:00
Crypto City
39ae33f4d5 cc: log amount of money sent/received in event log 2020-06-29 22:16:08 +00:00
Crypto City
8e57dbef25 game: fix stale last update events list 2020-06-29 22:16:08 +00:00
Crypto City
f9cae3c326 cryptonote_protocol: don't drop connections for a conflicing tx 2020-06-29 22:16:08 +00:00
Crypto City
408480373e game: fix non 7 bit ASCII input 2020-06-29 22:16:07 +00:00
Crypto City
2efe96eb9b game: fix research ranking 2020-06-29 22:16:07 +00:00
Crypto City
161ba197b1 game: add a command to remove only top level blocks in the selection 2020-06-29 22:16:07 +00:00
Crypto City
5a4e37be99 game: make music default not include chiptunes 2020-06-29 22:16:07 +00:00
Crypto City
b6674fc24b game: fix selection based block removal removing from the bottom 2020-06-29 22:16:07 +00:00
Crypto City
b5fcb9e1b7 game: add random music selection and a skip track button 2020-06-29 22:16:07 +00:00
Crypto City
d3e5c83e4a game: fix focus on message boxes 2020-06-29 22:16:07 +00:00
Crypto City
8004178593 game: fix incorrect chat line count when resetting chat 2020-06-29 22:16:07 +00:00
Crypto City
3d7245a7f5 game: plug selection based key bindings into the game 2020-06-25 10:44:45 +00:00
Crypto City
232164bb45 cryptonote_basic: fix calculating hashes from pruned 2020-06-24 19:05:39 +00:00
Crypto City
422f80ff86 tx_pool: temporary crash if we can't get a batch txn 
It'll trigger if db corruption would ensue
 2020-06-24 09:27:35 +00:00
Crypto City
9eeea486e5 cryptonote_core: fix db state corruption 
When updating the block template after receiving a block,
the txpool speculative txn ends up reusing the syncing txn,
which means the abort doesn't actually abort, and the db
ends up with the speculative actions committed.
 2020-06-24 09:25:47 +00:00
Crypto City
3292a4e88a rpc: fix getting tiles from flag 2020-06-24 00:44:10 +00:00
Crypto City
5530ee7f30 db_lmdb: remove some more uninitialized padding in the db 2020-06-23 18:05:53 +00:00
Crypto City
6ad2217a7c daemon: add debug parsing of data as account/city/flag 2020-06-23 14:15:45 +00:00
Crypto City
f2586853ee tx_pool: print txid we failed to find meta for 2020-06-22 22:24:58 +00:00
Crypto City
562334fbf7 cc: start city levels a bit earlier, and make ciies cheaper 2020-06-22 22:16:08 +00:00
Crypto City
6e059b5c6c cc: add a couple more integer overflow checks to the build command 2020-06-22 22:15:13 +00:00
Crypto City
09c272a064 tests: add test for building with palette change 2020-06-22 22:15:13 +00:00
Crypto City
ac4b549063 game: add key bindings for block add/remove on selection and undo/redo 2020-06-22 22:15:13 +00:00
Crypto City
aad838775b cc: make command handlers default to verify log category 2020-06-22 22:15:13 +00:00
Crypto City
11cfd6b2b5 game: fix missing buildings totals row 2020-06-22 22:15:13 +00:00
Crypto City
1a43d39a69 game: fix stale list widgets 2020-06-22 22:15:13 +00:00
Crypto City
0d211b5c48 game: fix material/block confusion when abandoning builds 2020-06-22 22:15:13 +00:00
Crypto City
08c86aad5f game: add notification with approve/abandon when building 2020-06-22 22:15:13 +00:00
Crypto City
18c45236be game: add missing file 2020-06-22 22:15:13 +00:00
Crypto City
fd4873be57 cc: decrease the high end min size for RES2/RES3 2020-06-22 22:15:13 +00:00
Crypto City
cd9bd63d16 cc: tweak lunar date 2020-06-22 22:15:13 +00:00
Crypto City
0eaf2c7c44 game: fix falling through floors when ending up slightly below 2020-06-22 22:15:13 +00:00
Crypto City
57a473435e game: F and O keys can now go back to walker camera mode too 2020-06-22 22:15:13 +00:00
Crypto City
375bc342b4 game: update camera type widget when switching with keys 2020-06-22 22:15:13 +00:00
Crypto City
c177ac4a31 game: fix collisions after switching camera types 2020-06-22 22:15:13 +00:00
Crypto City
6ef6c7b381 tx_pool: also mine local txes in test mode 2020-06-22 22:15:13 +00:00
Crypto City
e424cb9538 game: avoid resetting lists when their contents don't change 2020-06-22 22:15:13 +00:00
Crypto City
c7ce18cfdb cryptonote_basic: make cc signature unprunable 
While it's technically prunable, we would not save much (64 bytes,
but we'd need to add 32 bytes for the hash of those 64 bytes), so
we might as well not bother
 2020-06-22 22:15:13 +00:00
moneromooo-monero
80174b8248 tx_pool: mine stem txes in fake chain mode 
This fixes the functional tests, since txes would not be mined
after being sent to the daemon (they'd be waiting for the
dandelion timeout first)
 2020-06-21 01:18:30 +00:00
Crypto City
3e05ee54fe tx_pool: do not allow more than one (non kept by block) hunt command at once 2020-06-21 01:18:30 +00:00
Crypto City
3af15d65e0 blockchain: return txes to the txpool when actions fail to execute 2020-06-21 01:18:29 +00:00
Crypto City
9a5e85e35a cryptonote_core: do not sync more than a randomx epoch at once 2020-06-21 01:18:29 +00:00
Crypto City
2b1dce37e6 tx_pool: only allow one research command per discovery per block 
The results of a research command are not known yet at the time
a block is filled with transactions
 2020-06-21 01:18:29 +00:00
Crypto City
93e1def31d blockchain: log commands that fail to execute 2020-06-21 01:18:29 +00:00
Crypto City
f112b180e3 cc: fix unlocking discoveries bug 2020-06-21 01:18:29 +00:00
Crypto City
25be313e16 cc: add cc default log category 2020-06-21 01:18:29 +00:00
Crypto City
1d007bd2e2 cc: store max city level in the update command 
so it can be properly reverted
 2020-06-21 01:18:29 +00:00
Crypto City
b945e80261 functional_tests: add randomx tests 2020-06-21 01:18:29 +00:00
Crypto City
75516e6e34 core: fix mining from a block that's not the current top 2020-06-21 01:18:29 +00:00
Crypto City
d15fb7d9f2 game: fix build commands with new material variants 2020-06-14 23:43:31 +00:00
Crypto City
62361e19f3 game: guard against -1 list selection 2020-06-14 23:43:31 +00:00
Crypto City
986967c064 game: fix readonly chat 2020-06-14 23:43:31 +00:00
Crypto City
a767fb4d4e tx_pool: fix potential exception filling a block template 2020-06-14 23:43:31 +00:00
Crypto City
df3678b3e0 game: fix removing blocks not looking up through palette 2020-06-14 23:43:31 +00:00
Crypto City
63667034df game: allow starting mining when a wallet without account is loaded 2020-06-14 23:43:31 +00:00
Crypto City
e6bd9ab95f cc: allow \r in player profile 2020-06-14 23:43:31 +00:00
Crypto City
87277db6da db_lmdb: zero out padding in db structures 
So db data doesn't have random unused data in it
 2020-06-14 23:43:31 +00:00
Crypto City
f32ee18b21 cc: print full mismatched game update txes only the first time 
They're huge and fill the log really fast
 2020-06-14 23:43:31 +00:00
Crypto City
e394496fca blockchain: add popped txes in original order 
since it matters for townforge due to dependencies within a block
 2020-06-14 23:43:31 +00:00
Crypto City
188328010e cc: decrease amount of wood needed for heating by 90% 2020-06-14 23:43:30 +00:00
Crypto City
704250e901 add a couple more city specializations 2020-06-14 23:43:30 +00:00
Crypto City
a8c61ebb81 tx_pool: copy insert_key_images dandelion changes to insert_cc_nonces 2020-06-14 23:43:30 +00:00
Crypto City
b39bc5406f cryptonote_core: fix incoming tx sorting 2020-06-14 23:43:30 +00:00
Crypto City
d72beedc33 game: add "ignore influence" better 2020-06-14 23:43:30 +00:00
Crypto City
399a9aeba3 game: lock wallet while refreshing 2020-06-14 23:43:30 +00:00
Crypto City
75cc5e8b36 game: add a couple include guards 2020-06-14 23:43:30 +00:00
Crypto City
ba8d50a973 game: cast to unsigned long when using %lu in printf 2020-06-14 23:43:30 +00:00
Crypto City
056b2e45fc game: use keccak instead of rand for cloud/horizon random numbers 
Turns out rand yields ridiculous looking forest/clouds on windows
 2020-06-14 23:43:30 +00:00
Crypto City
b586c8d290 game: fix locking bug on wallet load 2020-06-14 23:43:30 +00:00
Crypto City
a198126b75 game: link against zlib 2020-06-14 23:43:30 +00:00
Crypto City
5565a26aa4 game: fix locking bug 2020-06-14 23:43:30 +00:00
Crypto City
8e7a14f33d game: fix destruction ordering bug on exit 2020-06-14 23:43:30 +00:00
Crypto City
091c17928e game: enable start mining button only when a wallet is loaded 2020-06-14 23:43:30 +00:00
Crypto City
b21d24f388 start city levels a bit higher 2020-06-14 23:43:30 +00:00
Crypto City
23c813cf45 add city specializations 2020-06-14 23:43:30 +00:00
Crypto City
2bfba55751 game: do not load data from the installed urho3d 2020-06-14 23:43:30 +00:00
Crypto City
103e227edb add chiptune music too 2020-06-14 23:43:30 +00:00
Crypto City
d5f47b578e cc: make new cities ten times cheaper 2020-06-14 23:43:30 +00:00
Crypto City
bcd0d9dea1 make this build on windows 
Thanks to syksy and iDunk for testing/debugging on windows
 2020-06-14 23:43:30 +00:00
Crypto City
acb9e0f201 add architect badge 2020-06-07 17:22:35 +00:00
Crypto City
03f31114b5 add atlas badge 2020-06-07 17:22:35 +00:00
Crypto City
f8ad8d1724 game: add music 2020-06-07 17:22:35 +00:00
Crypto City
98d41a94d6 version: bump version to 0.18.1.0 2020-06-01 13:52:00 +00:00
Crypto City
0ae6f713fb blockchain: empty builtin hashes 2020-05-31 11:51:22 +00:00
Crypto City
2a90a3df6b fixes after merge 2020-05-31 00:41:03 +00:00
Crypto City
396157b032 Merge remote-tracking branch 'origin/master' into cc 2020-05-30 18:55:11 +00:00
Crypto City
1f3603d209 game: add missing files 2020-05-30 13:44:14 +00:00
Crypto City
453f4cf9af encode accrual as a signed integer for space savings 2020-05-30 11:46:19 +00:00
Crypto City
377486bb47 bump version to 0.18.0.1 2020-05-30 10:59:23 +00:00
Crypto City
da1894dbbf bump version to 0.18.0.0 2020-05-29 23:48:32 +00:00
Crypto City
5eb8dac1fa add new sandstone wall material 2020-05-29 23:48:32 +00:00
Crypto City
66e3a902b4 game: fix asserts in options dialog 2020-05-29 23:48:32 +00:00
Crypto City
bcda16b1ad game: fix spammy method hiding warning 2020-05-29 23:20:51 +00:00
Crypto City
9c352eb8f1 game: remove unused field 2020-05-29 23:20:51 +00:00
Crypto City
dd42a67f99 remove a couple pessimizing std::move 2020-05-29 23:20:51 +00:00
Crypto City
5c5f2f0aa0 add a few missing override 2020-05-29 23:20:51 +00:00
Crypto City
45c006b63b fix a couple class/struct mismatch 2020-05-29 23:20:51 +00:00
Crypto City
81e8a19880 remove unused/unneeded captures 2020-05-29 23:20:51 +00:00
Crypto City
bc21350d81 cc: fix operator precedence 2020-05-29 23:20:51 +00:00
Crypto City
d0eb30afe5 cc: fix bitise op 2020-05-29 23:20:51 +00:00
Crypto City
7ee418270e game: fix assert when closing the palette dialog 2020-05-29 23:20:51 +00:00
Crypto City
2098b31d0a db_lmdb: fix leaks 2020-05-29 23:20:51 +00:00
Crypto City
8d74dd747a game: build with optimizations again 2020-05-29 23:20:50 +00:00
Crypto City
7ad4e2dc78 tx_pool: remove txes when the parentage chain is too long 2020-05-29 23:20:50 +00:00
Crypto City
b9c69cf918 update blockchain_prune to handle cc tables 2020-05-29 23:20:50 +00:00
Crypto City
adb611acd5 cc: decrease military buildings stone requirements 2020-05-29 23:20:50 +00:00
Crypto City
c22e54b850 unlock_time is now valid only for coinbase txes 2020-05-29 23:20:50 +00:00
Crypto City
72796a1cc0 game: keep horizon trees on the ground when moving up/down 2020-05-29 23:20:50 +00:00
Crypto City
267b2ad975 game: thinner columns for scores with low range 2020-05-29 23:20:50 +00:00
Crypto City
b3e066d27f game: improve node section with sync ratio and hash rate 2020-05-29 23:20:50 +00:00
Crypto City
3caac66292 cc: some discovery patent time tweaks 2020-05-29 23:20:50 +00:00
Crypto City
dd15eb8d6c cc: quantize tax a bit 2020-05-29 23:20:50 +00:00
Crypto City
2e2b08830b blockchain: change block 1 tag 2020-05-29 23:20:50 +00:00
Crypto City
da975c6c35 game: add daemon start/stop mining from the game 2020-05-29 23:20:50 +00:00
Crypto City
637f5e7c3a game: hide "ignore influence" debug helper widget 2020-05-29 23:20:50 +00:00
Crypto City
3b752a31fb cc: add insulation discoveries 2020-05-29 23:20:50 +00:00
Crypto City
e7c7ee6f7f cc: add moose hide clothing discoveries 2020-05-29 23:20:50 +00:00
Crypto City
e5b55f7251 cc: decrease the higher thresholds for number of discoveries badge 2020-05-29 23:20:50 +00:00
Crypto City
b69cd8099c cc: add masonry discoveries 2020-05-29 23:20:50 +00:00
Crypto City
9e36486b8f add hunting tactics discoveries 2020-05-29 23:20:50 +00:00
Crypto City
81fce3a543 time chat txes out at 24 hours, not 12 2020-05-29 23:20:50 +00:00
Crypto City
5c13ec049a game: move the compass to the left, where it's not under the panel 2020-05-29 23:20:50 +00:00
Crypto City
215f524015 game: lighting tweaks 
Starker difference between fully lit and ambient, and draw the horizon
trees unlit, but change their material colour based on overall light
(it'll be faster, and gets rid of the occasional white tint)
 2020-05-29 23:20:50 +00:00
Crypto City
8508f1f6ef cc: tweak building role unlocking levels 2020-05-29 23:20:50 +00:00