riceball/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity
12,754 Commits 10 Branches 0 Tags 343 MiB
cc-feather
Commit Graph

12754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Crypto City
47ddfdc56e game: add a cancel button for trades 2020-08-25 13:20:14 +00:00
Crypto City
c688079acb commands can now be cancelled 
if they're not mined yet, or only partially matched trades
 2020-08-25 13:20:14 +00:00
Crypto City
4803e6f508 more fixes for mac 2020-08-25 13:20:14 +00:00
Crypto City
dc2cc4b6d5 item groups can now optionally be public 2020-08-25 13:20:14 +00:00
Crypto City
36c36119a4 game: add mayor to the city level screen 2020-08-25 13:20:14 +00:00
Crypto City
33cbc7d9f9 game: throw rather than display a message box on resource load failure 
Chances are it'd crash right after the failure, so no error displayed
 2020-08-25 13:20:14 +00:00
Crypto City
e7fa46d7ec game: fix stale owner when trading a flag 2020-08-25 13:20:14 +00:00
Crypto City
836a003c9a switch dates to season based pseudo gregorian 
This is much more user friendly
 2020-08-25 13:20:14 +00:00
Crypto City
d6950848b6 game: more error/sanity checking for the badge award screen 2020-08-25 13:20:14 +00:00
Crypto City
df98b0b120 game: fix UI rebuild in player history with unchanged history 2020-08-25 13:20:14 +00:00
Crypto City
214d2d1bae game: allow saving only the selection to magica voxel format 2020-08-25 13:20:14 +00:00
Crypto City
85c7f21a46 game: switch to 64 bit TurboBadger TBID 
Collisions were found in the wild
 2020-08-25 13:20:14 +00:00
Crypto City
d9d234a9fe fix most build problems on mac 2020-08-21 18:33:03 +00:00
Crypto City
fc21a69965 game: fix saving 256 sized voxel models 2020-08-21 18:33:03 +00:00
Crypto City
4e3ecf68cc game: hack to save visible terrain/models 2020-08-21 18:33:03 +00:00
Crypto City
46e24432e5 game: fix other players' transfers appearing before player id is set 2020-08-21 18:33:03 +00:00
Crypto City
0455b51023 urho3d: fix build on non GCC/x86_64 2020-08-21 18:33:03 +00:00
Crypto City
3760ec1f6f game: add macro to load materials, and set name 2020-08-21 18:33:03 +00:00
Crypto City
e7da1f1180 game: don't consider buttons in "transparent" windows transparent 2020-08-21 18:33:03 +00:00
Crypto City
72f0b22922 cc: swap unlock levels for military and affluent residential 2020-08-21 18:33:03 +00:00
Crypto City
d55dd1b4bb game: fix scrolling in badges screen 2020-08-21 18:33:03 +00:00
Crypto City
66ca774e5e tx_pool: fix self conflicting commands due to dandelion 2020-08-21 18:33:03 +00:00
Crypto City
65ada2da65 README: add game dependencies (mostly X11 related) for Ubuntu 2020-08-21 18:33:03 +00:00
Crypto City
9bd140f280 tx_pool: add logs to track conflict table, and simplify a bit 2020-08-21 18:33:03 +00:00
Crypto City
33516cb7c4 cc: add a few badges for collectible coins 2020-08-21 18:33:03 +00:00
Crypto City
61aa85ad3b add collectible coins 2020-08-21 18:33:02 +00:00
moneromooo-monero
844fb4e940
enforce claiming maximum coinbase amount 
Claiming a slightly lesser amount does not yield the size gains
that were seen pre rct, so this closes a fingerprinting vector
 2020-08-21 12:36:53 +00:00
selsta
7c7ccbd2a5
depends: fix broken links for ds_store / mac_alias 2020-08-20 21:33:23 +02:00
Lee Clagett
bdc6b10d62 Fix ZMQ pruned bulletproof transactions 2020-08-19 00:36:06 -04:00
Lee Clagett
b641e0a2c0 Add clear method to byte_stream 2020-08-17 21:30:34 -04:00
luigi1111
765db1ae7a
Revert "Use domain-separated ChaCha20 for in-memory key encryption" 
This reverts commit 921dd8dde5.
 2020-08-17 14:08:59 -05:00
moneromooo-monero
7175dcb107
replace most boost serialization with existing monero serialization 
This reduces the attack surface for data that can come from
malicious sources (exported output and key images, multisig
transactions...) since the monero serialization is already
exposed to the outside, and the boost lib we were using had
a few known crashers.

For interoperability, a new load-deprecated-formats wallet
setting is added (off by default). This allows loading boost
format data if there is no alternative. It will likely go
at some point, along with the ability to load those.

Notably, the peer lists file still uses the boost serialization
code, as the data it stores is define in epee, while the new
serialization code is in monero, and migrating it was fairly
hairy. Since this file is local and not obtained from anyone
else, the marginal risk is minimal, but it could be migrated
later if needed.

Some tests and tools also do, this will stay as is for now.
 2020-08-17 16:23:58 +00:00
moneromooo-monero
55363c5941
Avoid some temporary strings when reading off the database 2020-08-17 14:02:27 +00:00
Alexander Blair
43a4fd9e16
Merge pull request #6736 
05ad4fa39 epee: further defending against exceptions in command handlers (moneromooo-monero)
 2020-08-16 12:56:35 -07:00
Alexander Blair
43f5369bec
Merge pull request #6733 
4f01cf4b4 Tweak format, add option for difficulty (Howard Chu)
429d49512 Add options to print daily coin emission and fees (Howard Chu)
d745d2433 Don't forget size of prunable txn part (Howard Chu)
 2020-08-16 12:56:03 -07:00
Alexander Blair
d73b1b6560
Merge pull request #6727 
13eee1d6a rpc: reject wrong sized txid (moneromooo-monero)
92e6b7df2 easylogging++: fix crash with reentrant logging (moneromooo-monero)
6dd95d530 epee: guard against exceptions in RPC handlers (moneromooo-monero)
90016ad74 blockchain: guard against exceptions in add_new_block/children (moneromooo-monero)
 2020-08-16 12:55:25 -07:00
Alexander Blair
569d07d60b
Merge pull request #6722 
c1b03fb1a rpc: return empty txid get_outs rather than 00..00 when not requested (moneromooo-monero)
 2020-08-16 12:54:42 -07:00
Alexander Blair
7db379cc82
Merge pull request #6720 
86abf558c epee: Remove unused functions in local_ip.h (Jean Pierre Dudey)
 2020-08-16 12:54:17 -07:00
Alexander Blair
10ad0d7eb2
Merge pull request #6718 
85efc88c1 Fix overflow issue in epee:misc_utils::rolling_median_t and median(), with unit test (koe)
 2020-08-16 12:53:50 -07:00
Alexander Blair
01b512f3a9
Merge pull request #6716 
76c16822d wallet2_api: implement runtime proxy configuration (xiphon)
 2020-08-16 12:52:21 -07:00
Alexander Blair
f40b9e34e0
Merge pull request #6715 
3d6bc0a68 wallet2: throw a error on wallet initialization failure (xiphon)
 2020-08-16 12:51:57 -07:00
Alexander Blair
65d7d8312d
Merge pull request #6712 
01cd3d934 For NetBSD, add instructions to README.md and define to ea_config.h (thomasvaughan)
 2020-08-16 12:51:41 -07:00
Alexander Blair
43f91ee12e
Merge pull request #6703 
8baa7bb23 daemon: don't print "(pruned)" for coinbase txes (moneromooo-monero)
 2020-08-16 12:50:43 -07:00
Alexander Blair
d3e611fda2
Merge pull request #6698 
a3933a2a5 Update RandomX to v1.1.8 (tevador)
 2020-08-16 12:50:26 -07:00
Alexander Blair
79e93a8af8
Merge pull request #6691 
6111689cf cmake: allow custom openssl path on macOS (selsta)
 2020-08-16 12:48:07 -07:00
Alexander Blair
0b0da2aa81
Merge pull request #6689 
afd002c31 daemon: print sampling time in print_net_stats (moneromooo-monero)
ec7bba079 util: fix kilo prefix typo (K instead of k) (moneromooo-monero)
 2020-08-16 12:47:36 -07:00
Alexander Blair
236256f114
Merge pull request #6679 
2f1ad3b3d updates: mac gui .tar.bz2 -> .dmg (selsta)
 2020-08-16 12:46:51 -07:00
Alexander Blair
eba2189925
Merge pull request #6677 
f9e3fcdf3 add trezor support to sweep_single (Dusan Klinec)
 2020-08-16 12:46:27 -07:00
Alexander Blair
6b2d3deb20
Merge pull request #6662 
e33428012 python-rpc: fix bad in_peers parameter (moneromooo-monero)
 2020-08-16 12:45:56 -07:00
Alexander Blair
bc48494731
Merge pull request #6661 
267ce5b71 avoid a couple needless copies (moneromooo-monero)
 2020-08-16 12:45:37 -07:00