Commit Graph

14839 Commits

Author SHA1 Message Date
luigi1111
cfc0f4a7fa
Merge pull request #6351
81c5943 Remove temporary std::string creation in some hex->bin calls (vtnerd)
5fcc23a Move hex->bin conversion to monero copyright files and with less includes (vtnerd)
3387f0e Reduce template bloat in hex->bin for ZMQ json (vtnerd)
2020-04-04 12:55:02 -05:00
luigi1111
44547006bf
Merge pull request #6347
fcb06f7 cryptonote_core: skip block notify on blockchain switching rollback (xiphon)
2020-04-04 12:52:46 -05:00
luigi1111
bf70696a85
Merge pull request #6346
dbfa4f8 unit_tests: fix missing test names (xiphon)
2020-04-04 12:50:17 -05:00
luigi1111
ad5200e440
Merge pull request #6342
82da832 rpc: Add check for too old timestamps in payment signatures. (glv2)
2020-04-04 12:49:02 -05:00
luigi1111
c4f75fe898
Merge pull request #6339
c61abf8 remove empty statements (shopglobal)
2020-04-04 12:47:31 -05:00
luigi1111
081d49c59f
Merge pull request #6338
80d5320 Hash domain separation (SarangNoether)
2020-04-04 12:44:45 -05:00
luigi1111
292e2d8f28
Merge pull request #6335
0078ce7 wipeable_string: split - treat CR, LF and Tabs as separators (xiphon)
2020-04-04 12:42:50 -05:00
luigi1111
6011064693
Merge pull request #6334
cc18926 wallet2_api: wallet recovery - seed offset passphrase support (xiphon)
2020-04-04 12:41:32 -05:00
luigi1111
0bb7191fd6
Merge pull request #6328
9bde70e core: mention time being off in hash rate changes message (moneromooo-monero)
2020-04-04 12:40:18 -05:00
luigi1111
85efaeb7bf
Merge pull request #6322
29b7cd1 device_ledger: include status code name in error message (xiphon)
2020-04-04 12:39:21 -05:00
luigi1111
ab802b4b80
Merge pull request #6321
1a6e7bd wallet2: mention --daemon-ssl-allow-any-cert in --proxy error msg (xiphon)
2020-04-04 12:37:26 -05:00
luigi1111
0bd2c14bbb
Merge pull request #6309
e69acff functional_tests: update cookie at 10 seconds interval (moneromooo-monero)
f5a11f0 functional_tests: speed up signature generation (moneromooo-monero)
2020-04-04 12:35:02 -05:00
luigi1111
4398facb2e
Merge pull request #6286
6d6af70 cryptonote_basic: drop unused verification_context::m_not_rct field (xiphon)
2020-04-04 12:33:32 -05:00
luigi1111
8f59b0ed14
Merge pull request #6269
21fe6a2 p2p: fix frequent weak_ptr exception on connection (moneromooo-monero)
2020-04-04 12:32:05 -05:00
Crypto City
31c0293151 game: add item data in trade ui 2020-04-04 16:03:12 +00:00
Crypto City
5057f46a17 game: add selection extend commands 2020-04-04 02:11:21 +00:00
Crypto City
20d51716a4 game: print city size and next level threshold 2020-04-04 01:34:32 +00:00
Crypto City
2edb2843f9 game: allow unsetting controls 2020-04-04 00:59:02 +00:00
Crypto City
d241cd3d17 game: more minecraft style controls 2020-04-04 00:32:39 +00:00
Crypto City
1ebd6d0bee game: add invert mouse y and mouse sensitivity to controls config 2020-04-04 00:11:36 +00:00
Crypto City
b11e194565 blockchain: require the mayor to mine the first block
Rather than the game account, to ensure the bootstrap town square
does not go poof at the first game update due to no money for tax
2020-04-03 22:07:34 +00:00
Crypto City
d0035c9f8c game: add welcome message when entering a new town 2020-04-03 18:43:49 +00:00
Crypto City
72edd4266f game: reset clouds when travelling to another town 2020-04-03 16:31:15 +00:00
Crypto City
c77977b513 cc: fix staff salary being paid for every city 2020-04-03 16:14:34 +00:00
Crypto City
00da461a57 daemon: add optional filter argument to cc_get_last_update_events 2020-04-03 16:11:21 +00:00
Crypto City
ddf4491019 game: add controls configuration UI 2020-04-03 15:43:36 +00:00
Crypto City
40a4f3e64e game: add section to the config file 2020-04-03 15:43:36 +00:00
Crypto City
8f794a4a1e add temperature and building heating requirements 2020-04-03 15:43:36 +00:00
Crypto City
d7fa5676fe cc: special events now have a min duration 2020-04-03 15:43:35 +00:00
Crypto City
b3c3647cb9 add food consumption 2020-04-03 15:43:35 +00:00
Crypto City
36e4b8f7f7 game: shrink crosshair 2020-04-03 15:43:35 +00:00
Crypto City
83ebf7583c cmake: fix boost include path 2020-04-03 15:43:35 +00:00
Crypto City
c910d13306 boost-libs: store bumped template size in git 2020-04-03 15:43:35 +00:00
Crypto City
021c5e1926 boost-libs: bump template size 2020-04-03 15:43:35 +00:00
Crypto City
8b615de226 add date 2020-04-03 15:43:35 +00:00
Crypto City
ba34dbda35 game: remove debug traces 2020-04-03 15:43:35 +00:00
Crypto City
91465c097b Rename default town/mayor names and expenses to game 2020-04-03 15:43:35 +00:00
Crypto City
beceb3ce79 cc: bump agricultural building min size requirements 2020-04-03 15:43:35 +00:00
Crypto City
1afeaca726 game: hide brick/metal potential, they're not enabled yet 2020-04-03 15:43:35 +00:00
Crypto City
95130d9781 game: separate internal score and display line in leaderboards 2020-04-03 15:43:35 +00:00
Crypto City
d298a83865 game: fix off by one in badge score calculation 2020-04-03 15:43:35 +00:00
Crypto City
11e369b9c4 game: fix new block resetting filters 2020-04-03 15:43:35 +00:00
Crypto City
695bd8371c boost: fix build script 2020-04-03 15:43:35 +00:00
Crypto City
012c4b9a38 game: add level to player info dialog 2020-04-03 15:43:35 +00:00
Crypto City
b1100d7776 cc: change badge score calculation 2020-04-03 15:43:35 +00:00
Crypto City
a5d2eb2138 store badge award height 2020-04-03 15:43:35 +00:00
Crypto City
98aea9e99b game: add credits screen 2020-04-03 15:43:35 +00:00
Crypto City
dc3a109313 game: basic build mode 2020-04-03 15:43:35 +00:00
Crypto City
8ef9dc6c3c game: display single tile land tax if no selection 2020-04-03 15:43:35 +00:00
Crypto City
51a6b6efe9 cc: increase the land tax increase from town center 2020-04-03 15:43:35 +00:00