Commit Graph

12254 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
dde8852ee5 game: autofocus filter in "search by name" dialog 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
4ac396d4ea game: move "search by name" button with other buttons 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
29ddc63f84 game: focus search by default in select item dialog 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
7e87bcc711 fix functional tests 2021-01-16 20:44:45 +00:00
Crypto City
8c3d9ff405 functional_tests: fix trade tests after matchable fix 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
7908f848a3
Merge pull request #7245
41dfa96 Split fuzz tests during fuzz build (Nym Seddon)
2021-01-15 23:51:23 -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
cc297da0ee
Merge pull request #7204
10448eb Update repo copyright year to 2021 (Suriyaa Sundararuban)
2021-01-15 23:48:37 -05:00
luigi1111
cb21ec30a4
Merge pull request #7149
0660db3 fuzz_tests: add a test for utf8canonical (moneromooo-monero)
2021-01-15 23:47:49 -05:00
luigi1111
218981eba1
Merge pull request #7137
f2ad539 readline_buffer: Avoid consecutive duplicates in the history (codesoap)
2021-01-15 23:46:14 -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
luigi1111
01613bd07e
Merge pull request #6989
a2bd6de Clang IWYU header checker script (mj-xmr)
2021-01-15 23:42:52 -05:00
luigi1111
55b006ff9b
Merge pull request #6975
700d4e9 Run Valgrind checks for any binary in a list (mj-xmr)
2021-01-15 23:41:51 -05:00
Alexander Blair
964ad0e51a
Merge pull request #7286
372754a66 storages: overridable limits for loading portable_storage from binary (moneromooo-monero)
2021-01-07 17:54:19 -08: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
moneromooo-monero
372754a66e
storages: overridable limits for loading portable_storage from binary 2021-01-07 20:24:29 +00:00
mj-xmr
700d4e9388 Run Valgrind checks for any binary in a list 2021-01-07 14:40:07 +01:00
luigi1111
e144dd5b15
Merge pull request #7281
b9092dd epee: also limit number of strings in portable_storage (moneromooo-monero)
2021-01-06 21:11:09 -05:00
luigi1111
e3acd3e6ba
Merge pull request #7278
187b4d7 Restrict duplicate keys in epee binary format (Lee Clagett)
2021-01-06 21:10:30 -05: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
moneromooo-monero
b9092ddb5c
epee: also limit number of strings in portable_storage
They require at least 24 bytes
2021-01-05 17:54:25 +00: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
Alexander Blair
7264d64856
Merge pull request #7263
b652d598d add a max levin packet size by command type (moneromooo-monero)
2021-01-03 18:23:57 -08:00
Alexander Blair
03cdcd3909
Merge pull request #7261
5cd6fda1e portable_storage: better sanity checking (moneromooo-monero)
2021-01-03 18:23:31 -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