Ruckneum/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity
10,810 Commits 10 Branches 0 Tags 343 MiB
merge-track-item-supply
Commit Graph

1400 Commits

Author SHA1 Message Date
Crypto City
5712a47431 keep track of the item supply 2020-07-05 13:34:02 +00:00
Crypto City
63a3230fdb add ignore tests 2020-06-30 11:06:08 +00:00
Crypto City
dc140ff2fc functional_tests: add some more data in get_state 2020-06-29 22:16:08 +00:00
Crypto City
fffeb1bdae cc: allow hunting with a population less than actual 2020-06-29 22:16:08 +00:00
Crypto City
8c249305f7 unit_tests: don't link to urho3d 2020-06-24 01:06:54 +00:00
Crypto City
09c272a064 tests: add test for building with palette change 2020-06-22 22:15:13 +00:00
Crypto City
6f4fc81b1d functional_tests: add chat tests 2020-06-22 22:15:13 +00:00
Crypto City
5d30d10b68 functional_tests: add some more invitations tests 2020-06-22 22:15:13 +00:00
Crypto City
3e05ee54fe tx_pool: do not allow more than one (non kept by block) hunt command at once 2020-06-21 01:18:30 +00:00
Crypto City
ef2c7bcca8 functional_tests: use fast pow 2020-06-21 01:18:29 +00:00
Crypto City
f112b180e3 cc: fix unlocking discoveries bug 2020-06-21 01:18:29 +00:00
Crypto City
206b30cb8f functional_tests: add reorg test 2020-06-21 01:18:29 +00:00
moneromooo-monero
2743357518 functional_tests: add p2p functional tests 
Tests tx/block propagation and reorgs
 2020-06-21 01:18:29 +00:00
Crypto City
b945e80261 functional_tests: add randomx tests 2020-06-21 01:18:29 +00:00
Crypto City
75516e6e34 core: fix mining from a block that's not the current top 2020-06-21 01:18:29 +00:00
Crypto City
23c813cf45 add city specializations 2020-06-14 23:43:30 +00: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
eb6be814ef functional_tests: processes can now run in a new terminal (off by default) 2020-05-29 23:20:51 +00:00
Crypto City
3af586f748 unit_tests: fix missing roles in influence test 2020-05-29 23:20:51 +00:00
Crypto City
c22e54b850 unlock_time is now valid only for coinbase txes 2020-05-29 23:20:50 +00:00
Crypto City
4d819324dc tests: fix missing error on missing python entry point 2020-05-29 23:20:50 +00:00
Crypto City
e98aa10308 cc: don't give an attribute point before levelling up 2020-05-29 23:20:50 +00:00
Crypto City
828bb1ba41 allow destroying a flag 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
d2949eb3ff Change the address prefix from CC to TF 2020-05-29 23:20:49 +00:00
Crypto City
ce07516176 mine only one tx per account per block 2020-05-29 23:20:49 +00:00
Crypto City
cfcae9094d claim cost in firefighting, flag resizing and city founding 2020-05-29 23:20:49 +00:00
Crypto City
2f77fc4051 invitations 2020-05-29 23:20:49 +00:00
Crypto City
f661248740 functional_tests: add hunt test 2020-05-29 23:20:49 +00:00
Crypto City
e21b669517 functional_tests: fix discovery tests after new discovery additions 2020-05-29 23:20:49 +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
98ad361d8a firefighting 2020-05-29 23:20:45 +00:00
luigi1111
d6d4a03b85
Merge pull request #6535 
81773f5 fuzz_tests: refactor and add OSS-Fuzz compatibility (moneromooo-monero)
cb4edc1 cmake: ASAN and PIE don't mix (moneromooo-monero)
 2020-05-27 18:27:06 -05:00
Crypto City
6a18101b1a add invitation system 2020-05-26 16:22:42 +00:00
Crypto City
b333b92415 move cc_badge.h away from blockchain_db.h 2020-05-26 16:22:42 +00:00
moneromooo-monero
81773f55a4
fuzz_tests: refactor and add OSS-Fuzz compatibility 2020-05-15 17:18:27 +00:00
selsta
f35ced6d7f
build: fix boost 1.73 compatibility 2020-05-14 22:57:53 +02:00
luigi1111
9f3e8e3ff0
Merge pull request #6477 
afe5a55 Revert functional test changes in babf25d and 5715460 (vtnerd)
 2020-05-06 00:26:16 -05:00
Crypto City
06472348cf WIP - palettes 2020-04-28 15:43:03 +00:00
Lee Clagett
afe5a55e96 Revert functional test changes in babf25d2e and 571546067 2020-04-24 18:30:23 -04:00
Crypto City
4863f4684e unit_tests: fix building settings unit test 2020-04-23 13:16:35 +00:00
Crypto City
6ad068d938 make city levels somewhat easier to achieve 2020-04-22 15:14:48 +00:00
Crypto City
3a0571d578 give some slight share/production edge with building age 
This should make it somewhat more appealing to build an existing building
rather then buy your own land and build a new building on it, given there
is no land scarcity.
 2020-04-21 17:41:07 +00:00
luigi1111
c846c8650e
Merge pull request #6445 
5715460 Always reject duplicate key-images from second txid (vtnerd)
babf25d Allow unrestricted rpc calls to get full txpool info (vtnerd)
 2020-04-21 09:03:37 -05:00
luigi1111
4540afc51b
Merge pull request #6433 
7326b69 functional_tests: ensure signatures never reuse a timestamp (moneromooo-monero)
082dd2c functional_tests: ensure signed timestamps are fresh (moneromooo-monero)
 2020-04-21 08:54:44 -05:00
luigi1111
06c81b6527
Merge pull request #6359 
f9441c5 Fixed string_ref usage bug in epee::from_hex::vector (vtnerd)
 2020-04-21 08:38:21 -05:00
luigi1111
2d729fbdf7
Merge pull request #6332 
87d7558 Allow wallet2.h to run in WebAssembly (woodser)
 2020-04-21 08:26:54 -05:00
Crypto City
326f4bc3f2 allow repairing many flags in one command 2020-04-15 17:51:31 +00:00
woodser
87d75584e8 Allow wallet2.h to run in WebAssembly 
- Add abstract_http_client.h which http_client.h extends.
- Replace simple_http_client with abstract_http_client in wallet2,
message_store, message_transporter, and node_rpc_proxy.
- Import and export wallet data in wallet2.
- Use #if defined __EMSCRIPTEN__ directives to skip incompatible code.
 2020-04-15 13:22:46 -04:00