Commit Graph

8834 Commits

Author SHA1 Message Date
Crypto City
d07aedd01f bump version to 0.26.0.0 2021-01-19 14:43:09 +00:00
Crypto City
5ce5933f2d cc: fix level determination wrt event badges 2021-01-18 01:33:58 +00:00
Crypto City
4956a6aa5e Merge remote-tracking branch 'origin/master' into cc 2021-01-18 01:33:53 +00:00
Crypto City
51d401a0c3 game: mark foreclosed mortgages in trade ui 2021-01-17 16:09:04 +00:00
Crypto City
5088d2a532 cc: destroy mortgage item after foreclosure auction ends 2021-01-17 16:09:04 +00:00
Crypto City
7c25eac178 cc: allow up to 5 event badges to count towards prestige
It gives an incentive to participate while protecting against abuse
2021-01-16 20:44:45 +00:00
Crypto City
b4749564a9 split architecture badges to have one per role 2021-01-16 20:44:45 +00:00
Crypto City
51edd5cef1 game: fix chat auto focus 2021-01-16 20:44:45 +00:00
Crypto City
22e8ac1db6 cc: core (not event) badges now give a small prestige bonus too 2021-01-16 20:44:45 +00:00
Crypto City
d3b322e547 game: make different menu entries for story/building scripts
This should help prevent mixups between both
2021-01-16 20:44:45 +00:00
Crypto City
a4f6efb6db add unlock levels for chat colours 2021-01-16 20:44:45 +00:00
Crypto City
ed18fb8133 add more chat colours 2021-01-16 20:44:45 +00:00
Crypto City
e1dd1f457d game: fix empty building settings screen for already built advanced buildings 2021-01-16 20:44:45 +00:00
Crypto City
e760d4b2ed cc: remove pig farming discoveries 2021-01-16 20:44:45 +00:00
Crypto City
203a7ae50e rpc: fix off by one getting crop temperature in cc_get_flag 2021-01-16 20:44:45 +00:00
Crypto City
6f98b93707 game: add "sell shares when mined" message when creating new mortgage 2021-01-16 20:44:45 +00:00
Crypto City
f29bf36ff3 db_lmdb: don't subtract used from amount in orders
the caller can do it
2021-01-16 20:44:45 +00:00
Crypto City
eab7a51df6 game: print material shortfall when not enough budget to import 2021-01-16 20:44:45 +00:00
Crypto City
58fcf72fd4 game: fix importing a model leaving the budget untouched 2021-01-16 20:44:45 +00:00
Crypto City
f0d55c60e6 cc: fix overflow in terrain generation 2021-01-16 20:44:45 +00:00
luigi1111
cb70ae9450
Merge pull request #7260
c5c278c p2p: only log to global when a blocked IP is not already blocked (moneromooo-monero)
2021-01-15 23:52:05 -05:00
luigi1111
8cb9f3cd80
Merge pull request #7240
46cc4a2 Header row for peer list in sync_info (Denis Goddard)
2021-01-15 23:50:28 -05:00
luigi1111
1f3f07d0e7
Merge pull request #7236
ab5e185 protocol: fix wrong command in logs (moneromooo-monero)
2021-01-15 23:49:34 -05:00
luigi1111
d259ed0740
Merge pull request #7119
dd5e689 protocol: add calls to reserve where appropriate (moneromooo-monero)
2021-01-15 23:45:25 -05:00
luigi1111
d01f31460e
Merge pull request #7113
7f30c49 simplewallet: don't complain about connecting to the daemon when offline (moneromooo-monero)
2021-01-15 23:44:32 -05:00
luigi1111
5c497ed22f
Merge pull request #7112
47590fc rpc: report target height as 0 when synced (moneromooo-monero)
2021-01-15 23:43:46 -05:00
Alexander Blair
747699541e
Merge pull request #7285
927141bcc Command max_bytes moved from dynamic map to static switch (Lee Clagett)
2021-01-07 17:54:02 -08:00
luigi1111
69e4a2c62d
Merge pull request #7266
38a6e6e protocol: handle receiving a block hash we've not added yet (moneromooo-monero)
2021-01-06 21:09:03 -05:00
Alexander Blair
dbaf95ac77
Merge pull request #7271
4e74385a1 fix accessing an network address in a deleted context (moneromooo-monero)
2021-01-03 18:24:50 -08:00
Alexander Blair
71f7d4e71e
Merge pull request #7268
1e27f7101 blockchain: lock access to m_blocks_hash_of_hashes (moneromooo-monero)
2021-01-03 18:24:22 -08:00
Crypto City
6957cf9630 game: add note the "running out..." note only checks the current city 2021-01-03 16:07:13 +00:00
Crypto City
d53d2e8ef8 game: fix research place with several players have the same number 2021-01-03 16:07:13 +00:00
Crypto City
2546087553 game: fix wrong EP reported for existing buildings 2021-01-03 16:07:13 +00:00
Crypto City
2e6943f9b5 game: fix missing runestone script message 2021-01-03 16:07:13 +00:00
Crypto City
373b08168f cc: give city squares the usual amount of vegetation 2021-01-03 16:07:13 +00:00
Crypto City
8ab3ba8b75 game: fix altitude scaling in building settings 2021-01-03 16:07:13 +00:00
Crypto City
515e2fab8c game: fix crash in trade screen 2021-01-03 16:07:13 +00:00
Crypto City
a0dd64d11c cc: decrease basic residential min size again
lkcl had a good argument for this to be kept down
2021-01-03 16:07:13 +00:00
Crypto City
c6b79390b0 game: fix invalid city in allow styling command 2021-01-03 16:07:13 +00:00
Crypto City
41f5ac35bc game: fix demolishing flags after adding service height to command 2021-01-03 16:07:13 +00:00
Crypto City
14b17bd167 game: fix missing chat text colour 2021-01-03 16:07:13 +00:00
Crypto City
a908c1b9d6 game: display error when import a model with locked material 2021-01-03 16:07:13 +00:00
Crypto City
36c8986e79 game: add a "blocks till update" on leaderboards screen 2021-01-03 16:07:13 +00:00
Crypto City
bda1d0ba70 fix harvest temperature not taking elevation modifier into account
also add that harvest temperature to the cc_get_flag RPC
2021-01-03 16:07:13 +00:00
Crypto City
c9a95b420e cc: give amount of owned coins a bit more weight in scoring 2021-01-03 16:07:13 +00:00
Crypto City
27129d19e1 cc: fix wording in discovery description 2021-01-03 16:07:13 +00:00
Crypto City
841fc6f50b cc: revert recent streak badge threshold changes 2021-01-03 16:07:13 +00:00
moneromooo-monero
b652d598d1
add a max levin packet size by command type 2021-01-03 14:07:45 +00:00
moneromooo-monero
4e74385a1a
fix accessing an network address in a deleted context
Both drop_connection and add_host_fail can drop the connection,
which invalidates the context, and thus the address it contains.

Thanks to wfaressuissia[m] for lots of help and prodding when
debugging this
2021-01-03 13:04:55 +00:00
moneromooo-monero
1e27f7101e
blockchain: lock access to m_blocks_hash_of_hashes
it is accessed both when adding and when prevalidating a set
of new hashes from a peer
2021-01-02 22:19:54 +00:00