Syksy/townforge
1
0
Fork 0
forked from townforge/townforge
Code Pull Requests Activity
16,121 Commits 13 Branches 181 Tags 599 MiB
cc
Commit Graph

1146 Commits

Author SHA1 Message Date
Crypto City
806fa5e069 restore dandelion except for game commands 
game commands want to be mined asap, and do not need the
same level of privacy that currency transfers do
 2023-07-20 14:00:18 +00:00
Crypto City
e69f21af61 add occupation as an account setting when creating an account 
they don't have any effect yet
 2023-07-18 06:16:23 +00:00
Crypto City
72ea2b635a add origin to character creation (to restrict title) 2023-07-17 14:35:24 +00:00
Crypto City
1fae98d79b allow customizing avatar colours after creation 2023-07-17 07:31:16 +00:00
Crypto City
ae2701b063 avatars can now be customized (body shape, skin/hair colour) 2023-07-17 07:31:16 +00:00
Crypto City
bbb124e13b allow auctions to lapse (set by auction creator) 2023-07-12 12:14:33 +00:00
Crypto City
c43db96440 lit lightsources now increase building shares 2023-07-09 20:11:39 +00:00
Crypto City
8faa75553a game: add smoothness to magica voxel file format as a custom chunk 2023-07-09 20:11:38 +00:00
Crypto City
df94fe9be6 add voxel smoothness to consensus 2023-06-16 16:33:34 +00:00
Crypto City
7a91d1ea2b unit_tests: add missing lightsource tag check 2023-06-16 16:33:34 +00:00
Crypto City
cd4fbc1092 unit_tests: fix new rct cache unit tests after recent merge 2023-06-09 14:27:17 +00:00
Crypto City
430f64ebaa unit_tests: fix build after monero merge 2023-06-08 14:56:30 +00:00
Crypto City
5e5ad0f715 Fluorine Fermi 
-----BEGIN PGP SIGNATURE-----
 
 iQFJBAABCAAzFiEEh3erj3eO6JSHovjn9KygGDZB4BAFAmQrcQUVHGx1aWdpMTEx
 MXdAZ21haWwuY29tAAoJEPSsoBg2QeAQx2kH/AjGrkHYqvwiwUwxPHvUG3IE2+47
 j2pZAd55yg1l4clECRwFSicdNHqInXYqj03GeVl+NW9mcIe52cY1GLYYwwHFdfgk
 BMRdfYTZypoe84qzAupN0miAHHFgIcnQdR90MVt/mMWc67JUPA0XdJC2jpOho7ob
 h8rjRSv/QEpGQ3CeoG3/brAIc2/TNRFJHCq9eVc1fhZUJ2gWHieo/EbtnbArwbpU
 NWZ9GAoWyy5fUhmYgzHPwqGzbvzlmWl5C4dw3HdjvXL2Ah7DPuG3tY3b29z0xBD3
 C3bCGEYkOvtmJ/bBQyu3ZVfj2W3Z7pDItQ1fyFxbhWzakgPICWXjbyR7K1w=
 =TDpE
 -----END PGP SIGNATURE-----

Merge tag 'v0.18.2.2' into cc

Fluorine Fermi
 2023-06-08 14:31:22 +00:00
Crypto City
8ea9160fca game accounts can now be auctioned 
can only be withdrawn from at the moment
 2023-05-30 13:04:24 +00:00
Crypto City
53480ea159 coru: jeopardy mode 
the winner may pick a coin or rune of their choice from
the loser's deck
 2023-05-30 13:04:02 +00:00
Crypto City
87ec510baf coru tournaments 2023-05-30 13:03:57 +00:00
Crypto City
c68faac405 coru: a "collectible card" minigame based on coins and runes 
designed by syksy
 2023-05-30 13:03:31 +00:00
tobtoht
8dc4abdafe
common: do not use DNS to determine if address is local 
Co-authored-by: j-berman <justinberman@protonmail.com>
 2023-05-25 18:06:34 +02:00
Crypto City
2c378941dd players can now have a title 
chosen among a set of predefined components
 2023-04-05 07:54:00 +00:00
Crypto City
71ffbea68a divide time into epochs, for flavour 2023-03-29 10:38:35 +00:00
Crypto City
163f2864a9 unit_tests: fix warnings and remove obsolete code 2023-03-26 20:44:49 +00:00
Crypto City
27845701db cities can now have a tagline 
because it's cool
 2023-03-26 20:44:48 +00:00
Crypto City
36c765ca14 Fluorine Fermi 
-----BEGIN PGP SIGNATURE-----
 
 iQFJBAABCAAzFiEEh3erj3eO6JSHovjn9KygGDZB4BAFAmMzenIVHGx1aWdpMTEx
 MXdAZ21haWwuY29tAAoJEPSsoBg2QeAQCi4IAJvKvE7nJ51/ZK30IY5+y2ELq1uI
 tYw9w6E8XujX4lxWewsV5BywJrYTmj22gfhlnuf54ppqciMNOZj8r1jp6bQMLY8d
 vNZwowbH/CRdGeo4k2EGOJIdB1wQ2m2i5hvlOcmlGFL7nujo2m9AHnrqxcfTw0ns
 xfWRjTU5Z3srfs22J9KNEurSg11i7DatwCO79zBL+JRETVLpD8GV6eeSXGSwNVc7
 6vUB/z0OoOtSV6UVDkqL1d5op2siw9NLEihYKLbTqAAdWxAG7o82Ne/cw6Vyo0uy
 mKwoSxGUf9zMNXlQfpQpxVmriXNgfjQ89akTVq7niIB9jG1OU/v9Pvg4BxE=
 =k/nU
 -----END PGP SIGNATURE-----

Merge tag 'v0.18.1.2' into cc

Fluorine Fermi
 2023-03-19 06:38:11 +00:00
Jeffrey Ryan
c59e0096b6 verRctNonSemanticsSimpleCached: fix fragility 2023-03-17 18:46:34 -05:00
Crypto City
1640e4e93a wallet2: remove old format load/save 
boost serialization and portable archives are obsolete in Monero,
kept only for loading old data, which does not apply in Townforge
 2023-03-06 13:51:01 +00:00
Crypto City
694cb85f97 add integer gaussian probability function (fixed 8000 variance) 
relies on a precalculated lookup table to avoid floating point
 2023-02-16 14:32:03 +00:00
Crypto City
f71b6df441 craft buildings can now runestones from regular stones 2023-02-16 14:18:40 +00:00
Crypto City
2a06fb53d2 compress a few more from/to strings in commands 2023-02-16 14:18:38 +00:00
Crypto City
d6170c130d items can now be retrieved from flags 
except labour and construction materials
 2023-01-29 08:10:02 +00:00
Crypto City
309d0c6123 add visiting scholar special event 2023-01-28 17:03:01 +00:00
Crypto City
0cd2e67d06 research buildings now offer a bonus and can be used as a service 2023-01-28 17:03:00 +00:00
Crypto City
e6f1dfcb27 add levenshtein and damerau/levenshtein distance functions 2023-01-28 17:03:00 +00:00
Crypto City
1985a1d5a7 food salting, as an agricultural building service 2023-01-28 17:02:59 +00:00
Crypto City
413ba7369f pearl diving, as a fishery service 2023-01-28 17:02:59 +00:00
Crypto City
aa7bcbf6c9 there can now be more than once special event in a city at once 2023-01-28 17:02:58 +00:00
luigi1111
153819fc4c
Merge pull request #8649 
2c24322 DNSResolver: fix not handling hostnames without dot characters [release] (Jeffrey Ryan)
 2023-01-11 11:41:56 -05:00
luigi1111
cbc5cf43f2
Merge pull request #8644 
38d4811 p2p: fix exclusive node DNS resolution for certain hosts [release] (Jeffrey Ryan)
 2023-01-11 11:40:13 -05:00
Jeffrey Ryan
2c2432245f DNSResolver: fix not handling hostnames without dot characters [release] 
Unrelated, but similar code-wise to #8643. There is a check in `DNSResolver` which automatically fails to resolve hostnames which do not contain the `.` character. This PR removes that check.
 2022-11-21 21:16:16 -06:00
Jeffrey Ryan
38d4811c89 p2p: fix exclusive node DNS resolution for certain hosts [release] 
Fixes #8633. The function `append_net_address` did not parse hostname + port addresses (e.g. `bar:29080`) correctly if the hostname did not contain a `'.'` character.

@vtnerd comments 1

clear up 2nd conditional statement
 2022-11-17 18:57:04 -06:00
Lee Clagett
1bb5d25e31 Fix dandelion++ fluff/stem bug with local txes 2022-10-25 16:01:09 -04:00
luigi1111
1f27fdf6a5
Merge pull request #8588 
802c4bb Move update_checkpoints() to a later stage (SChernykh)
 2022-09-26 15:00:59 -05:00
SChernykh
802c4bb0e4 Move update_checkpoints() to a later stage 
update_checkpoints() makes a few DNS requests and can take up to 20-30 seconds to complete (3-6 seconds on average). It is currently called from core::handle_incoming_block() which holds m_incoming_tx_lock, so it blocks all incoming transactions and blocks processing while update_checkpoints() is running. This PR moves it to until after a new block has been processed and relayed, to avoid full monerod locking.
 2022-09-22 13:06:39 +02:00
koe
1cd21bfba5 add an option to force-update multisig key exchange under some circumstances 2022-09-21 12:51:19 -05:00
Crypto City
bf53f14fd8 custom items can now have per role bonuses 2022-09-02 20:14:41 +00:00
j-berman
fc8a5d68f1 multisig: fix #8537 seed restore (suggestions by @UkoeHB) 
- spend secret key is no longer the sum of multisig key shares;
no need to check that is the case upon restore.
- restoring a multisig wallet from multisig info means that the
wallet must have already completed all setup rounds. Upon restore,
set the number of rounds completed accordingly.
 2022-09-01 16:25:28 -07:00
Crypto City
1f636fbf8e change tax break zone mechanics 
There can be multiple tax break zones, unlocked at increasing
city levels, but they are fixed once set.
This will prevent mayorial bait and switch abuse.
 2022-08-31 11:48:49 +00:00
Crypto City
6140cc9f81 select embedded data locations uniformly across rings 2022-08-23 05:20:29 +00:00
Crypto City
7c70d0ef6e invisible P2P messages 2022-08-23 05:20:28 +00:00
Crypto City
27bcb3586b arbitrary data may be invisibly embedded in CLSAGs 
This decreases the ring size observed by the recipient,
but not the ring size observed by another observer.
The more data, the greater the ring size reduction.
CLSAGs can carry a maximum of 252 bits per value (one
bit is used as a flag, the rest as data payload), and
there are 15 such values per ring. At close to full
capacity, the real spend will be known to the recipient
(though not to an observer, who will not even be able
to tell whether a transaction includes embedded data
or not).

Thanks to kayabaNerve for pointing out how to use s
for this.
 2022-08-19 14:43:43 +00:00
Crypto City
088538c160 Merge remote-tracking branch 'origin/master' into HEAD 
b6a029f222

Multisig functional test broken
 2022-08-08 17:44:32 +00:00
Crypto City
f9790980b4 new special event: merchant ship, selling items on the market 2022-08-04 15:57:39 +00:00
Crypto City
aaf24f1338 allow seting more than one global variable at once, for atomicity 2022-08-04 08:36:32 +00:00
Crypto City
6bfc447544 custom items may now have a prestige bonus 
only the game account can add prestige bonuses
 2022-08-04 08:36:31 +00:00
Crypto City
6c4a31509a new "tax break zone" city specialization 2022-08-04 08:36:31 +00:00
Crypto City
f4a8938ec1 unit_tests: add unit_tests for collectible fish 2022-08-02 06:19:05 +00:00
Crypto City
1582492535 allow creating more items if that was setup on item definition 2022-08-02 06:19:03 +00:00
Crypto City
5c2c002d17 user created textures and licencing - not yet usable on voxels 2022-07-23 15:46:19 +00:00
luigi1111
9df069f4ce
Merge pull request #8426 
a82fba4 address PR comments (j-berman)
3be1dbd connection: fix implementation (anon)
724ff21 connection: add segfault and deadlocks demo (anon)
 2022-07-15 11:25:11 -04:00
j-berman
a82fba4b7b address PR comments 2022-07-08 15:10:03 -07:00
anon
724ff21447 connection: add segfault and deadlocks demo 2022-07-05 22:31:26 -07:00
Crypto City
b1ab49720b players can now name areas 2022-07-04 21:15:34 +00:00
Crypto City
31a58c66cf unit_tests: ensure we fail trying to get balance of an invalid account 2022-07-04 21:15:33 +00:00
Crypto City
ffc4e2198f buildings' econonic power can now be upgraded 
for 150% of the incremental cost
 2022-07-04 21:15:33 +00:00
Crypto City
259ac82299 remove old TF forks, we'll be starting anew 2022-07-04 21:15:33 +00:00
Crypto City
ce6016306d add fish, fishing and fisheries 2022-07-04 21:15:33 +00:00
anon
c7b2944f89 multisig: fix critical vulnerabilities in signing 2022-06-30 12:56:40 -05:00
Crypto City
9f6412b083 water/shoreline 2022-06-30 07:26:16 +00:00
Crypto City
b96242a157 fix fixed multiplication for low magnitude numbers 2022-06-28 16:49:50 +00:00
Crypto City
3e0024c233 unit_tests: add a few simple fixed_t sin/cos tests 2022-06-28 16:49:49 +00:00
luigi1111
9750e1fa10
Merge pull request #8340 
08080df unit_tests: add more sha256sum test cases (Jeffrey Ryan)
a66a52d common: update sha256sum to use OpenSSL 3.0 API (Jeffrey Ryan)
 2022-05-26 21:26:42 -05:00
j-berman
2dab31f62f Don't exclusively drop tor/i2p outgoing cxns in idle loop 2022-05-18 09:54:21 -07:00
Crypto City
1bf09dfa66 tests: fix tests 2022-05-18 06:36:26 +00:00
Jeffrey Ryan
08080df2d9
unit_tests: add more sha256sum test cases 2022-05-18 01:34:20 +02:00
luigi1111
d58ea37a8d
Merge pull request #8302 
41da2fe Update copyright to 2022 for Hardfork files (Akrit)
 2022-05-10 16:56:39 -05:00
luigi1111
c1625a8928
Merge pull request #8220 
0d6ecb1 multisig: add post-kex verification round to check that all participants have completed the multisig address (koe)
 2022-05-10 16:41:02 -05:00
koe
0d6ecb1136 multisig: add post-kex verification round to check that all participants have completed the multisig address 2022-04-29 14:04:59 -05:00
Akrit
41da2fe6f3 Update copyright to 2022 for Hardfork files 
Update Makefile and LICENSE
 2022-04-29 11:12:36 +02:00
Jeffrey
40f02f9d73 Add Include statements 2022-04-18 09:55:20 -05:00
moneromooo-monero
b030f20751
Fee changes from ArticMine 
https://github.com/ArticMine/Monero-Documents/blob/master/MoneroScaling2021-02.pdf

with a change to use 1.7 instead of 2.0 for the max long term increase rate
 2022-04-10 18:13:34 +00:00
moneromooo-monero
9f786f0550
epee: allow copying a rolling_median_t object 2022-04-10 18:13:31 +00:00
luigi1111
c11385591e
Merge pull request #8228 
1ce9e9c Remove dead code from parserse_base_utils and fix unit tests (Jeffrey)
 2022-04-06 00:22:23 -04:00
luigi1111
0eb1b570b6
Merge pull request #8197 
da9aa1f Copyright: Update to 2022 (mj-xmr)
 2022-04-06 00:08:53 -04:00
moneromooo-monero
a0d80b1f95
plug bulletproofs plus into consensus 2022-04-05 18:50:17 +00:00
Sarang Noether
bd27debb2d Bulletproofs+ 2022-04-04 08:23:21 +00:00
Jeffrey
1ce9e9cda4 Remove dead code from parserse_base_utils and fix unit tests 
* Remove `match_string()`, `match_number()`, and `match_word()`
* Remove `match_word_with_extrasymb()` and `match_word_til_equal_mark()`
* Adapt unit test for `match_number()` to `match_number2()`
* Adapt unit test for `match_string()` to `match_string2()`

Note: the unit tests were testing for the old version of the functions, and
the interfaces for these functions changed slightly, so I had to also edit
the tests.

As of writing, this PR has no merge conflicts with #8211

Additional changes during review:
* Explicitly set up is_[float/signed]_val to be changed before each call
* Structify the tests and fix uninitialized variables
 2022-03-30 13:29:32 -05:00
mj-xmr
da9aa1f7f8
Copyright: Update to 2022 2022-03-04 06:59:20 +01:00
luigi1111
5eaa4434e8
Merge pull request #7877 
e08abaa multisig key exchange update and refactor (koe)
 2022-03-02 18:51:54 -05:00
koe
e08abaa43f multisig key exchange update and refactor 2022-02-22 16:37:42 -06:00
Crypto City
d8d45c8fba unit_tests: fix build after set_default_palette change 2021-12-02 12:20:11 +00:00
Crypto City
9f8cbdcb77 unit_tests: fix build after get_building_cost_production api change 2021-11-29 10:41:18 +00:00
Crypto City
861f378589 speed up account balance access and updates 2021-11-25 12:10:05 +00:00
Crypto City
0e756771d3 avoid unnecessary repeated read/write of the same flag/account record 2021-11-24 07:08:50 +00:00
Crypto City
9e592619fb tweak workforce building 
- add management efficiency discovery levels, increasing output
- add penalties for industry influence
 2021-11-24 07:08:50 +00:00
Crypto City
fe5272b288 add whispers - player messages on arbitrary locations 2021-11-23 16:22:28 +00:00
Crypto City
d545944400 add a level based build height limit 2021-11-02 08:49:58 +00:00
moneromooo-monero
bbe3b276b8
tx_pool: full tx revalidation on fork boundaries 
avoids mining txes after a fork that are invalid by this fork's
rules, but were valid by the previous fork rules at the time
they were verified and added to the txpool.
 2021-11-01 20:56:38 +00:00
Crypto City
8153873cb2 make recent consensus changes activate at v15 2021-10-15 12:41:26 +00:00
Crypto City
0d20478bd2 mayors may now control who can buy/build in their city 2021-10-14 10:47:26 +00:00
luigi1111
45920c36f1
Merge pull request #7874 
9154883 node_server: fix race condition (anon)
8922f96 node_server: add race condition demo (anon)
 2021-10-11 12:56:14 -05:00
Crypto City
4d17a7bc26 give road bonuses to flags that are suitable for bridges 2021-10-04 21:31:50 +00:00