Commit Graph

15099 Commits

Author SHA1 Message Date
Crypto City
fd71529c3b game: fix nameless buildings not being refered to as "flag N" 2021-08-13 23:37:18 +00:00
Crypto City
ac6c36043b game: do not show view ipfs button for ignored items 2021-08-13 19:22:14 +00:00
Crypto City
f53332f99c scripts can now add a storyline event string, shown in news 2021-08-13 17:42:23 +00:00
Crypto City
c1a1157d40 game: include new storyline scripts in news 2021-08-13 16:47:07 +00:00
Crypto City
cd02e54998 game: fix "is this chat line for me" detection 2021-08-13 15:53:03 +00:00
Crypto City
67ec4b41a7 game: fix "out of X in Y" using current (not selected) player inventory 2021-08-13 15:38:56 +00:00
Crypto City
188ae3f271 game: enlarge min cloud size 2021-08-13 14:06:08 +00:00
Crypto City
d0b7882c6d cc: make gemstones a bit easier to find with flag area 2021-08-13 13:49:50 +00:00
koe
426dbf434b fix median overflow bug 2021-08-13 06:57:27 -05:00
Crypto City
945d347610 game: fix missing clouds 2021-08-13 10:56:34 +00:00
Crypto City
fc7535d47f urho3d: #include <stdint.h> for windows 2021-08-13 00:02:33 +00:00
Crypto City
072b718bf5 game: fix crash travelling to another city 2021-08-12 23:55:12 +00:00
Crypto City
3276c0d568 game: convert textures to DDS format 2021-08-12 18:26:16 +00:00
mj-xmr
ce0a2ce479
CI: use runner.os instead of OS labels 2021-08-12 15:48:55 +02:00
Crypto City
364e20464d game: add influence terrain modes 2021-08-12 13:15:35 +00:00
Crypto City
6fb0af6482 game: early out adding flag areas when possible 2021-08-12 11:01:36 +00:00
Crypto City
1ad13c63b9 add more vegetation materials 2021-08-12 11:01:36 +00:00
Crypto City
71fd61cd37 game: fix crash placing blocks 2021-08-12 11:01:36 +00:00
Crypto City
ae51ddaac7 game: speed up terrain generation a bit 2021-08-12 11:01:36 +00:00
Crypto City
52318c2cf1 game: fix terrain blur indexing 2021-08-12 11:01:36 +00:00
Crypto City
c42a9770be game: use 16 bit single compoment image for heightmap
saves memory, and possibly a bit of time
2021-08-12 11:01:36 +00:00
Crypto City
5db3e646af make potential/height functions safer 2021-08-12 11:01:36 +00:00
Crypto City
7827f70905 game: add terrain subsampling to options 2021-08-12 11:01:36 +00:00
Crypto City
5b50f4ee74 game: subsample terrain for memory and speed gains 2021-08-12 11:01:35 +00:00
Crypto City
f20c2e126b urho3d: merge tracy profiler (disabled) 2021-08-12 11:01:35 +00:00
Crypto City
2c75c589c2 game: move selection highlight to the fragment program
Should be faster, avoids extra geometry and fixes Z fighting
on uneven terrain
2021-08-12 11:01:35 +00:00
Crypto City
c5ab837276 game: log texture and their sizes (disabled) 2021-08-12 11:01:35 +00:00
Crypto City
5206ea2ec3 fix hunts conflicting with each other 2021-08-12 11:01:35 +00:00
Crypto City
b5f7cd94af functional_tests: fix firefighting test 2021-08-12 11:01:35 +00:00
Crypto City
d26f8fe73b game: decrease memory usage 2021-08-12 11:01:35 +00:00
Crypto City
42383b5c45 game: cancel wallet ops on exit 2021-08-12 11:01:35 +00:00
Crypto City
fd9a94543a game: fix loading icon leak 2021-08-12 11:01:35 +00:00
Crypto City
2634190f19 tb: fix crash in previous commit 2021-08-12 11:01:35 +00:00
Crypto City
4212585cf4 game: add city info in the travel to city screen 2021-08-12 11:01:35 +00:00
Crypto City
f593cdeb41 tx_pool: move various errors to L1, to match existing ones 2021-08-12 11:01:35 +00:00
Crypto City
6f7bf6069c game: add city foundation to news screen, tweak other news icons 2021-08-12 11:01:35 +00:00
Crypto City
ee5110249e bump sprawling city specialization to 10% 2021-08-12 11:01:35 +00:00
Crypto City
400c1a099e cc: fix sprawling cty specialization from 20% to 5% 2021-08-12 11:01:35 +00:00
Crypto City
f85253beb2 cc: do not count collectible coins for item collector badge 2021-08-12 11:01:35 +00:00
Crypto City
dd065998d3 game: speedup history filtering 2021-08-12 11:01:35 +00:00
Crypto City
bee7630bdb game: fix crashes in the toast notifications 2021-08-12 11:01:35 +00:00
Crypto City
fb9d84b807 game: remove player name in player history screen
it's always the same and unnecessarily takes up space
2021-08-12 11:01:35 +00:00
Crypto City
33ec88a3aa game: add all event info to the export file 2021-08-12 11:01:35 +00:00
Crypto City
ffb1c272d0 game: make trade txes short lived if they're fully matched 2021-08-12 11:01:35 +00:00
Crypto City
1fd1697750 game: fix harvesting inactive flags 2021-08-12 11:01:35 +00:00
Crypto City
922e732250 game: fix selling land/cities 2021-08-12 11:01:35 +00:00
Crypto City
1dec7c7954 tx_pool: remove txes with commands with invalid signatures
even if kept_by_block, since that'll be moot due to locking
2021-08-12 11:01:35 +00:00
Crypto City
88c2c3d68a do not consider commands with bad signatures in chat/pending
These are probably from another chain, or malicious, though
they could be due to a reorg
2021-08-12 11:01:35 +00:00
luigi1111
82149bfe44
Merge pull request #7818
9c8e3e8 unit_tests: fix broken tests (anon)
2021-08-11 22:40:13 -04:00
luigi1111
460fd4c80a
Merge pull request #7816
29296d5 cmake: fix double build (selsta)
2021-08-11 22:39:06 -04:00