Ruckneum/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity
10,810 Commits 10 Branches 0 Tags 343 MiB
merge-track-item-supply
Commit Graph

10810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luigi1111
98e3802b26
Merge pull request #6484 
e7d0105 message_store: don't print an error when there is no mms file (moneromooo-monero)
 2020-05-06 00:30:39 -05:00
luigi1111
de025281dc
Merge pull request #6481 
119f706 rpc: fix 'use_bootstrap_daemon_if_necessary' return value (xiphon)
 2020-05-06 00:29:49 -05:00
luigi1111
9e3f72c375
Merge pull request #6480 
4f489fa wallet2: check_connection return false on get_version status != OK (xiphon)
 2020-05-06 00:28:18 -05:00
luigi1111
0f233c6ad8
Merge pull request #6478 
ee58362 Used legacy category to match insert_key_images behavior (vtnerd)
 2020-05-06 00:27:13 -05:00
luigi1111
9f3e8e3ff0
Merge pull request #6477 
afe5a55 Revert functional test changes in babf25d and 5715460 (vtnerd)
 2020-05-06 00:26:16 -05:00
luigi1111
483e5cab5c
Merge pull request #6472 
2efbd5f cryptonote: fix reuse of non default tx data when relaying (moneromooo-monero)
 2020-05-06 00:25:18 -05:00
luigi1111
8d0f1696df
Merge pull request #6471 
c6a1294 add another seed node (Gingeropolous/selsta)
9faf3d1 Add erciccione's seed node (erciccione/selsta)
 2020-05-06 00:23:59 -05:00
luigi1111
1f505a5eac
Merge pull request #6468 
a813c46 cryptonote_core: skip dns checkpoints on startup if not enforced (xiphon)
 2020-05-06 00:22:20 -05:00
luigi1111
6d1f3c9acd
Merge pull request #6467 
8b655de simplewallet: report timestamp based expected unlock time on balance (moneromooo-monero)
 2020-05-05 23:40:44 -05:00
luigi1111
b4023dcfc5
Merge pull request #6441 
613071f use memwipe on secret k/alpha values (moneromooo-monero)
 2020-05-05 23:39:32 -05:00
luigi1111
a7334faf63
Merge pull request #6409 
c26c930 Add byte_stream for zero-copy serialization, and add support in ZMQ-JSON. (vtnerd)
 2020-05-05 23:37:11 -05:00
xiphon
42e14840fb wallet2: fix keys file deserialization exception handling 2020-05-05 16:34:50 +00:00
luigi1111
8185054db7
Merge pull request #6451 
4ed60b6 Bulletproofs: verification speedup (SarangNoether)
 2020-05-02 15:14:41 -05:00
luigi1111
a5cc613a68
Merge pull request #6460 
f8b1480 unit_tests: fix gcc+ warning (sumogr)
 2020-05-01 15:50:19 -05:00
luigi1111
ae18ec080c
Merge pull request #6457 
5eb7f63 workflows: add trezor support ubuntu (selsta)
 2020-05-01 15:48:53 -05:00
luigi1111
ec90f9a54b
Merge pull request #6453 
d2d3a81 bootstrap_daemon: fix missing virtual destructor and lambda capture (clang warning) (xiphon)
 2020-05-01 15:47:47 -05:00
luigi1111
d68497a3e3
Merge pull request #6452 
d3e77cc FindCcache automatically (mj-xmr)
 2020-05-01 15:45:55 -05:00
luigi1111
ac9f7c9bec
Merge pull request #6449 
27d551d simplewallet: add sweep_account command (moneromooo-monero)
 2020-05-01 15:36:19 -05:00
luigi1111
c9b800a787
Merge pull request #6446 
e509ede trezor: adapt to new passphrase mechanism (ph4r05)
 2020-05-01 15:32:52 -05:00
luigi1111
f020b24b02
Merge pull request #6444 
b367630 simplewallet : missing function block separator (sumogr)
 2020-05-01 15:24:33 -05:00
luigi1111
6e7b883212
Merge pull request #6443 
145be6d p2p: startup speedup, init seed nodes on first 'connect_to_seed()' (xiphon)
 2020-05-01 15:23:05 -05:00
luigi1111
6b7e88e16c
Merge pull request #6440 
7c4a400 simplewallet: fix strings (show_transfers & export_transfers) (sumogr)
 2020-05-01 15:21:57 -05:00
luigi1111
443f5c6bda
Merge pull request #6436 
688a3e8 Add timelock verification on device (cslashm)
 2020-05-01 15:20:05 -05:00
luigi1111
69320cd913
Merge pull request #6420 
647c069 openssl update (ArqTras)
 2020-05-01 15:18:34 -05:00
luigi1111
3e21e591b8
Merge pull request #6350 
da99157 Use byte_slice for sending zmq messages - removes data copy within zmq (vtnerd)
 2020-05-01 15:13:58 -05:00
luigi1111
26bfd70459
Merge pull request #6487 
dd807b8 txpool.cpp: rename var to fix for old g++ version (xenial default) (sumogr)
 2020-04-29 12:13:24 -05:00
Sumo Gr
dd807b8410 txpool.cpp: rename var to fix for old g++ version (xenial default) 2020-04-29 10:03:51 +00:00
Lee Clagett
feee455c9f Fixes for ZMQ JSON-RPC endpoint names for raw tx 2020-04-29 01:07:27 -04:00
Crypto City
06472348cf WIP - palettes 2020-04-28 15:43:03 +00:00
Crypto City
15620cb958 game: more user friendly repair all button 2020-04-28 15:08:40 +00:00
Crypto City
8372adf43d game: remove unused prototype 2020-04-28 15:08:40 +00:00
Crypto City
c082af2f5e game: fix colunm resizing in flags list 2020-04-28 15:08:40 +00:00
Crypto City
7e64fabdb2 game: remove obsolete code 2020-04-28 15:08:40 +00:00
Crypto City
d2fecc6185 add obfuscated asset format variation to comply with licence terms 
Some assets have a licence prohibiting easy reuse by game users,
so we store them obfuscated
 2020-04-28 15:08:40 +00:00
Crypto City
145e16098d game: fix repair all considering empty flags 2020-04-28 15:08:40 +00:00
Crypto City
3275d55daf game: fix switches back and forth from per cube rendering mode 2020-04-28 15:08:40 +00:00
moneromooo-monero
7a8c1eece9
wallet2: fix subaddress expansion when receiving monero 2020-04-27 16:48:19 +00:00
Dusan Klinec
e509ede2aa
trezor: adapt to new passphrase mechanism 
- choice where to enter passphrase is now made on the host
- use wipeable string in the comm stack
- wipe passphrase memory
- protocol optimizations, prepare for new firmware version
- minor fixes and improvements
- tests fixes, HF12 support
 2020-04-27 18:17:56 +02:00
moneromooo-monero
e7d01056f4
message_store: don't print an error when there is no mms file 
It confuses people
 2020-04-27 15:44:29 +00:00
xiphon
119f706921 rpc: fix 'use_bootstrap_daemon_if_necessary' return value 2020-04-27 10:32:33 +00:00
ArqTras
647c069db6 openssl update 
Not available source updated

g version
 2020-04-27 10:52:51 +02:00
Crypto City
ed78e68f43 game: make notifications a bit easier to read by moving the shadow 2020-04-27 01:41:02 +00:00
Crypto City
497d951fce game: do not drop to block based rendering when hovering or unselected 
Target block highlight used to be material based, which required
per block rendering, but is now a frame cursor, which does not.
 2020-04-27 01:41:02 +00:00
xiphon
4f489fa6a2 wallet2: check_connection return false on get_version status != OK 2020-04-26 13:08:17 +00:00
Lee Clagett
ee58362b1f Used legacy category to match insert_key_images behavior 2020-04-24 20:19:37 -04:00
Lee Clagett
afe5a55e96 Revert functional test changes in babf25d2e and 571546067 2020-04-24 18:30:23 -04:00
Crypto City
f7243bbe23 game: enable/disable profile edit based on player info dialog account 2020-04-24 13:44:45 +00:00
Crypto City
b4eac58802 game: add a screenshot based title screen 2020-04-24 01:21:20 +00:00
Crypto City
4863f4684e unit_tests: fix building settings unit test 2020-04-23 13:16:35 +00:00
Crypto City
63c50b5c08 from monero 2020-04-22 17:16:55 +00:00