Commit Graph

12848 Commits

Author SHA1 Message Date
luigi1111
6d7bb2b8ba
Merge pull request #7643
19ed7ab Test: Enable coverage for external repositories (mj-xmr)
2021-04-22 01:34:26 -04:00
luigi1111
3c1ea110d9
Merge pull request #7016
dc81e23 Split epee/string_tools.h and encapsulate boost::lexical_cast (mj-xmr)
2021-04-22 01:32:32 -04:00
Crypto City
956e578f9a game: fix model placement adding rather than replacing 2021-04-21 13:56:25 +00:00
Crypto City
96f7fc8677 game: better build/place ui 2021-04-21 13:56:25 +00:00
Crypto City
9854de369f game: add T keybinding to open the trade screen 2021-04-21 13:56:25 +00:00
Crypto City
e30e5f744b game: fix travel to city screen not be quite large enough to fully display 2021-04-21 13:56:25 +00:00
Crypto City
1306ed72c1 cc: increase workforce influence 2021-04-21 13:56:25 +00:00
Crypto City
f0e804ec13 game: images in tutorials 2021-04-21 13:56:25 +00:00
Crypto City
d9020bf982 manual: update fire documentation 2021-04-21 13:56:25 +00:00
Crypto City
867cd66ccc swap affluent residential and military unlock levels
fire also got brought forward to match new military unlock level
2021-04-21 13:56:25 +00:00
Crypto City
0ad5f3d9e4 game: multi page tutorial windows 2021-04-21 13:56:25 +00:00
Crypto City
a6b5210c2f increase tax increase min radius with city level 2021-04-21 13:56:25 +00:00
Crypto City
1c01ce668e cc: buff architectural flair specialization 2021-04-20 12:04:39 +00:00
Crypto City
d5709e8967 cc: buff sprawling specialization 2021-04-20 12:04:39 +00:00
Crypto City
604fddee32 game: new simple in game tutorial system 2021-04-19 17:13:29 +00:00
Crypto City
241b1edf69 add cartography discoveries, and tweak some discovery costs 2021-04-19 10:45:02 +00:00
Crypto City
d05d41dc9c game: fit help windows to their content's size 2021-04-18 20:46:29 +00:00
Crypto City
3d779348c5 game: add neutral terrain material - helps see flag markers 2021-04-18 19:31:09 +00:00
Crypto City
79600d23e9 ipfs: do not regenerate a SSL key every connection 2021-04-18 19:23:47 +00:00
Crypto City
f1704cf629 moose drawn water tank now adds 50% firefighting range 2021-04-18 19:23:47 +00:00
Crypto City
6ea3707cc3 bump firefighting range 2021-04-18 19:23:47 +00:00
Crypto City
0c633eef03 game: flash flag area markers when on fire 2021-04-18 19:23:47 +00:00
Crypto City
b0e4ee8621 rpc: fix rejected tx reason flag mixup 2021-04-18 19:23:47 +00:00
Crypto City
676a1ed717 wallet2: add missing failed tx reason strings 2021-04-18 19:23:47 +00:00
Crypto City
ba9e0ea31e cc: randomize fire damage to make it a bit more interesting 2021-04-18 19:23:47 +00:00
Crypto City
2232acaffe game: add firefighting range in building settings screen for military buildings 2021-04-18 19:23:47 +00:00
Crypto City
182c585e06 rpc: fix fire_state not being returned in cc_get_flag 2021-04-18 19:23:47 +00:00
Crypto City
aefb95a88b new "playing with fire" badge 2021-04-18 19:23:47 +00:00
Crypto City
1b9c448a54 cc: print actual flag names in fight fire events 2021-04-17 19:06:31 +00:00
Crypto City
5dfd50caf8 cc: fix fight_fire command balance updates 2021-04-17 19:06:31 +00:00
Crypto City
4c9d9861c7 ipfs_proxy: set pin time based on size 2021-04-17 19:06:31 +00:00
Crypto City
90e6f015a4 game: fix gold error creating new item group 2021-04-17 19:06:31 +00:00
Crypto City
150869b9eb game: print owned labour in hunt dialog, disable buttons if too low 2021-04-17 19:06:31 +00:00
Crypto City
4eb3259592 game: add "fight fire" button next to the "burning" note in the flag section 2021-04-17 19:06:31 +00:00
Crypto City
e3b3247e19 cc: deactivate flag that catch fire at once
Also better fire propagation
2021-04-17 19:06:31 +00:00
mj-xmr
dc81e23e60 Split epee/string_tools.h and encapsulate boost::lexical_cast 2021-04-16 20:54:20 +02:00
luigi1111
e45619e61e Revert "Merge pull request #7136"
This reverts commit 63c7ca07fb, reversing
changes made to 2218e23e84.
2021-04-16 13:52:44 -05:00
luigi1111
d544fd0f52
Merge pull request #7653
73d3b00 unit_tests: fix boost 1.58 compatibility (anon)
2021-04-16 12:52:42 -05:00
luigi1111
257e7432cb
Merge pull request #7652
02f4954 gitian: remove osslsigncode (selsta)
2021-04-16 12:52:05 -05:00
luigi1111
13418dbb98
Merge pull request #7648
25e8254 expose set_offline to wallet api (benevanoff)
2021-04-16 12:51:22 -05:00
luigi1111
fa6a6c5cca
Merge pull request #7642
82de000 Add base Monero address which is needed to view wallet (Justin Ehrenhofer)
2021-04-16 12:50:42 -05:00
luigi1111
4ca80bd312
Merge pull request #7641
a16328e easylogging++: in place log sanitization (moneromooo-monero)
2021-04-16 12:49:00 -05:00
luigi1111
288e5ec350
Merge pull request #7384
494f2e1 rpc: fix some error return codes/status (moneromooo-monero)
2021-04-16 12:48:05 -05:00
luigi1111
7cf47d754c
Merge pull request #7258
1d1c430 p2p: fix cubic selection in filtered peer list (moneromooo)
2021-04-16 12:46:34 -05:00
luigi1111
63c7ca07fb
Merge pull request #7136
23aae55 Remove payload copy in all outgoing p2p messages (Lee Clagett)
2021-04-16 12:45:30 -05:00
luigi1111
2218e23e84
Merge pull request #7002
673c6d2 Reduce compilation time of epee/portable_storage_template_helper.h (mj-xmr)
2021-04-16 12:43:42 -05:00
Crypto City
ad9076315e game: fix special event not being red colored when the flag is inactive 2021-04-16 16:25:19 +00:00
Crypto City
1af6a92b50 cc: fix subsidy log 2021-04-16 16:24:51 +00:00
Crypto City
c844683731 rpc: fix snapshot missing the most recent building 2021-04-16 12:16:32 +00:00
Crypto City
73a335f581 cc: decrease military building requirements 2021-04-16 12:16:16 +00:00