Commit Graph

5164 Commits

Author SHA1 Message Date
Yair Morgenstern
413c0b077b Fixed terrace farm's 'fresh water' bonus - kudos @1.7.4 2021-05-09 00:28:32 +03:00
Yair Morgenstern
0f0de8a221 3.14.7 2021-05-08 23:54:29 +03:00
Yair Morgenstern
8b767a10d0
Translations update (#3899)
* Update Japanese.properties (#3896)

* Update German.properties (#3894)

* Update Japanese.properties (#3880)

translation of untranslated parts and retouch

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ko-chan-28 <70871262+ko-chan-28@users.noreply.github.com>
2021-05-08 23:48:15 +03:00
Yair Morgenstern
b0f3d30d79 Fixed double consumption of resources for "Comsumes [amount] [resource]" unique 2021-05-08 23:35:52 +03:00
Yair Morgenstern
60fb38dfc3 New SDK versions, gradle properties, and androidx - this seems to solve the previous problems! 2021-05-08 23:24:57 +03:00
Yair Morgenstern
619d02d2b6 Hopefully will solve the github action fails 2021-05-08 22:54:11 +03:00
Yair Morgenstern
3a22a1127e Gradle upgrade 2021-05-07 13:18:48 +03:00
Yair Morgenstern
fca5b5075e Spaces 2021-05-07 12:39:44 +03:00
Yair Morgenstern
6fbb223aa5 Resolved #3888 - added template lines for mod management screen 2021-05-07 12:20:10 +03:00
Yair Morgenstern
7e7f72ed2f Tradition works again 2021-05-07 12:03:13 +03:00
Alexander Korolyov
453f5588ac
Custom map size (#2876)
* Adding custom map sizes. Initial commit

* Custom map sizes UI update

* Custom map size with rectangular shape

* Added compatibility with older Maps and Game saves

* Fixed build errors and added warning messages

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-05-06 18:39:28 +03:00
Yair Morgenstern
b8f9b99bd1 Fixed Civilopedia crash 2021-05-06 18:37:12 +03:00
Yair Morgenstern
db87c04017 Linting 2021-05-06 18:02:27 +03:00
Yair Morgenstern
dbc3bcb5a1 Fixed 'dead code' that got in on one of the PRs 2021-05-06 17:53:06 +03:00
SomeTroglodyte
7a8bf68885
Option Screen choices visible on minimap toggle buttons immediately - ugly (#3881) 2021-05-06 16:09:19 +03:00
SomeTroglodyte
7c34c5f440
Resource revealed notification can point to all reveals (#3879)
* May resolve #3862: Resource revealed notification can point to all reveals

* Resource revealed notification can point to all reveals - wording
2021-05-06 16:08:35 +03:00
SomeTroglodyte
d11cf286b4
Worldscreen key bindings (#3875)
* WorldScreen most Civ5 key bindings

* WorldScreen keys - Overview button key hint

* WorldScreen most Civ5 key bindings - v2

* WorldScreen most Civ5 key bindings - civilopedia

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-05-06 16:04:24 +03:00
SomeTroglodyte
c622a3d9fd
City overview force consistent row height (#3861)
* City overview force consistent row height

* City overview force consistent row height - simpler
2021-05-06 15:48:58 +03:00
Yair Morgenstern
7f937e9784 I think we've removed all removable references to isHill() 2021-05-06 15:31:09 +03:00
Yair Morgenstern
e8d4767b6d Height of terrains is now defined by a unique 2021-05-06 15:27:30 +03:00
Yair Morgenstern
59a419c1c9 TileInfo.hasUnique() 2021-05-06 15:13:15 +03:00
Yair Morgenstern
b7383bb959 Refixed denunciation effects - sorry Chek! 2021-05-06 14:40:08 +03:00
Yair Morgenstern
c601f7f9ec Genericized "No Maintenance costs for improvements in [] tiles" 2021-05-06 14:34:40 +03:00
Yair Morgenstern
34bed66198 Genericized hill's "extra sight for land units" to a unique 2021-05-06 14:28:54 +03:00
Yair Morgenstern
8d2629088f Hill city-strength bonus genericized 2021-05-06 14:27:12 +03:00
Yair Morgenstern
7686b1ee4a Simplified rough terrain check 2021-05-06 12:35:28 +03:00
Yair Morgenstern
4cb5a8c912 3.14.6-patch2 2021-05-06 11:47:41 +03:00
Yair Morgenstern
08492124ce 3.14.6-patch1 2021-05-05 22:07:12 +03:00
Yair Morgenstern
09de08764e Revert "Option Screen choices visible on minimap toggle buttons immediately -… (#3858)"
This reverts commit ba9a90c680.
2021-05-05 22:02:31 +03:00
Yair Morgenstern
ec33c43c3f Show tech progress for next turn in tech button 2021-05-05 21:49:52 +03:00
Yair Morgenstern
a6d0973324 3.14.6 2021-05-05 20:46:40 +03:00
Yair Morgenstern
c1908d0526
Translations update (#3878)
* Update German.properties (#3877)

* Update Spanish.properties (#3873)

* Changed a few minor fixes, added a lot of promotion translations (#3843)

* Update Malay.properties (#3595)

Yayay

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Should remove test fail

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: madbada99 <79025962+madbada99@users.noreply.github.com>
2021-05-05 18:59:40 +03:00
Yair Morgenstern
738bc6caac Fixed tests 2021-05-05 18:45:48 +03:00
Yair Morgenstern
fb93e3f7ee Hills are converted to terrains that surround them 2021-05-05 18:00:07 +03:00
GGGuenni
b35d5d3121
changed hill to terrain Feature (#3707)
* changed hill to terrain Feature

* Update Terrains.json

* Update Terrains.json

* Snow with capital S

* Fixed tests failing

* Added check for ruleset supports hill as terrain feature
2021-05-05 17:48:47 +03:00
Yair Morgenstern
d864ed719f Added decay to diplomatic denunciation - kudos @Chek 2021-05-05 16:23:15 +03:00
Yair Morgenstern
1b801e0bba Fixed denouncement effects on third-party civs, and trade evaluation for enemy trades - kudos @Chek 2021-05-05 14:32:04 +03:00
SomeTroglodyte
d679632523
Bug: turnsLabel accumulates touchFocuses endlessly (#3874)
* Bug: turnsLabel accumulates touchFocuses endlessly

* May resolve #3862: Resource revealed notification can point to all reveals - better
2021-05-04 22:14:16 +03:00
SomeTroglodyte
a25777f380
Overview screen category decoration + key hint (#3872)
* OverviewScreen: Category buttons decorated / key indicator

* OverviewScreen: Category buttons decorated / key indicator: Images
2021-05-04 12:10:34 +03:00
SomeTroglodyte
f2a08719e2
ImprovementPicker: R key 'moves' from Road to Railroad patch (#3871) 2021-05-04 11:59:08 +03:00
SomeTroglodyte
ba9a90c680
Option Screen choices visible on minimap toggle buttons immediately -… (#3858)
* Option Screen choices visible on minimap toggle buttons immediately - using lambdas

* Option Screen choices visible on minimap toggle buttons immediately - patch1
2021-05-03 16:26:08 +03:00
SomeTroglodyte
79c6ff0e3e
Fix cancel improvement order (#3866) 2021-05-03 15:58:38 +03:00
Yair Morgenstern
d38692fad3 resolved #3869 but no one really cares 2021-05-02 22:14:56 +03:00
Yair Morgenstern
8160d76f97 Resolved #3865 - Kudos @SomeTroglodyte 2021-05-02 21:38:38 +03:00
Yair Morgenstern
f2a25b26ab Tilegroup accepts tile config also for *only the terrain part*, making all the extra "hill = grassland+hill" in the tileconfig json unnecessary!
@ravignir
2021-05-02 21:07:32 +03:00
Yair Morgenstern
204791c4b8 Great general unique no longer restricted to civilian units 2021-05-02 09:33:08 +03:00
Yair Morgenstern
ba1f647a8e Changed loading of tile set configs to work also on PC, from within a JAR file 2021-05-01 23:59:29 +03:00
Yair Morgenstern
94c0995b23 3.14.5 2021-05-01 23:05:30 +03:00
Yair Morgenstern
73d35b28b7
Translations update (#3860)
* Update german translation (#3834)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Spanish.properties (#3830)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-05-01 22:45:22 +03:00
SomeTroglodyte
7eb4250335
City expansion notification points to acquired tile (#3859) 2021-05-01 22:30:23 +03:00