Thr0lu5/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity
15,037 Commits 4 Branches 0 Tags 588 MiB
v0.34.2.0
Commit Graph

15037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Crypto City
afb80888c5 game: fix double delete in image loader 2023-01-28 17:02:59 +00:00
Crypto City
bbb1139d19 external: add litehtml submodule 2023-01-28 17:02:59 +00:00
tobtoht
4845091077 More changes from feather wallet 
up to 0037-ensure-stack-protector.patch
 2023-01-28 17:02:59 +00:00
Crypto City
f2cf0807b5 wallet2_api: fix build 2023-01-28 17:02:59 +00:00
Crypto City
e96e475c1a game: only display overhead text if close enough 2023-01-28 17:02:59 +00:00
Crypto City
f2a8f80dc9 game: display overhead chat in the intended chat colours 2023-01-28 17:02:59 +00:00
Crypto City
b36454b79b game: allow vertical colour gradients in chat messages 2023-01-28 17:02:59 +00:00
Crypto City
299fc136c9 display chat lines above avatar heads 2023-01-28 17:02:59 +00:00
Crypto City
a5d9f1094f game: share and view other online players' avatars 2023-01-28 17:02:59 +00:00
Crypto City
806dc19d05 game: split off Avatar from AvatarCamera 2023-01-28 17:02:59 +00:00
Crypto City
95ff398ee5 game: add a key binding to toggle the main UI panel 2023-01-28 17:02:59 +00:00
Crypto City
6eb3aaba69 game: add beryl/pearls to game update message autodetection 2023-01-28 17:02:59 +00:00
Crypto City
03e8e5dfe8 do not warn about trusted block hash data when offline 2023-01-28 17:02:59 +00:00
Crypto City
487e941453 functional_tests: fix comment 2023-01-28 17:02:59 +00:00
Crypto City
095104f6d0 constrain tax break zones within 25k tiles of center or other ones 2023-01-28 17:02:59 +00:00
Crypto City
32f8114920 add oyster diver badge 2023-01-28 17:02:59 +00:00
Crypto City
28cb73ab44 add oyster habitat city specialization 2023-01-28 17:02:59 +00:00
Crypto City
8a2d8333af game: add missing labour cost in fight fire screen 2023-01-28 17:02:59 +00:00
Crypto City
d4ff57d67b cc: fix a warning 2023-01-28 17:02:59 +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
f86c3671d8 wallet_rpc_server: fix cc_service delta_service_price signedness 2023-01-28 17:02:59 +00:00
Crypto City
6097b83041 reorder gemstones in prestige order 2023-01-28 17:02:59 +00:00
Crypto City
dd339d2e7a game: improve advice screen text layout for multiple merchant ships 2023-01-28 17:02:59 +00:00
Crypto City
40afd034d2 cc: new fish swarm special event 
increased fish catch in near waters
 2023-01-28 17:02:59 +00:00
Crypto City
d4297938df cc: military influence now helps with bear attacks 
less probability of damage, and less food eaten by bears
 2023-01-28 17:02:59 +00:00
Crypto City
fb997bf2e6 avoid using duplicate merchant ship names at the same time 2023-01-28 17:02:58 +00:00
Crypto City
c19f9dc5c0 game: tighter thread safety, and fix missing message notifications 2023-01-28 17:02:58 +00:00
Crypto City
2ba2eab16d cc: make is mayor a city an expression, not an operand 2023-01-28 17:02:58 +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
Crypto City
46441e61b1 core: do not force sync the db when finding a block in regtest mode 
for a slight performance boost in functional tests
 2023-01-28 17:02:58 +00:00
Crypto City
c534b0d58a boost-libs: fix build 2023-01-28 17:02:58 +00:00
Crypto City
7ce9576995 game: fix selection artifacts when clouds are enabled 2023-01-28 17:02:58 +00:00
Crypto City
a31f37334b account for gold in items assigned to flags 2023-01-28 17:02:58 +00:00
Crypto City
118f1ac9ca functional_tests: fix demolish tests 2023-01-28 17:02:58 +00:00
luigi1111
66184f3085
Merge pull request #8597 
853171b build: prepare v0.18.1.2 (selsta)
 2022-09-27 17:31:52 -05:00
selsta
853171bbf0
build: prepare v0.18.1.2 2022-09-26 22:41:36 +02:00
luigi1111
1f27fdf6a5
Merge pull request #8588 
802c4bb Move update_checkpoints() to a later stage (SChernykh)
 2022-09-26 15:00:59 -05:00
luigi1111
0bef4265ac
Merge pull request #8585 
5ffa31c wallet2: fail to establish daemon cxn == 'Disconnected' cxn status (j-berman)
 2022-09-26 14:57:58 -05:00
luigi1111
a7b0c93c7d
Merge pull request #8582 
1cd21bf add an option to force-update multisig key exchange under some circumstances (koe)
 2022-09-26 14:55:28 -05:00
luigi1111
9885b8b0f2
Merge pull request #8579 
7d358cd repo: remove ldns leftovers (selsta)
09402d0 depends: remove unused Qt package (selsta)
 2022-09-26 14:54:58 -05:00
luigi1111
fdb31856dd
Merge pull request #8577 
6adf03c Second thread pool for IO (SChernykh)
 2022-09-26 14:51:54 -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
j-berman
5ffa31c48e wallet2: fail to establish daemon cxn == "Disconnected" cxn status 2022-09-21 20:12:16 -06:00
koe
1cd21bfba5 add an option to force-update multisig key exchange under some circumstances 2022-09-21 12:51:19 -05:00
selsta
7d358cdb1f
repo: remove ldns leftovers 2022-09-20 20:22:31 +02:00
selsta
09402d0edb
depends: remove unused Qt package 2022-09-20 20:21:48 +02:00
SChernykh
6adf03cdc5 Second thread pool for IO 2022-09-20 10:22:12 +02:00
luigi1111
7cbae6ca98
Merge pull request #8545 
12e7c41 Merge pull request #5 from j-berman/restore-msig-encrypted-seed (Justin Berman)
848a0c0 Fix segfault restoring encrypted multisig seed (j-berman)
401f5d9 Require user ack multisig is experimental to restore (j-berman)
fc8a5d6 multisig: fix #8537 seed restore (suggestions by @UkoeHB) (j-berman)
 2022-09-15 16:25:22 -05:00
luigi1111
0be63cffa8
Merge pull request #8544 
864a78e wallet2: check wallet compatibility with daemon's hard fork version (j-berman)
 2022-09-15 16:23:56 -05:00