Thr0lu5/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity
10,673 Commits 4 Branches 0 Tags 588 MiB
re-apply-soon
Commit Graph

10673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Blair
605ad84804
Merge pull request #6287 
dbcfae6f README: remove unmaintained build status (selsta)
 2020-01-24 20:20:53 -08:00
Alexander Blair
ceff65a21c
Merge pull request #6247 
cce4ea02 README: fix translation link (moneromooo-monero)
 2020-01-24 20:20:29 -08:00
Alexander Blair
e8f94e7f1d
Merge pull request #6173 
8231c7cd rpc: fix bootstrap RPC payment RPC being made in raw JSON, not JSON RPC (moneromooo-monero)
81c26589 rpc: don't auto fail RPC needing payment in bootstrap mode (moneromooo-monero)
 2020-01-24 20:19:41 -08:00
Alexander Blair
93d49c1a54
Merge pull request #6172 
d7cf8727 rpc: add received_timestamp for pool txes in gettransactions (moneromooo-monero)
 2020-01-24 20:17:39 -08:00
Alexander Blair
5fb03130f4
Merge pull request #6164 
dc589ef0 Add TheCharlatan pgp key (TheCharlatan)
 2020-01-24 20:15:56 -08:00
Alexander Blair
a7a8eb0279
Merge pull request #6160 
bd6a5778 Gitian: Fix sigs generation (TheCharlatan)
 2020-01-24 20:15:11 -08:00
Alexander Blair
94a4b9351e
Merge pull request #6159 
f3e155ea add xiphon's GPG key (xiphon)
 2020-01-24 20:14:29 -08:00
Alexander Blair
e51ce477db
Merge pull request #6157 
402dd207 db_lmdb: guard against non NUL terminated keys (moneromooo-monero)
 2020-01-24 20:07:37 -08:00
Alexander Blair
159c78758a
Merge pull request #6154 
3b419333 wallet: don't issue node rpc proxy requests in '--offline' mode (xiphon)
 2020-01-24 20:07:01 -08:00
Alexander Blair
f20a962774
Merge pull request #6153 
24adee4a p2p: don't request flags after closing connection (moneromooo-monero)
 2020-01-24 20:06:46 -08:00
Alexander Blair
d1b08c00cf
Merge pull request #6146 
70c9cd3c Change to Tx diffusion (Dandelion++ fluff) instead of flooding (Lee Clagett)
 2020-01-24 20:06:34 -08:00
Alexander Blair
5558919e56
Merge pull request #6128 
9fe8a76c perf_timer: fix pause/resume macros dereferencing too much (moneromooo-monero)
 2020-01-24 20:06:12 -08:00
moneromooo-monero
2e9d1e6e1f
wallet2: fix store-tx-info loading 
The backward compatibility code was always setting it to 1
in modern wallets since store_tx_keys was not present and thus
assumed to be 1 by default.

Reported by SeventhAlpaca
 2020-01-24 16:34:07 +00:00
Crypto City
0a53ab2732 wallet2: don't process game balance changes for pool txes 2020-01-24 15:49:35 +00:00
Crypto City
fb9e5297e8 auto updating trade prices 
A trade order can be set to update its price every game update,
allowing auctions of sorts
 2020-01-24 15:49:34 +00:00
Crypto City
df17dcdcda name binaries and relevant files townforge* 2020-01-24 15:49:34 +00:00
Crypto City
f8fddabe81 add a give (items) command 2020-01-24 15:49:34 +00:00
Crypto City
712fed31fa cc: don't require a valid pubkey when not sending money 2020-01-24 15:49:34 +00:00
Crypto City
ae6ad7eb3a cc: fix reverting game update with defaulted land 2020-01-24 15:49:34 +00:00
Crypto City
8e2c9d5489 cc: make roads use granite, but less so 2020-01-24 15:49:34 +00:00
Crypto City
97da41ec66 game: fix selection disappearing as the mouse moves off an object 2020-01-24 15:49:34 +00:00
Crypto City
564b79bbc9 game: add edit commands which went missing during the tb switch 2020-01-24 15:49:34 +00:00
Crypto City
4ccc38366d game: fix influence/generator area markers 2020-01-24 15:49:34 +00:00
Crypto City
26c803adf6 game: factor out the area model builder, it'll be reused 2020-01-24 15:49:34 +00:00
Crypto City
5405df5f11 game: enable a few filters by default for trade and research 2020-01-24 15:49:34 +00:00
Crypto City
0158e4bc71 game: add travel between cities 2020-01-24 15:49:34 +00:00
Crypto City
d68801f026 Allow trading cities 2020-01-24 15:49:34 +00:00
Crypto City
9d06dcf5b9 db_lmdb: don't place null pubkeys in the key-to-account table 
all treasuries will have that key
 2020-01-24 15:49:34 +00:00
Crypto City
7d6cb44866 db_lmdb: fix missing city name in for_all_cc_cities 2020-01-24 15:49:34 +00:00
Crypto City
c82864acfc New cities can now be created, price goes down with world size 2020-01-24 15:49:34 +00:00
Crypto City
51a400aad1 glfw3: remove obsolete repo 2020-01-24 15:49:34 +00:00
Crypto City
b395e17a43 game: fix disappearing budget items 2020-01-20 00:58:01 +00:00
Crypto City
429cf3e9c0 game: disable assign items when appropriate 
it was left enabled as a debug helper
 2020-01-20 00:58:01 +00:00
Crypto City
f34a1cb838 GameData: add missing giles 2020-01-19 17:37:16 +00:00
Dusan Klinec
6f330865e5
fix tests bug added in #6110 
- e.g., fixes gen_block_big_major_version test, error: generation failed: what=events not set, cannot compute valid RandomX PoW
- ask for events only if difficulty > 1 (when it really matters)
- throwing an exception changed to logging, so it is easy to spot a problem if tests start to fail.
 2020-01-19 17:21:04 +01:00
Crypto City
3e28b6f6cf freetype: build with -DPIC -fPIC -O2 2020-01-19 12:16:54 +00:00
Aaron Hook
d0641b42fe net: fix incorrect less operator for top/i2p addresses 2020-01-18 19:18:56 -08:00
Crypto City
440089fa43 .gitmodules: point to my forks 2020-01-19 02:52:37 +00:00
Crypto City
3e25efaf45 game: display the max amount assignable in item select dialog 2020-01-18 13:02:00 +00:00
Crypto City
59a8a6345d GameData: make checkbox toggled by their text widget too 2020-01-18 12:26:54 +00:00
Crypto City
8ae7f04e93 game: some usability tweaks in trade ui 2020-01-18 12:14:27 +00:00
Crypto City
d6200512fd game: fix line taken out by mistkae in previous commit 2020-01-18 12:11:22 +00:00
Crypto City
d1b618ec43 game: wip - switch to turbo badger for ui 2020-01-18 01:21:51 +00:00
Crypto City
9c8fa71031 game: add missing node config dialog files 2020-01-17 23:24:08 +00:00
Crypto City
bc5bc0f085 game: make centered size conigurable 2020-01-17 23:21:37 +00:00
Crypto City
4b7fb5c3f4 GameData: fix "new account name" field id 2020-01-17 22:46:48 +00:00
moneromooo-monero
484fc0c844 wallet2: remember daemon address overrides when loading a new wallet 2020-01-17 22:35:07 +00:00
Crypto City
bed5895ac3 game: node config dialog and disconnected notification 2020-01-17 21:13:02 +00:00
cohcho
fe92fa1391 [randomx] Add missing randomx_vm_set_cache() 2020-01-17 19:25:26 +00:00
Crypto City
764028edc3 GameData: add missing cloud files 2020-01-17 17:51:04 +00:00