dsc/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Releases Wiki Activity
10,784 Commits 8 Branches 0 Tags 320 MiB
cc-e
Commit Graph

7698 Commits

Author SHA1 Message Date
Crypto City
d72beedc33 game: add "ignore influence" better 2020-06-14 23:43:30 +00:00
Crypto City
399a9aeba3 game: lock wallet while refreshing 2020-06-14 23:43:30 +00:00
Crypto City
75cc5e8b36 game: add a couple include guards 2020-06-14 23:43:30 +00:00
Crypto City
ba8d50a973 game: cast to unsigned long when using %lu in printf 2020-06-14 23:43:30 +00:00
Crypto City
056b2e45fc game: use keccak instead of rand for cloud/horizon random numbers 
Turns out rand yields ridiculous looking forest/clouds on windows
 2020-06-14 23:43:30 +00:00
Crypto City
b586c8d290 game: fix locking bug on wallet load 2020-06-14 23:43:30 +00:00
Crypto City
a198126b75 game: link against zlib 2020-06-14 23:43:30 +00:00
Crypto City
5565a26aa4 game: fix locking bug 2020-06-14 23:43:30 +00:00
Crypto City
8e7a14f33d game: fix destruction ordering bug on exit 2020-06-14 23:43:30 +00:00
Crypto City
091c17928e game: enable start mining button only when a wallet is loaded 2020-06-14 23:43:30 +00:00
Crypto City
b21d24f388 start city levels a bit higher 2020-06-14 23:43:30 +00:00
Crypto City
23c813cf45 add city specializations 2020-06-14 23:43:30 +00:00
Crypto City
2bfba55751 game: do not load data from the installed urho3d 2020-06-14 23:43:30 +00:00
Crypto City
103e227edb add chiptune music too 2020-06-14 23:43:30 +00:00
Crypto City
d5f47b578e cc: make new cities ten times cheaper 2020-06-14 23:43:30 +00:00
Crypto City
bcd0d9dea1 make this build on windows 
Thanks to syksy and iDunk for testing/debugging on windows
 2020-06-14 23:43:30 +00:00
Crypto City
acb9e0f201 add architect badge 2020-06-07 17:22:35 +00:00
Crypto City
03f31114b5 add atlas badge 2020-06-07 17:22:35 +00:00
Crypto City
f8ad8d1724 game: add music 2020-06-07 17:22:35 +00:00
Crypto City
98d41a94d6 version: bump version to 0.18.1.0 2020-06-01 13:52:00 +00:00
Crypto City
0ae6f713fb blockchain: empty builtin hashes 2020-05-31 11:51:22 +00:00
Crypto City
2a90a3df6b fixes after merge 2020-05-31 00:41:03 +00:00
Crypto City
396157b032 Merge remote-tracking branch 'origin/master' into cc 2020-05-30 18:55:11 +00:00
Crypto City
1f3603d209 game: add missing files 2020-05-30 13:44:14 +00:00
Crypto City
453f4cf9af encode accrual as a signed integer for space savings 2020-05-30 11:46:19 +00:00
Crypto City
377486bb47 bump version to 0.18.0.1 2020-05-30 10:59:23 +00:00
Crypto City
da1894dbbf bump version to 0.18.0.0 2020-05-29 23:48:32 +00:00
Crypto City
5eb8dac1fa add new sandstone wall material 2020-05-29 23:48:32 +00:00
Crypto City
66e3a902b4 game: fix asserts in options dialog 2020-05-29 23:48:32 +00:00
Crypto City
bcda16b1ad game: fix spammy method hiding warning 2020-05-29 23:20:51 +00:00
Crypto City
9c352eb8f1 game: remove unused field 2020-05-29 23:20:51 +00:00
Crypto City
dd42a67f99 remove a couple pessimizing std::move 2020-05-29 23:20:51 +00:00
Crypto City
5c5f2f0aa0 add a few missing override 2020-05-29 23:20:51 +00:00
Crypto City
45c006b63b fix a couple class/struct mismatch 2020-05-29 23:20:51 +00:00
Crypto City
81e8a19880 remove unused/unneeded captures 2020-05-29 23:20:51 +00:00
Crypto City
bc21350d81 cc: fix operator precedence 2020-05-29 23:20:51 +00:00
Crypto City
d0eb30afe5 cc: fix bitise op 2020-05-29 23:20:51 +00:00
Crypto City
7ee418270e game: fix assert when closing the palette dialog 2020-05-29 23:20:51 +00:00
Crypto City
2098b31d0a db_lmdb: fix leaks 2020-05-29 23:20:51 +00:00
Crypto City
8d74dd747a game: build with optimizations again 2020-05-29 23:20:50 +00:00
Crypto City
7ad4e2dc78 tx_pool: remove txes when the parentage chain is too long 2020-05-29 23:20:50 +00:00
Crypto City
b9c69cf918 update blockchain_prune to handle cc tables 2020-05-29 23:20:50 +00:00
Crypto City
adb611acd5 cc: decrease military buildings stone requirements 2020-05-29 23:20:50 +00:00
Crypto City
c22e54b850 unlock_time is now valid only for coinbase txes 2020-05-29 23:20:50 +00:00
Crypto City
72796a1cc0 game: keep horizon trees on the ground when moving up/down 2020-05-29 23:20:50 +00:00
Crypto City
267b2ad975 game: thinner columns for scores with low range 2020-05-29 23:20:50 +00:00
Crypto City
b3e066d27f game: improve node section with sync ratio and hash rate 2020-05-29 23:20:50 +00:00
Crypto City
3caac66292 cc: some discovery patent time tweaks 2020-05-29 23:20:50 +00:00
Crypto City
dd15eb8d6c cc: quantize tax a bit 2020-05-29 23:20:50 +00:00
Crypto City
2e2b08830b blockchain: change block 1 tag 2020-05-29 23:20:50 +00:00
Crypto City
da975c6c35 game: add daemon start/stop mining from the game 2020-05-29 23:20:50 +00:00
Crypto City
637f5e7c3a game: hide "ignore influence" debug helper widget 2020-05-29 23:20:50 +00:00
Crypto City
3b752a31fb cc: add insulation discoveries 2020-05-29 23:20:50 +00:00
Crypto City
e7c7ee6f7f cc: add moose hide clothing discoveries 2020-05-29 23:20:50 +00:00
Crypto City
e5b55f7251 cc: decrease the higher thresholds for number of discoveries badge 2020-05-29 23:20:50 +00:00
Crypto City
b69cd8099c cc: add masonry discoveries 2020-05-29 23:20:50 +00:00
Crypto City
9e36486b8f add hunting tactics discoveries 2020-05-29 23:20:50 +00:00
Crypto City
81fce3a543 time chat txes out at 24 hours, not 12 2020-05-29 23:20:50 +00:00
Crypto City
5c13ec049a game: move the compass to the left, where it's not under the panel 2020-05-29 23:20:50 +00:00
Crypto City
215f524015 game: lighting tweaks 
Starker difference between fully lit and ambient, and draw the horizon
trees unlit, but change their material colour based on overall light
(it'll be faster, and gets rid of the occasional white tint)
 2020-05-29 23:20:50 +00:00
Crypto City
8508f1f6ef cc: tweak building role unlocking levels 2020-05-29 23:20:50 +00:00
Crypto City
6e5a79ccb8 game: make a separate dialog for special event help 2020-05-29 23:20:50 +00:00
Crypto City
66f13fe3ec firefighting service is free for the firefighting building owner 2020-05-29 23:20:50 +00:00
Crypto City
3dd83d049c game: fix a few niggles with the firefighting dialog 2020-05-29 23:20:50 +00:00
Crypto City
b18e1d6569 cc: fix firefighting fee destination 2020-05-29 23:20:50 +00:00
Crypto City
b592cc8c11 game: fix crash when flags go 2020-05-29 23:20:50 +00:00
Crypto City
9f6ba5916b rpc: fix last update height in snapshot 2020-05-29 23:20:50 +00:00
Crypto City
e095385f04 game: add confirmation messages for demolish and destroy flag 2020-05-29 23:20:50 +00:00
Crypto City
6a545eb294 cc: add ghost town badge 2020-05-29 23:20:50 +00:00
Crypto City
b7e71a4645 game: fix horizon positioning inaccuracies 2020-05-29 23:20:50 +00:00
Crypto City
74537cdc2e More city levels, and space less closer 2020-05-29 23:20:50 +00:00
Crypto City
e98aa10308 cc: don't give an attribute point before levelling up 2020-05-29 23:20:50 +00:00
Crypto City
828bb1ba41 allow destroying a flag 2020-05-29 23:20:50 +00:00
Crypto City
acb1fc6d89 game: dirty flags when processing trade commands 
They might change owner so we need to recreate the influence models
 2020-05-29 23:20:50 +00:00
Crypto City
a5e1da3070 daemon: print flag name in cc_get_flag 2020-05-29 23:20:50 +00:00
Crypto City
d38179d8c5 game: fix missing vegetation in new buildings 2020-05-29 23:20:50 +00:00
Crypto City
f1e4f6ef0e game: fix first land purchase discount when not invited 2020-05-29 23:20:50 +00:00
Crypto City
0cc8c0c675 game balance updates after all the recent changes 2020-05-29 23:20:50 +00:00
Crypto City
6ba7f88b97 switch to lunar inspired calendar 2020-05-29 23:20:50 +00:00
Crypto City
7820ec6200 game: load TB data via the urho3d resource system 2020-05-29 23:20:50 +00:00
Crypto City
d2949eb3ff Change the address prefix from CC to TF 2020-05-29 23:20:49 +00:00
Crypto City
1e96286164 only mine txes that are valid as a set 2020-05-29 23:20:49 +00:00
Crypto City
81bb7a114d tx_pool: better error reporting when a command conflicts 2020-05-29 23:20:49 +00:00
Crypto City
2c0ed00c21 game: remove leftover hardcoded 8 tile scale 2020-05-29 23:20:49 +00:00
Crypto City
ce07516176 mine only one tx per account per block 2020-05-29 23:20:49 +00:00
Crypto City
28fd762094 tx_pool: conflict multiple redemption of the same invitation 2020-05-29 23:20:49 +00:00
Crypto City
69eba00a96 tx_pool: only accept a public key once when creating accounts 2020-05-29 23:20:49 +00:00
Crypto City
ec5b91992f game: queued commands now display only the current player's commands 2020-05-29 23:20:49 +00:00
Crypto City
7bdecd48fe game: file selector focus improvements 2020-05-29 23:20:49 +00:00
Crypto City
cfcae9094d claim cost in firefighting, flag resizing and city founding 2020-05-29 23:20:49 +00:00
Crypto City
282ea69c74 cc: add some more coloured block variants 2020-05-29 23:20:49 +00:00
Crypto City
9e35324658 game: add a spanning columns render mode 2020-05-29 23:20:49 +00:00
Crypto City
2f77fc4051 invitations 2020-05-29 23:20:49 +00:00
Crypto City
9012ee2aa7 game: display higher level badges first in leaderboards tooltip 2020-05-29 23:20:49 +00:00
Crypto City
4ebfb78787 game: add a leaderboard for weekly level progress 2020-05-29 23:20:49 +00:00
Crypto City
6b69c8c03f cc: bump streak badge thresholds slightly 2020-05-29 23:20:49 +00:00
Crypto City
3b74fd0962 Add some more discoveries 2020-05-29 23:20:49 +00:00
Crypto City
c12e950d2b cc: add foundations discoveries 2020-05-29 23:20:49 +00:00
Crypto City
d1a803e97c game: include patent time in research dialog 2020-05-29 23:20:49 +00:00
Crypto City
fe4e7e9f39 cc: decrease city level progression difficulty 2020-05-29 23:20:49 +00:00
Crypto City
dc62bd7bdc game: do not use empty names 2020-05-29 23:20:49 +00:00
Crypto City
01d399fd11 cc: award streak badge after all others, or we could miss some case 2020-05-29 23:20:49 +00:00
Crypto City
9e07e19cbf add wrecker badge (number of buildings demolished) 2020-05-29 23:20:49 +00:00
Crypto City
a76e62f22c core: sign create_aaccount commands too 
with the new pubkey, to prove we know it
 2020-05-29 23:20:49 +00:00
Crypto City
97c7c6c19e bump game payouts a bit 2020-05-29 23:20:49 +00:00
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
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
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
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
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
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