Rucknium/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity
13,518 Commits 11 Branches 0 Tags 348 MiB
v0.33.2.0
Commit Graph

13518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Crypto City
f20c2e126b urho3d: merge tracy profiler (disabled) 2021-08-12 11:01:35 +00:00
Crypto City
2c75c589c2 game: move selection highlight to the fragment program 
Should be faster, avoids extra geometry and fixes Z fighting
on uneven terrain
 2021-08-12 11:01:35 +00:00
Crypto City
c5ab837276 game: log texture and their sizes (disabled) 2021-08-12 11:01:35 +00:00
Crypto City
5206ea2ec3 fix hunts conflicting with each other 2021-08-12 11:01:35 +00:00
Crypto City
b5f7cd94af functional_tests: fix firefighting test 2021-08-12 11:01:35 +00:00
Crypto City
d26f8fe73b game: decrease memory usage 2021-08-12 11:01:35 +00:00
Crypto City
42383b5c45 game: cancel wallet ops on exit 2021-08-12 11:01:35 +00:00
Crypto City
fd9a94543a game: fix loading icon leak 2021-08-12 11:01:35 +00:00
Crypto City
2634190f19 tb: fix crash in previous commit 2021-08-12 11:01:35 +00:00
Crypto City
4212585cf4 game: add city info in the travel to city screen 2021-08-12 11:01:35 +00:00
Crypto City
f593cdeb41 tx_pool: move various errors to L1, to match existing ones 2021-08-12 11:01:35 +00:00
Crypto City
6f7bf6069c game: add city foundation to news screen, tweak other news icons 2021-08-12 11:01:35 +00:00
Crypto City
ee5110249e bump sprawling city specialization to 10% 2021-08-12 11:01:35 +00:00
Crypto City
400c1a099e cc: fix sprawling cty specialization from 20% to 5% 2021-08-12 11:01:35 +00:00
Crypto City
f85253beb2 cc: do not count collectible coins for item collector badge 2021-08-12 11:01:35 +00:00
Crypto City
dd065998d3 game: speedup history filtering 2021-08-12 11:01:35 +00:00
Crypto City
bee7630bdb game: fix crashes in the toast notifications 2021-08-12 11:01:35 +00:00
Crypto City
fb9d84b807 game: remove player name in player history screen 
it's always the same and unnecessarily takes up space
 2021-08-12 11:01:35 +00:00
Crypto City
33ec88a3aa game: add all event info to the export file 2021-08-12 11:01:35 +00:00
Crypto City
ffb1c272d0 game: make trade txes short lived if they're fully matched 2021-08-12 11:01:35 +00:00
Crypto City
1fd1697750 game: fix harvesting inactive flags 2021-08-12 11:01:35 +00:00
Crypto City
922e732250 game: fix selling land/cities 2021-08-12 11:01:35 +00:00
Crypto City
1dec7c7954 tx_pool: remove txes with commands with invalid signatures 
even if kept_by_block, since that'll be moot due to locking
 2021-08-12 11:01:35 +00:00
Crypto City
88c2c3d68a do not consider commands with bad signatures in chat/pending 
These are probably from another chain, or malicious, though
they could be due to a reorg
 2021-08-12 11:01:35 +00:00
luigi1111
82149bfe44
Merge pull request #7818 
9c8e3e8 unit_tests: fix broken tests (anon)
 2021-08-11 22:40:13 -04:00
luigi1111
460fd4c80a
Merge pull request #7816 
29296d5 cmake: fix double build (selsta)
 2021-08-11 22:39:06 -04:00
luigi1111
0b4e922159
Merge pull request #7812 
bf96055 Make SSL key/cert storage backward-compatible (Nathan Dorfman)
 2021-08-11 22:38:24 -04:00
luigi1111
89664fcee5
Merge pull request #7811 
3d3a671 Daemon: Update average block size table (rbrunner7)
 2021-08-11 22:37:56 -04:00
luigi1111
521b4d9ded
Merge pull request #7809 
7354ffb p2p: remove blocked addresses/hosts from peerlist (moneromooo-monero)
 2021-08-11 22:35:15 -04:00
luigi1111
cb08466394
Merge pull request #7802 
a3d2b71 wallet_api: expose offline mode status (rating89us)
 2021-08-11 22:33:38 -04:00
luigi1111
5cebb8edc0
Merge pull request #7800 
b48074f Fixed json serialization of rct::RCTTypeNull (SChernykh)
 2021-08-11 22:32:39 -04:00
luigi1111
1bb8ec1b97
Merge pull request #7795 
87a0928 rpc: source file extensions must be explicit (cmake warning) (selsta)
 2021-08-11 22:31:34 -04:00
luigi1111
62844a776d
Merge pull request #7786 
9c6e094 fix #7784 - deinit wallet in wallet dtor (Dusan Klinec)
 2021-08-11 22:30:11 -04:00
mj-xmr
0a021c3bd1
CMake: document -Werror for add_c_flag_if_supported() from #7718 2021-08-11 19:53:20 +02:00
mj-xmr
0ac9a04b4c
epee: tidying post-incrementation -> pre-incrementation 2021-08-11 16:47:32 +02:00
j-berman
6f15a0c8d3 Make sure node returns to wallet that real output is unlocked 2021-08-11 07:28:10 -07:00
moneromooo-monero
7354ffb8a7
p2p: remove blocked addresses/hosts from peerlist 2021-08-05 17:29:25 +00:00
mj-xmr
d8e71c8dbe
CMake: ccache fix for FreeBSD at 'depends' 2021-08-04 20:05:42 +02:00
luigi1111
ed506006d2
Merge pull request #7796 
0c6e1d3 wallet2: chunk get_outs.bin calls to avoid sanity limits (moneromooo-monero)
 2021-08-02 18:54:46 -04:00
luigi1111
e3b3fb577a
Merge pull request #7794 
4414ed4 cmake: test is a reserved keyword (selsta)
 2021-08-02 18:54:15 -04:00
luigi1111
eeda76570c
Merge pull request #7790 
bc8d764 wallet: rephrase error message on invalid device address (Dusan Klinec)
 2021-08-02 18:53:05 -04:00
luigi1111
8c41d14ad5
Merge pull request #7788 
f5eb2ce wallet2: Don't auto lock device on process parsed blocks (tobtoht)
 2021-08-02 18:50:25 -04:00
luigi1111
a32da4bc3e
Merge pull request #7787 
1b80347 CI: Ubuntu-Test reuses Ubuntu-Build cache and building static libs (mj-xmr)
 2021-08-02 18:49:49 -04:00
luigi1111
0878207e8d
Merge the coolest pull request #7777 
30c15a6 Remove obsolete android dockerfiles (malinero)
 2021-08-02 18:49:08 -04:00
luigi1111
894e5b2794
Merge pull request #7767 
5fa1c90 Fix describe_transfer for multiple txes in a txset (Alex Opie)
 2021-08-02 18:47:05 -04:00
luigi1111
0cdb8d02e8
Merge pull request #7757 
d689b94 protocol: fix delayed 'you are now synchronized...' message (moneromooo-monero)
 2021-08-02 18:43:44 -04:00
luigi1111
9aa2d4c16e
Merge pull request #7747 
8cf95c8 wallet2: refresh: check error and throw before potentially breaking out of loop (tobtoht)
 2021-08-02 18:42:32 -04:00
Alex Opie
5fa1c90102
Fix describe_transfer for multiple txes in a txset 
This ensures each list of recipients is only the recipients
for one transaction. It also adds a new field "summary"
that describes the txset as a whole.

Fixes #7344
 2021-08-02 20:39:49 +02:00
luigi1111
0b72f46bf2
Merge pull request #7824 
90d6bed cmake: bodge cmake failure on OSS-Fuzz (moneromooo-monero)
 2021-07-31 18:28:38 -04:00
moneromooo-monero
90d6bed804
cmake: bodge cmake failure on OSS-Fuzz 2021-07-31 19:22:57 +00:00