Commit Graph

11299 Commits

Author SHA1 Message Date
Crypto City
d3dbe239b6 game: fix hidden part of the hunt dialog with military bonus 2020-05-29 23:20:49 +00:00
Crypto City
f764b6cd57 game: display badge leaderboard with level, and badges as tooltip 2020-05-29 23:20:49 +00:00
Crypto City
c1d08f8f39 cc: do not award badges to the game account nor treasuries 2020-05-29 23:20:49 +00:00
Crypto City
ad26aef0e3 game: auto add variants to palette when selected and not already in 2020-05-29 23:20:49 +00:00
Crypto City
b9dda9eae5 game: fix material selection ui focus issues 2020-05-29 23:20:49 +00:00
Crypto City
179341a274 game: don't count chat commands in queued commands list 2020-05-29 23:20:49 +00:00
Crypto City
7e78f3bd54 cc: fix pioneer badge levels order 2020-05-29 23:20:49 +00:00
Crypto City
edbaccddea cc: fix reverting game update with flags on fire 2020-05-29 23:20:49 +00:00
Crypto City
52b82838e5 game: fix bad palette access 2020-05-29 23:20:48 +00:00
Crypto City
a8041489bd game: more explicit error messages for flag resizing 2020-05-29 23:20:48 +00:00
Crypto City
98ad361d8a firefighting 2020-05-29 23:20:45 +00:00
luigi1111
7e78da7772
Merge pull request #6582
2314dae workflows: fix windows build (selsta)
2020-05-28 12:53:58 -05:00
luigi1111
d6d4a03b85
Merge pull request #6535
81773f5 fuzz_tests: refactor and add OSS-Fuzz compatibility (moneromooo-monero)
cb4edc1 cmake: ASAN and PIE don't mix (moneromooo-monero)
2020-05-27 18:27:06 -05:00
luigi1111
463d044f5e
Merge pull request #6531
f35ced6 build: fix boost 1.73 compatibility (selsta)
2020-05-27 18:25:33 -05:00
Crypto City
6a18101b1a add invitation system 2020-05-26 16:22:42 +00:00
Crypto City
cecb5e0c77 db_lmdb: make some 8 bit fields not bitfields 2020-05-26 16:22:42 +00:00
Crypto City
5fbbecefca add streak badge 2020-05-26 16:22:42 +00:00
Crypto City
11787592a3 player profile may be edited from level 5 only 2020-05-26 16:22:42 +00:00
Crypto City
b333b92415 move cc_badge.h away from blockchain_db.h 2020-05-26 16:22:42 +00:00
Crypto City
ded3539067 cc: add a few discoveries 2020-05-26 16:22:42 +00:00
Crypto City
79d3b4b58a game: bodge a missing last character in material selection ui 2020-05-26 16:22:42 +00:00
Crypto City
1cdb478d39 game: material selection ui 2020-05-26 16:22:42 +00:00
Crypto City
85657e3c8c game: mitigate X/SDL input bug 2020-05-26 16:22:42 +00:00
Crypto City
9371eb8d6a cc: distribute last resort item purchases among all cities 2020-05-26 16:22:42 +00:00
Crypto City
691fe0d57d cc: guard against a city with 0 weight 2020-05-26 16:22:42 +00:00
Crypto City
d5bdc5d4c8 game: add some hysteresis to the compass 2020-05-26 16:22:42 +00:00
Crypto City
d0191ad7f1 game: add a compass 2020-05-26 16:22:42 +00:00
Crypto City
8872019d43 game: replace chat icons with a free to use one
Since I did not permission from Pardus to use theirs
2020-05-26 16:22:42 +00:00
selsta
2314dae8c8
workflows: fix windows build 2020-05-23 02:30:09 +02:00
moneromooo-monero
cb4edc1f45
cmake: ASAN and PIE don't mix
Binaries built with both crash on startup with maybe 25% probability
2020-05-15 17:18:50 +00:00
moneromooo-monero
81773f55a4
fuzz_tests: refactor and add OSS-Fuzz compatibility 2020-05-15 17:18:27 +00:00
selsta
f35ced6d7f
build: fix boost 1.73 compatibility 2020-05-14 22:57:53 +02:00
luigi1111
77a008f714
Merge pull request #6510
70609d7 cryptonote_core: take out the time based upgrade warning (moneromooo-monero)
2020-05-07 10:44:34 -05:00
luigi1111
4c2f78aeeb
Merge pull request #6506
42e1484 wallet2: fix keys file deserialization exception handling (xiphon)
2020-05-07 10:43:05 -05:00
moneromooo-monero
70609d7681
cryptonote_core: take out the time based upgrade warning
It doesn't really work anymore since we don't have a fork soon
2020-05-06 18:27:23 +00:00
luigi1111
dbba6004f5
Merge pull request #6503
f80ab3e cryptonote_protocol: do not request pruned borromean sig txes (moneromooo-monero)
2020-05-06 12:22:28 -05:00
moneromooo-monero
f80ab3edde
cryptonote_protocol: do not request pruned borromean sig txes
We don't have a function to calculate their weight from a pruned
version (yet).
2020-05-06 12:44:00 +00:00
luigi1111
f2c78f6a5b
Merge pull request #6486
feee455 Fixes for ZMQ JSON-RPC endpoint names for raw tx (vtnerd)
2020-05-06 00:34:30 -05:00
luigi1111
3de804f1e9
Merge pull request #6485
7a8c1ee wallet2: fix subaddress expansion when receiving monero (moneromooo-monero)
2020-05-06 00:31:51 -05:00
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