Alexander Blair
8e3f46dd0a
Merge pull request #6881
...
11b20229c
2020-10-18 23:25:54 -07:00
Alexander Blair
142489bd60
Merge pull request #6882
...
fcbfb0a00
2020-10-18 23:25:32 -07:00
Alexander Blair
543d600042
Merge pull request #6875
...
a12a8174e
2020-10-18 23:25:08 -07:00
Alexander Blair
9bbf66504e
Merge pull request #6862
...
5f228e4b7
2020-10-18 23:24:06 -07:00
Riccardo Spagni
27a576ba34
Merge pull request #6917
...
49192a626
2020-10-18 17:25:04 +02:00
selsta
49192a626f
README: update fork table recommended version
2020-10-18 16:12:34 +02:00
xiphon
fc2f97177b
wallet2: wait for propagation timeout before marking tx as failed
2020-10-18 14:00:56 +00:00
moneromooo-monero
c67fa32496
bump default number of connections from 8 to 12
2020-10-18 13:25:05 +00:00
Howard Chu
b7dd8349f4
Allow setting start block on export
...
And make import honor the starting block# recorded in a bootstrap file
2020-10-18 14:01:44 +01:00
Alexander Blair
519740a1d3
Merge pull request #6905
...
88fde0309
2020-10-18 05:51:43 -07:00
moneromooo-monero
88fde0309a
blockchain: fix sync at v14 boundary
...
Miners with MLSAG txes which they'd already verified included
a couple in that block, but the consensus rules had changed
in the meantime, so that block is technically invalid and any
node which did not already have those two txes in their txpool
could not sync. Grandfather them in, since it has no effect in
practice.
2020-10-18 11:52:33 +00:00
Crypto City
43b8112c1e
Merge branch 'master' into cc
2020-10-18 00:33:51 +00:00
Crypto City
9ab3f422a6
rpc: add merged_mined flag to block header response data
2020-10-17 23:30:31 +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
6d974e2adc
cc: fix labour supply accounting when hunting
2020-10-17 23:30:31 +00:00
Crypto City
2880e5fc69
cc: remove obsolete redundant 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
4a84a63f34
game: add optional message in select items dialog
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
8941170106
README: fix typo
2020-10-17 23:30:30 +00:00
Crypto City
c04f132b53
cc: decrease most special event durations
2020-10-17 23:30:30 +00:00
Crypto City
b8a84f7680
cc: validate name before looking up in the db
2020-10-17 23:30:30 +00:00
Crypto City
46e4dc0878
cc: fix underflow in game update
2020-10-17 23:30:30 +00:00
Crypto City
029ecc635f
game: add a "jump to building" key
2020-10-17 23:30:30 +00:00
Crypto City
04c3f87205
game: make filter line auto focus in account selection dialog
2020-10-17 23:29:26 +00:00
Crypto City
0ee762a550
cc: substantially decrease flood/earthquake damage
2020-10-17 23:29:26 +00:00
Crypto City
3e3b062c19
WIP - mortgages
2020-10-17 23:29:26 +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
12e21aa279
game: enable resize button only when selected area meets min size
2020-10-17 23:29:26 +00:00
Crypto City
2d85b15010
game: reword minting deadline to work with non mintable coins
2020-10-17 23:29:26 +00:00
Crypto City
8561d703cf
game: save font size in config
2020-10-17 23:29:26 +00:00
Crypto City
09069fafc9
game: add frame rate limiter options
2020-10-17 23:28:43 +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
96f34d22cb
game: print range/bonus in dice roll notification
2020-10-17 23:28:43 +00:00
Crypto City
c8ed208089
game: add number of players invited in the player screen
2020-10-17 23:28:43 +00:00
Crypto City
3e637ecf29
bump version to 0.23.1.6
2020-10-17 21:29:36 +00:00
Crypto City
689790d350
merge_mining_proxy: notify miner when a new block template is needed
2020-10-17 21:28:48 +00:00
Crypto City
6c8b3841ae
merge_mining_proxy: fix rejects when mining fast
2020-10-17 21:28:48 +00:00
Crypto City
d0acc313b7
blockchain: fix checking for more than one merge mining tag
2020-10-17 21:28:48 +00:00
Crypto City
698066afcc
daemon: add cc_orders command to show trade orders for an item
2020-10-17 21:28:48 +00:00
Crypto City
e6d4e9e009
cc: fix dividend item summation
2020-10-17 21:28:48 +00:00
Crypto City
bfba522682
game: don't offer assigning items other than materials/labour to flags
2020-10-17 21:28:48 +00:00
Crypto City
4988ccc193
crypto: fix build on windows
2020-10-17 21:27:31 +00:00
Crypto City
51c1e14daa
game: fix deadlock refreshing
2020-10-17 21:27:31 +00:00
