Commit Graph

268 Commits

Author SHA1 Message Date
Crypto City
5057d39cda decrease decay and repair costs, bump land tax a little 2021-04-27 18:39:05 +00:00
Crypto City
a395ab3c37 remove various unused variables 2021-04-27 18:15:29 +00:00
Crypto City
931773c40e Merge remote-tracking branch 'origin/master' into cc 2021-04-24 13:46:11 +00:00
Crypto City
e8f35a87c8 halve block time for user friendliness in gameplay 2021-04-22 23:18:32 +00:00
Crypto City
20256888e3 embed the block 1 tag in invitations and cc signatures
to ensure they're only valid in the chain they're created on
2021-04-12 18:06:59 +00:00
Crypto City
2eec2f6371 fix farming not being bothered by not having enough heating material
also fix demolishing a farm while a crop is being grown
2021-04-06 10:46:37 +00:00
Crypto City
6261344b9a remove mime_type from custom items, and add gold content 2021-03-25 14:37:56 +00:00
Crypto City
3ffe13df7d extra land tax for lots left empty for more than 10 days 2021-03-13 10:45:46 +00:00
luigi1111
6556c33f13
Merge pull request #7355
bd12984 Remove copies from foreach loops (thanks to Clang) (Lee Clagett)
1572df9 Removing unused namespace alias (Lee Clagett)
2021-02-18 14:06:47 -05:00
Kevin Barbour
85db1734e7
Remove unused variables in monero codebase
There are quite a few variables in the code that are no longer
(or perhaps never were) in use. These were discovered by enabling
compiler warnings for unused variables and cleaning them up.

In most cases where the unused variables were the result
of a function call the call was left but the variable
assignment removed, unless it was obvious that it was
a simple getter with no side effects.
2021-02-09 08:05:05 +01:00
Crypto City
49faf95c40 fix flag destruction not keeping full state 2021-02-03 16:26:08 +00:00
Lee Clagett
bd129849f0 Remove copies from foreach loops (thanks to Clang) 2021-01-28 23:42:40 -05:00
Crypto City
4956a6aa5e Merge remote-tracking branch 'origin/master' into cc 2021-01-18 01:33:53 +00:00
Crypto City
e4d77f0996 fix tests after building size balance changes 2020-11-30 16:45:16 +00:00
Crypto City
f6498b3f05 db_lmdb: set last service height to current height on construction 2020-11-22 23:25:49 +00:00
Crypto City
0898e11996 use CC_NO_EXTERNAL_DEPS on all urho3d/boost dependencies 2020-11-22 23:25:49 +00:00
Crypto City
98d4ae7c2b land cost now costs more near the city center and far away
also fix overflows in land/tax cost
2020-11-01 17:34:31 +00:00
mj-xmr
8a282f64c9 Add RELINK_TARGETS, monero_add_target_no_relink and use monero_add_executable/monero_add_library where possible (mj-xmr)
Add monero_add_minimal_executable and use in tests

This is done in order not to have to relink targets, when just an .so changed, but not its interface.
2020-10-28 20:08:26 +01:00
Crypto City
f2808a6a39 more tile size optimization
Tiles are now stored as a single packed byte stream,
including in the game, and unpacked/repacked as necessary
2020-10-25 18:47:26 +00:00
Crypto City
34a4d2b618 fixes after monero merge 2020-10-19 12:17:51 +00:00
Crypto City
43b8112c1e Merge branch 'master' into cc 2020-10-18 00:33:51 +00:00
Crypto City
cb353a875d daemon: include nonce to txid map in print_pool 2020-10-17 23:30:31 +00:00
Crypto City
7b51ad56bc WIP - mortgages 2020-10-17 23:29:26 +00:00
Crypto City
7d495bc49c core_test: fix core tests (not enough labour) 2020-09-28 21:09:07 +00:00
Crypto City
045c9a7c94 core_tests: fix nonce reuse core test 2020-09-24 19:29:55 +00:00
Crypto City
b7c431c15e remove cost from buy_land command 2020-09-24 19:29:55 +00:00
Riccardo Spagni
aefa7740c3
Merge pull request #6111
d20ff4f64 functional_tests: add a large (many randomx epochs) p2p reorg test (moneromooo-monero)
6a0b3b1f8 functional_tests: add randomx tests (moneromooo-monero)
9d42649d5 core: fix mining from a block that's not the current top (moneromooo-monero)
2020-09-06 15:49:37 +02:00
Crypto City
40d58c0c9d add dependencies where appropriate to make -jN work 2020-08-29 12:17:11 +00:00
moneromooo-monero
1dc427def9
core_tests: fix failures after v13
v13 enforces claiming the full block reward, so we need to keep
track of tx fees to add them to the coinbase
2020-08-28 00:18:39 +00:00
moneromooo-monero
4a9bd8f70f
core_tests: remove hardcoded hf version 2020-08-28 00:14:04 +00:00
moneromooo-monero
9d42649d58
core: fix mining from a block that's not the current top 2020-08-27 15:13:00 +00:00
moneromooo-monero
82ee01699c
Integrate CLSAGs into monero
They are allowed from v12, and MLSAGs are rejected from v13.
2020-08-27 12:44:04 +00:00
Alexander Blair
b04da25e4d
Merge pull request #6760
844fb4e94 enforce claiming maximum coinbase amount (moneromooo-monero)
2020-08-27 03:01:28 -07:00
Crypto City
bb9bd2ce50 store command nonce in game events log
and store a nonce in all commands (except none) now
2020-08-25 13:20:14 +00:00
Crypto City
dc2cc4b6d5 item groups can now optionally be public 2020-08-25 13:20:14 +00:00
moneromooo-monero
844fb4e940
enforce claiming maximum coinbase amount
Claiming a slightly lesser amount does not yield the size gains
that were seen pre rct, so this closes a fingerprinting vector
2020-08-21 12:36:53 +00:00
moneromooo-monero
7175dcb107
replace most boost serialization with existing monero serialization
This reduces the attack surface for data that can come from
malicious sources (exported output and key images, multisig
transactions...) since the monero serialization is already
exposed to the outside, and the boost lib we were using had
a few known crashers.

For interoperability, a new load-deprecated-formats wallet
setting is added (off by default). This allows loading boost
format data if there is no alternative. It will likely go
at some point, along with the ability to load those.

Notably, the peer lists file still uses the boost serialization
code, as the data it stores is define in epee, while the new
serialization code is in monero, and migrating it was fairly
hairy. Since this file is local and not obtained from anyone
else, the marginal risk is minimal, but it could be migrated
later if needed.

Some tests and tools also do, this will stay as is for now.
2020-08-17 16:23:58 +00:00
Crypto City
be0b26ef25 add item groups 2020-08-15 15:12:35 +00:00
Crypto City
0f364a96d7 cc: prevent building too close to the edges of the world 2020-08-05 14:09:06 +00:00
Crypto City
c598cfec0a remove building within range of resource generators constraint 2020-07-25 22:43:58 +00:00
Crypto City
ac171bf477 cc: rewrite potential system and add more potentials 2020-07-24 15:36:50 +00:00
Alexander Blair
a0d179e528
Merge pull request #6512
5ef0607da Update copyright year to 2020 (SomaticFanatic)
2020-07-19 03:32:59 -07:00
Crypto City
75516e6e34 core: fix mining from a block that's not the current top 2020-06-21 01:18:29 +00:00
Lee Clagett
7aeb503547 Fix boost <1.60 compilation and fix boost 1.73+ warnings 2020-05-31 21:18:11 -04:00
Crypto City
2a90a3df6b fixes after merge 2020-05-31 00:41:03 +00:00
Crypto City
396157b032 Merge remote-tracking branch 'origin/master' into cc 2020-05-30 18:55:11 +00:00
Crypto City
c22e54b850 unlock_time is now valid only for coinbase txes 2020-05-29 23:20:50 +00:00
Crypto City
0cc8c0c675 game balance updates after all the recent changes 2020-05-29 23:20:50 +00:00
Crypto City
a76e62f22c core: sign create_aaccount commands too
with the new pubkey, to prove we know it
2020-05-29 23:20:49 +00:00
Crypto City
6a18101b1a add invitation system 2020-05-26 16:22:42 +00:00