Commit Graph

10888 Commits

Author SHA1 Message Date
Crypto City
b4975ea4f3 cc: double influence for most buildings without varying potential 2020-03-20 19:27:51 +00:00
Crypto City
39163c168a Event badges can now be awarded after creation 2020-03-20 19:27:51 +00:00
Crypto City
f0006f05f3 MANUAL: add items and badges, and a few small fixes 2020-03-20 19:27:51 +00:00
Crypto City
97941b0603 game: add ignore recommendation UI 2020-03-20 19:27:51 +00:00
Crypto City
0bd7f9d09a game: add new event badge ui 2020-03-20 19:27:51 +00:00
Crypto City
06b12912d9 MANUAL: generators don't benefit from roads 2020-03-20 19:27:51 +00:00
Crypto City
b4ae149b7c cc: set empty land tax equal to those with a 100% building
Buildings could originally go down to 50%, but they can't now.
2020-03-20 19:27:51 +00:00
Crypto City
22199dd9b3 cc: set town square potential to 1, same as other roads 2020-03-20 19:27:51 +00:00
Crypto City
bdb53f11b6 blockchain_db: remove buggy and unused set_cc_account_name 2020-03-20 19:27:51 +00:00
Crypto City
2882f6bc80 badges 2020-03-20 19:27:51 +00:00
Crypto City
96c251c9ab external: fix paths in external projects 2020-03-20 19:27:51 +00:00
Crypto City
27e0b1fe3f wallet: add missing remove parameter to cc_build 2020-03-20 19:27:51 +00:00
Crypto City
0d413cf164 merge cc_account data into a structure 2020-03-20 19:27:51 +00:00
Crypto City
3bfd22a1f6 game: do not display flag 3D model when ignored 2020-03-20 19:27:51 +00:00
Crypto City
8d3fbb1727 Add ignore machinery 2020-03-20 19:27:51 +00:00
Crypto City
4dd9b67b86 external: add boost submodule 2020-03-20 19:27:51 +00:00
Crypto City
a6b8da5f0e add player defined custom items 2020-03-20 19:27:51 +00:00
Crypto City
238aadaa51 version: bump to 0.16.0.3 2020-03-20 19:27:51 +00:00
Crypto City
35192d02ef game: honour material from imported magica voxel models 2020-03-20 19:26:32 +00:00
Crypto City
281d927b4a game: automatically add ".vox" if not present when saving a model 2020-03-20 19:26:32 +00:00
Crypto City
037ff35a80 cc: fix "next city" estimation 2020-03-20 19:25:39 +00:00
Crypto City
2402a8ad3a p2p: keep connected to the seed node for now 2020-03-20 19:25:39 +00:00
Crypto City
997b5c6cea README: mention OpenGL in dependencies 2020-03-20 19:25:39 +00:00
Crypto City
955fa74687 game: don't print how short of materials we are for existing buildings 2020-03-20 19:25:39 +00:00
Sumo Gr
8688b467ce
depends: update qt 5.7.1 download link
5.7.1 was removed from official qt.io archive, this is one of the few mirrors remaining that keep a copy.
I think it would be better if @TheCharlatan updated to a newer version soon than merging this PR
2020-03-20 21:18:49 +02:00
xiphon
323a9e3a8d depends: libsodium disable getrandom()/getentropy() (glibc < 2.25) 2020-03-20 17:42:51 +00:00
moneromooo-monero
bcae95a22e
p2p: do not add recently failed addresses to the peerlist 2020-03-20 15:45:26 +00:00
Lee Clagett
ad13a4b2ac Fixing static_asserts in ZMQ JSON 2020-03-19 19:49:51 -04:00
luigi1111
d1cf16364f
Merge pull request #6388
c075aa7 workaround for GetObject windows.h macro and rapidjson conflict (xiphon)
2020-03-15 10:50:36 -04:00
Lee Clagett
5de2295f3c Correct key image check in tx_pool 2020-03-14 19:17:15 +00:00
xiphon
c075aa7a6c workaround for GetObject windows.h macro and rapidjson conflict 2020-03-14 00:46:47 +00:00
xiphon
0dbdba876e epee: avoid spamming 'Generating SSL certificate' in the logs 2020-03-13 22:48:04 +00:00
luigi1111
f52e0f40c6
Merge pull request #6383
a26cbce easylogging++: fix 'ELPP_OS_EMSCRIPTEN is not defined' warning (xiphon)
2020-03-13 18:12:19 -04:00
selsta
68ffc1ca19
README: clean up TOC 2020-03-13 18:29:19 +01:00
moneromooo-monero
f8d76f395b
core: move the LockedTXN class out of txpool so it may be reused
for example, in the RPC server
2020-03-12 11:30:05 +00:00
moneromooo-monero
320bc845b3
rpc: add --rpc-payment-allow-free-loopback
This allows RPC coming from the loopback interface to not have
to pay for service. This makes it possible to run an externally
accessible RPC server for payment while also having a local RPC
server that can be run unrestricted and payment free.
2020-03-12 11:27:34 +00:00
Alexander Blair
820ab9fdea
Merge pull request #6273
0f78b06e Various improvements to the ZMQ JSON-RPC handling: (Lee Clagett)
2020-03-12 01:13:49 -07:00
Alexander Blair
d500bbe68f
Merge pull request #6268
a6c24412 wallet: fix exceptions getting the hash of a pruned tx (moneromooo-monero)
2020-03-12 01:02:31 -07:00
Alexander Blair
179965c974
Merge pull request #6263
c11e64fc Gitian: Change lxc ip link (TheCharlatan)
2020-03-12 01:01:55 -07:00
Alexander Blair
2eee9bcdf8
Merge pull request #6251
0eac0c43 depends: set several missing build tags (moneromooo-monero)
2020-03-12 00:57:22 -07:00
Alexander Blair
857abc368c
Merge pull request #6244
352bd132 abstract_tcp_server2: guard against negative timeouts (moneromooo-monero)
2020-03-12 00:56:29 -07:00
Alexander Blair
092a57df99
Merge pull request #6243
4771a7ae p2p: remove obsolete local time in handshake (moneromooo-monero)
2fbbc4a2 p2p: avoid sending the same peer list over and over (moneromooo-monero)
3004835b epee: remove backward compatible endian specific address serialization (moneromooo-monero)
39a343d7 p2p: remove backward compatible peer list (moneromooo-monero)
60631802 p2p: simplify last_seen serialization now we have optional stores (moneromooo-monero)
9467b2e4 cryptonote_protocol: omit top 64 bits of difficulty when 0 (moneromooo-monero)
b595583f serialization: do not write optional fields with default value (moneromooo-monero)
5f98b46d p2p: remove obsolete local time from TIMED_SYNC (moneromooo-monero)
2020-03-12 00:32:46 -07:00
Crypto City
7237cf652f version: bump to 0.16.0.2 2020-03-12 01:24:18 +00:00
moneromooo-monero
a4f5d66dfd db_lmdb: fix race crash using a stale cursor
If a db resize happened, the txpool meta cursor might be stale,
and was not being renewed when necessary.
It would cause this SEGSEGV:

in mdb_cursor_set ()
in mdb_cursor_get ()
in cryptonote::BlockchainLMDB::get_txpool_tx_blob(crypto::hash const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, cryptonote::relay_category) const ()
in cryptonote::tx_memory_pool::get_transaction(crypto::hash const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, cryptonote::relay_category) const ()
in cryptonote::t_cryptonote_protocol_handler<cryptonote::core>::handle_notify_new_fluffy_block(int, epee::misc_utils::struct_init<cryptonote::NOTIFY_NEW_FLUFFY_BLOCK::request_t>&, cryptonote::cryptonote_connection_context&) ()
2020-03-12 01:20:17 +00:00
Crypto City
5ef8f20630 log special events in last game update 2020-03-12 01:20:17 +00:00
Crypto City
2f9a80f3e9 cc: fix event text mixup for mayor/game payouts 2020-03-12 01:20:17 +00:00
moneromooo-monero
ec01077720
db_lmdb: fix race crash using a stale cursor
If a db resize happened, the txpool meta cursor might be stale,
and was not being renewed when necessary.
It would cause this SEGSEGV:

in mdb_cursor_set ()
in mdb_cursor_get ()
in cryptonote::BlockchainLMDB::get_txpool_tx_blob(crypto::hash const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, cryptonote::relay_category) const ()
in cryptonote::tx_memory_pool::get_transaction(crypto::hash const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, cryptonote::relay_category) const ()
in cryptonote::t_cryptonote_protocol_handler<cryptonote::core>::handle_notify_new_fluffy_block(int, epee::misc_utils::struct_init<cryptonote::NOTIFY_NEW_FLUFFY_BLOCK::request_t>&, cryptonote::cryptonote_connection_context&) ()
2020-03-12 00:57:32 +00:00
xiphon
a26cbcef92 easylogging++: fix 'ELPP_OS_EMSCRIPTEN is not defined' warning 2020-03-11 17:58:37 +00:00
Crypto City
ab41df1444 db_lmdb: fix share retrieval with more than one city 2020-03-11 14:18:53 +00:00
Martijn Otto
6079042cce
Use boost::asio::ssl::context::sslv23 for backwards compatibility
All the insecure protocols that this enables are then disabled, so they
cannot be actually used. The end-result is the same.
2020-03-11 09:28:02 +01:00