Commit Graph

1539 Commits

Author SHA1 Message Date
Crypto City
e349e5694e give higher level woods more heating power 2020-10-26 13:09:35 +00:00
Crypto City
08433773e1 cc: make bonuses/penalties size dependent on role 2020-10-26 13:09:35 +00:00
Crypto City
e40212a683 cc: make marble easier to get 2020-10-26 13:09:35 +00:00
Crypto City
f2808a6a39 more tile size optimization
Tiles are now stored as a single packed byte stream,
including in the game, and unpacked/repacked as necessary
2020-10-25 18:47:26 +00:00
Crypto City
34a4d2b618 fixes after monero merge 2020-10-19 12:17:51 +00:00
Crypto City
43b8112c1e Merge branch 'master' into cc 2020-10-18 00:33:51 +00:00
Crypto City
cb353a875d daemon: include nonce to txid map in print_pool 2020-10-17 23:30:31 +00:00
Crypto City
110e1d227e functional_tests: add an item count consistency check 2020-10-17 23:30:31 +00:00
Crypto City
da5d2a429a fix a few niggles with broken assert_exception in functional tests 2020-10-17 23:30:31 +00:00
Crypto City
c6fc32a423 functional_tests: fix typo testing balances and remove dead code 2020-10-17 23:30:30 +00:00
Crypto City
29fa6c7222 wood can now be chopped into firewood 2020-10-17 23:30:30 +00:00
Crypto City
7b51ad56bc WIP - mortgages 2020-10-17 23:29:26 +00:00
Crypto City
9b291c45b3 WIP - mortgages 2020-10-17 23:29:26 +00:00
Crypto City
f7bd04fc12 remove custom item amount field, it is now redundant
since we track supply for all items
2020-10-17 23:29:26 +00:00
Crypto City
9586a32958 WIP - mortgages 2020-10-17 23:29:26 +00:00
Crypto City
b033e75db0 add more user data space to custom items 2020-10-17 23:28:43 +00:00
Crypto City
5710bb74dd WIP - scripts 2020-10-17 23:28:43 +00:00
Crypto City
cd61a1024b functional_tests: fix game update tests going out of labour 2020-10-07 00:54:17 +00:00
Crypto City
bd20a169ec functional_tests: more city and game update tests 2020-09-29 12:14:10 +00:00
Crypto City
7d495bc49c core_test: fix core tests (not enough labour) 2020-09-28 21:09:07 +00:00
Crypto City
2ed24f1918 functional_tests: fix repairing from the wrong account in farming test 2020-09-28 21:09:07 +00:00
Crypto City
81ac18db00 rewrite city cost function 2020-09-28 21:09:07 +00:00
Crypto City
31e74fba63 tests: fix a few tests after recent changes 2020-09-28 21:09:07 +00:00
Alexander Blair
2e83628d02
Merge pull request #6840
6ee9f1260 fuzz_tests: fix build error in signature fuzz test (moneromooo-monero)
2020-09-27 16:16:54 -07:00
Crypto City
1aba8c4743 functional_tests: fix cc_repair arguments 2020-09-24 19:29:55 +00:00
Crypto City
029375c6dc unit_tests: fix influence tests from military after related changes 2020-09-24 19:29:55 +00:00
Crypto City
045c9a7c94 core_tests: fix nonce reuse core test 2020-09-24 19:29:55 +00:00
Crypto City
b7c431c15e remove cost from buy_land command 2020-09-24 19:29:55 +00:00
iamamyth
163f83720f
functional_tests: rewrite mining code, clearer timeout info 2020-09-24 20:04:05 +02:00
moneromooo-monero
6ee9f12607
fuzz_tests: fix build error in signature fuzz test 2020-09-24 15:17:57 +00:00
Crypto City
967ec1957a unit_tests: add another better test for harvest overflow 2020-09-17 02:30:44 +00:00
Crypto City
d8a3c29b67 cc: increase heating requirements a fair bit 2020-09-17 02:30:44 +00:00
Crypto City
21e095ab90 fix tests after price changes 2020-09-17 02:30:44 +00:00
Crypto City
a389011f3c add new plant breeding discoveries 2020-09-17 02:30:44 +00:00
Crypto City
fdd27879f1 add merge mining with monero 2020-09-17 02:30:43 +00:00
moneromooo-monero
f11531d046 add_aux_pow now adds aux hashes at fixed slots in the aux merkle tree
To protect against mining multiple blocks of a chain with only one PoW
2020-09-16 22:55:06 +00:00
moneromooo-monero
8cf2bb107e New add_aux_pow RPC to support merge mining 2020-09-13 22:16:07 +00:00
Crypto City
a3ce8f4290 cc: double last resort prices 2020-09-13 22:16:07 +00:00
luigi1111
fd657c7706
Merge pull request #6798
4e44306 enable CLSAG support for Trezor client (ph4r05)
2020-09-07 14:30:41 -05:00
Riccardo Spagni
aefa7740c3
Merge pull request #6111
d20ff4f64 functional_tests: add a large (many randomx epochs) p2p reorg test (moneromooo-monero)
6a0b3b1f8 functional_tests: add randomx tests (moneromooo-monero)
9d42649d5 core: fix mining from a block that's not the current top (moneromooo-monero)
2020-09-06 15:49:37 +02:00
Dusan Klinec
4e4430603f
enable CLSAG support for Trezor client 2020-09-04 01:24:58 +02:00
luigi1111
ee0b02d0db
Merge pull request #6757
6a37da8 threadpool: guard against exceptions in jobs, and armour plating (moneromooo-monero)
2020-09-03 12:25:59 -05:00
Crypto City
9c61486243 unit_tests: fix failure due to reading uninitialized city data 2020-09-02 23:07:03 +00:00
Crypto City
b648ed500a new resilient soil city specialization, fix nutrients recovery, add tests 2020-09-02 23:07:03 +00:00
Crypto City
c29d308510 cc: protect against integer overflow in intermediate calculations 2020-09-02 23:07:03 +00:00
Crypto City
3714a4e5b0 fix unbound unit tests link error 2020-09-02 23:07:03 +00:00
Crypto City
7a1ba041e8 tests: fix tests failures now that blockchain init queries cities 2020-09-02 23:07:03 +00:00
moneromooo-monero
6a37da837e
threadpool: guard against exceptions in jobs, and armour plating
Those would, if uncaught, exit run and leave the waiter to wait
indefinitely for the number of active jobs to reach 0
2020-09-01 14:33:33 +00:00
Crypto City
a8d494074b coins can now be different gold content based on type 2020-08-30 18:13:56 +00:00
Crypto City
40d58c0c9d add dependencies where appropriate to make -jN work 2020-08-29 12:17:11 +00:00