Commit Graph

11178 Commits

Author SHA1 Message Date
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
Crypto City
6474ce3fc7 game: display a markets button when we're short of materials 2020-04-03 15:43:35 +00:00
Crypto City
49b0f4de5c game: add filter for notifications in chat 2020-04-03 15:43:35 +00:00
Lee Clagett
da99157462 Use byte_slice for sending zmq messages - removes data copy within zmq 2020-04-03 01:56:17 +00:00
xiphon
09abca76ae wallet_api: checkUpdate - optional version and buildtag params 2020-04-02 00:31:43 +00:00
Sumo Gr
14e803565f update openssl 1.0.2r link 2020-04-01 22:34:38 +00:00
Sarang Noether
80d5320fff Hash domain separation 2020-04-01 08:31:00 -04:00
selsta
9c95437167
workflows: retry on apt failure
Co-authored-by: xiphon <xiphon@protonmail.com>
2020-04-01 02:32:50 +02:00
xiphon
6d6af701ec cryptonote_basic: drop unused verification_context::m_not_rct field 2020-03-31 21:58:25 +00:00
moneromooo-monero
21fe6a289b
p2p: fix frequent weak_ptr exception on connection
When a handshake fails, it can fail due to timeout or destroyed
connection, in which case the connection will be, or already is,
closed, and we don't want to do it twice.
Additionally, when closing a connection directly from the top
level code, ensure the connection is gone from the m_connects
list so it won't be used again.

AFAICT this is now clean in netstat, /proc/PID/fd and print_cn.

This fixes a noisy (but harmless) exception.
2020-03-31 20:29:41 +00:00
luigi1111
6c7d928f19
Merge pull request #6336
760ecf2 console_handler: do not let exception past the dor (moneromooo-monero)
09c8111 threadpool: lock mutex in create (moneromooo-monero)
e377977 tx_pool: catch theoretical error in get_block_reward (moneromooo-monero)
2020-03-31 15:14:12 -05:00
luigi1111
94f44d4ee3
Merge pull request #6325
3627e53 rpc: fix print_pool_sh not finding local txes (moneromooo-monero)
2020-03-31 15:13:51 -05:00