Commit Graph

12254 Commits

Author SHA1 Message Date
Alexander Blair
4fe2858b4d
Merge pull request #6746
20f603c6b Fix broken multisig pubkey sorting (Jason Rhinelander)
2020-08-27 02:58:53 -07:00
Alexander Blair
dd7fd2ef80
Merge pull request #6753
4ff2074c7 cryptonote_protocol: don't synced pruned blocks before v11 (cohcho)
2020-08-27 02:58:45 -07:00
Alexander Blair
a06c83db73
Merge pull request #6752
85899230d simplewallet: allow setting tx keys when sending to a subaddress (moneromooo-monero)
e916201f1 wallet2: fix setting tx keys when another is already set (moneromooo-monero)
2020-08-27 02:58:23 -07:00
Alexander Blair
42519b48a7
Merge pull request #6731
db5d6e460 wallet2: fix wrong name when checking RPC cost (moneromooo-monero)
2020-08-27 02:55:48 -07:00
Alexander Blair
bad5d8d6f0
Merge pull request #6690
7175dcb10 replace most boost serialization with existing monero serialization (moneromooo-monero)
2020-08-27 02:54:30 -07:00
Alexander Blair
3f392341e7
Merge pull request #6660
839e1f4ba functional_tests: add p2p functional tests (moneromooo-monero)
2020-08-27 02:53:41 -07:00
Alexander Blair
38914fe6fa
Merge pull request #6613
55363c594 Avoid some temporary strings when reading off the database (moneromooo-monero)
2020-08-27 02:52:59 -07:00
selsta
c3f991332f
supercop: update submodule 2020-08-27 01:22:15 +02:00
moneromooo-monero
839e1f4bab
functional_tests: add p2p functional tests
Tests tx/block propagation and reorgs
2020-08-26 23:00:27 +00:00
Alexander Blair
aadd72202f
Merge pull request #6610
b6e904e54 README: mention pruning (moneromooo-monero)
2020-08-26 12:53:55 -07:00
Alexander Blair
a6f1fa0194
Merge pull request #6607
eb1b321fe miner: increase min/max intervals to full extents (moneromooo-monero)
2020-08-26 12:53:09 -07:00
Crypto City
3b4f4d45af bump version to 0.21.0.0 2020-08-25 23:02:41 +00:00
Crypto City
c3c208ed28 game: do not link to libz, it's now set in EXTRA_LIBRARIES 2020-08-25 23:02:41 +00:00
Crypto City
964612aed7 game: mac build fixes 2020-08-25 23:02:41 +00:00
Crypto City
77b5ab2448 game: do not print success messages on tx failure 2020-08-25 22:30:14 +00:00
Crypto City
2d57030afb game: enforce 0 amount for new coin designs 2020-08-25 16:09:20 +00:00
Crypto City
b73efe47ee cc: add prospecting discovery (better chance of finding gemstones) 2020-08-25 16:09:20 +00:00
Crypto City
5e475bb74a cc: fix town squares being all named after the first city 2020-08-25 15:27:16 +00:00
Crypto City
89f9fcd982 tx_pool: allow hunting in different cities and/or different targets 2020-08-25 15:27:16 +00:00
Crypto City
5e41cf7ffd cc: fix moose/bear regeneration going over the limit 2020-08-25 15:27:16 +00:00
Crypto City
237cc85bdd cc: add harvested amount in harvest command log 2020-08-25 15:27:16 +00:00
Crypto City
a4588d8ab3 cc: fix city specializations not being mined 2020-08-25 15:27:16 +00:00
Crypto City
bc29e2e832 game: mine on just one thread
We're running a heavy OpenGL program after all
2020-08-25 15:27:16 +00:00
Crypto City
f1b4f3ec18 cc: bump military influence 2020-08-25 15:27:16 +00:00
Crypto City
c2fc879340 cc: fix inactive buildings finding gemstones 2020-08-25 15:27:16 +00:00
Crypto City
856e61b4c1 cc: add runic cycle in yearly coin description 2020-08-25 15:27:16 +00:00
Crypto City
1c6bae0dba cc: bump the number of patents badge thresholds a bit 2020-08-25 15:27:16 +00:00
Crypto City
16c084838f add yearly coins auto creation 2020-08-25 15:27:16 +00:00
Crypto City
9582b834ff game: add current crop to harvest dialog 2020-08-25 15:27:16 +00:00
Crypto City
3335f8d14f create collectible coins for player count and city levels 2020-08-25 15:27:16 +00:00
Crypto City
1dbd6f77ae game: add a confirmation prompt before exiting the game 2020-08-25 15:27:15 +00:00
Crypto City
b7a803c782 game: rename deposit to "Create account" if there is no account yet 2020-08-25 15:27:15 +00:00
Crypto City
ed6a65196e game: handle account creation on new block 2020-08-25 15:27:15 +00:00
Crypto City
3384e02a08 ease up on the vegetables spoil rate 2020-08-25 15:27:15 +00:00
Crypto City
ce4e15d47d game: add a close button to the console 2020-08-25 13:20:15 +00:00
Crypto City
26a07d289d cmake: fix libnorm detection 2020-08-25 13:20:15 +00:00
Crypto City
55e2286222 cc: bump amount of vegetation blocks for cultural and roads 2020-08-25 13:20:15 +00:00
Crypto City
68c0694fa9 game: print today's temperatue in sow/harvest, not tomorrow's 2020-08-25 13:20:15 +00:00
Crypto City
ec2b0d6264 cc: take geothermal heating into account for crop yield
as is already done by the game
2020-08-25 13:20:15 +00:00
Crypto City
7aea6cbf93 add a daemon RPC to get new unused nonces 2020-08-25 13:20:15 +00:00
Crypto City
24201167c9 cc: remove some obsolete unused tables 2020-08-25 13:20:15 +00:00
Crypto City
5b693a15b1 some material variants are now locked till a player level 2020-08-25 13:20:15 +00:00
Crypto City
734511b2df bump patent time to 15 game years 2020-08-25 13:20:15 +00:00
Crypto City
61844a1f62 start the year a bit earlier so that we can farm right away 2020-08-25 13:20:15 +00:00
Crypto City
c54e610171 cc: make new cities a bit harder to get 2020-08-25 13:20:15 +00:00
Crypto City
1a82d359cc cc: give 10 patents per discovery to promote trade 2020-08-25 13:20:15 +00:00
Crypto City
3a2f6d47b4 daemon: add cc_date command 2020-08-25 13:20:15 +00:00
Crypto City
d40d5bf778 cc: add game events for a few missing commands 2020-08-25 13:20:15 +00:00
Crypto City
bb9bd2ce50 store command nonce in game events log
and store a nonce in all commands (except none) now
2020-08-25 13:20:14 +00:00
Crypto City
2e386ea153 count non-payout buildings in city size 2020-08-25 13:20:14 +00:00