Commit Graph

5300 Commits

Author SHA1 Message Date
SomeTroglodyte
66f07347e0
Keyboard navigation to switch panes within overview screen (#3822) 2021-04-28 21:40:15 +03:00
Yair Morgenstern
5b7170bf9f Unified stat summing in city overview table 2021-04-27 19:02:14 +03:00
SomeTroglodyte
3da02b18b6
Some visual improvements for the Mod Manager Screen (#3841) 2021-04-27 12:06:05 +03:00
Yair Morgenstern
8dc748f919 Resolved #3524 - Happiness in city overview now calculated correctly
(also simplified sorting etc. and added option for Faith)
2021-04-27 00:55:39 +03:00
Yair Morgenstern
4f802e813a Added Happiness (and Faith for Religion mods) to stats list - #3524 2021-04-27 00:37:51 +03:00
Yair Morgenstern
6afc5560f2 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-27 00:16:01 +03:00
Yair Morgenstern
bb34659d9c Resolved #3837 - Harad -> Harald in Denmark greeting 2021-04-27 00:15:47 +03:00
SomeTroglodyte
089a415da9
For issue 3838: Bigger target on "next city" button (#3840) 2021-04-27 00:05:59 +03:00
GGGuenni
29dfa338ba
Added fogOfWarColor and unexploredTileColor (#3833)
* Added fogOfWarColor and unexploredTileColor

* update updateConfig function
2021-04-26 21:16:18 +03:00
Yair Morgenstern
86fafd59db 3.14.1-patch1 2021-04-24 22:10:36 +03:00
Yair Morgenstern
7ddbac1f07 Made datetime in modscreen parsable for Java 7 phones
And now date display is localized too which is nice
2021-04-23 15:57:39 +03:00
Yair Morgenstern
fb4a091635 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-23 15:29:01 +03:00
lishaoxia1985
adf32dcfe2
getResearchAgreementCost() don't need variable, make some method private (#3832) 2021-04-22 16:59:15 +03:00
GGGuenni
cb9507c76d
Fixed internal TileSetConfigs not getting loaded on android (#3831) 2021-04-22 11:00:35 +03:00
SomeTroglodyte
600f262cca
Fixes #3729 "Android crash on loading from custom location" (#3828) 2021-04-21 23:42:45 +03:00
Yair Morgenstern
55ef131fb2 3.14.3 2021-04-21 22:12:46 +03:00
Yair Morgenstern
2b6c9e7ec0
Translations update (#3826)
* Chinese translation update (#3825)

* Update Czech.properties (#3815)

* Update Czech.properties

Note for czech translators:
Zakulacený svět zní divně, ale nevím, jak jinak to přeložit. Budu rád za nápady.

* Update Czech.properties

* Update Italian.properties (#3812)

Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-04-21 21:59:13 +03:00
SomeTroglodyte
722772b08e
Solves #3802 Mod translations don't appear in new game screen (#3823)
* Solves #3802 Mod translations don't appear in new game screen

* Rehomed translationActiveMods to Translations
2021-04-21 21:45:58 +03:00
Yair Morgenstern
6ffbce4ee1 Added "Updated!" next to updated mods in mod management screen 2021-04-21 21:22:55 +03:00
Yair Morgenstern
146a806b08 Added 'last updated time' to mod description 2021-04-21 20:53:14 +03:00
Yair Morgenstern
72f63b7ba1 Added "open Github page of mod" in mod management screen 2021-04-21 20:30:25 +03:00
Yair Morgenstern
0c80a31c9a Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-20 22:18:55 +03:00
Yair Morgenstern
d674be2234 Can no longer enter diplomacy screen for self, defeated and spectator civs through diplomacy overview screen 2021-04-20 22:18:11 +03:00
SomeTroglodyte
615fa78101
Modify choice of city to own the tiles acquired by a citadel - v2 (#3819) 2021-04-19 23:01:47 +03:00
Yair Morgenstern
b19c548c24
Update buildAndDeploy.yml
Linux 32 bit support is removed in 1.10.0 versio of LibGDX - see https://libgdx.com/news/2021/04/gdx-1-10
2021-04-19 22:12:02 +03:00
Yair Morgenstern
9b4333a5b6 Version increment 2021-04-19 21:51:38 +03:00
Yair Morgenstern
57fdff6897 Gradle changes towards LibGDX version increment 2021-04-19 21:41:47 +03:00
SomeTroglodyte
e2c6ae450d
Make city center unpillagable using a unique (#3818) 2021-04-19 20:18:20 +03:00
Yair Morgenstern
1eb3629c09 Resolved #3817 - don't display resource requirements from uniques twice 2021-04-19 19:29:21 +03:00
SpacedOutChicken
8d4aa955b3
Parameterize civ-wide sight bonus (#3809)
* Make science a possible reward for killing units

* no message

* Revert "Make science a possible reward for killing units"

This reverts commit 296b8fab54.
2021-04-18 22:12:47 +03:00
Yair Morgenstern
e270b017d4 3.14.2 2021-04-18 21:56:18 +03:00
Yair Morgenstern
c03b139b4d
Translations update (#3811)
* Update German.properties (#3808)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* "[] from every []" can accomodate specialist names

* Fixed - 'Water units' now can be capitalized, as they should be.

* Added warning for world wrap for Android - I'm seeing a lot of ANRs for this, but it's not something I think I can solve

* Update German.properties

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

* Update Polish.properties (#3803)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* Update Polish.properties

* Update Polish.properties

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

* Update Italian.properties (#3797)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* Update Italian.properties

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

* Spanish - Added Required Translations (#3796)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* Required Translations Added

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

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: GEEZET1 <67857834+GEEZET1@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: another-sapiens <80379945+another-sapiens@users.noreply.github.com>
2021-04-18 21:44:39 +03:00
Yair Morgenstern
e0b1cce74f Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-18 21:31:01 +03:00
Yair Morgenstern
11f5937cdf Revert "World wrap is publicly released!"
This reverts commit 55659657aa.
2021-04-18 21:29:37 +03:00
SomeTroglodyte
5c6e55d9f1
ExpanderTab had only one use outside its package - moved (#3805) 2021-04-18 18:50:02 +03:00
Yair Morgenstern
f518c1944f Added warning for world wrap for Android - I'm seeing a lot of ANRs for this, but it's not something I think I can solve 2021-04-17 23:27:29 +03:00
Yair Morgenstern
fc5c3d578d Fixed - 'Water units' now can be capitalized, as they should be. 2021-04-17 21:40:50 +03:00
Yair Morgenstern
6045e0d5a4 "[] from every []" can accomodate specialist names 2021-04-15 12:50:30 +03:00
Yair Morgenstern
ffd9d68bce Spanish changes by @ArchDuque-Pancake in #3787 2021-04-14 23:03:28 +03:00
Yair Morgenstern
5e1a21cd84 Fixed unitType parameters in changed unique 2021-04-14 21:57:58 +03:00
Yair Morgenstern
daab799b3a 3.14.1 2021-04-14 19:51:31 +03:00
Yair Morgenstern
172508f22e Fixed natural wonder tile location in new layering 2021-04-14 19:51:13 +03:00
Yair Morgenstern
bec5e2d43a
Translations update (#3793)
* Update French.properties (#3790)

* Translated: "[stats] on [param] tiles once [tech] is discovered"

* Translated: "City-center"

* Update Indonesian.properties (#3785)

Co-authored-by: Zakaria M <zak.mell45@gmail.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2021-04-14 19:43:51 +03:00
Yair Morgenstern
fe204e9ac0
Translations update (#3783)
* Update Italian.properties (#3779)

* Update Spanish.properties (#3778)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: jorgman1 <jorgman1@protonmail.com>

* Update German.properties (#3777)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Japanese.properties (#3776)

* Update Spanish.properties (#3782)

I have made a research, and, despite of an "arcabuz" being somewhat diferent from a musket, it´s basically the same.

* Update Russian.properties (#3792)

* Natural wonders are standalone tiles in new layering

* Can handle unique capital indicators in mods

* 'military' -> 'Military' for e.g. [Military] units, same as other unit types which are capitalized

* Differentiated between 'Land' as in 'Land unit' and 'Territory' for rankings

* Added TileSetConfigs (#3766)

* First iteration of TileSet json

* Adding json support for mods

* Renamed TilesetConfig to TileSetConfig

+ changed the config for FHex to fix the mountain natural wonder problem

* Resolved #3353 - Changed "Earn [amount]% of [param] opponent's [param2] as [stat] for kills" to "Earn [amount]% of killed [param] unit's [param2] as [stat]"

* Preparation for hill as terrain feature  (#3784)

* ensure backwards compatibility

* Added new Hill.png

* Added temp TileSetConfig to support new hill sprite

* Added missing Ancient ruins tiles

* Fixed Multiplayer bugs (#3781)

* Removed save feature from TurnChecker

* Hopefully fixed not correctly updating multiplayer games?

* Fixed "refresh list" not updating the savegame correctly

* Fixed game update when upload fails

* Revert "Fixed game update when upload fails"

This reverts commit cc9f1cf589.

* Fix Citadel not quite buildable where it should be (#3788)

* updated the Russian translation file

* Fixed typos in the Russian translation file

* Fixed [tileFilter] in Rus lang file

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: GGGuenni <leonard@eynck.de>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: jorgman1 <48908520+jorgman1@users.noreply.github.com>
Co-authored-by: jorgman1 <jorgman1@protonmail.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Maxim Logaev <51446645+turbocat2001@users.noreply.github.com>
Co-authored-by: GGGuenni <leonard@eynck.de>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
2021-04-14 19:38:23 +03:00
Yair Morgenstern
496b27d6b5 Fixed terrain error 2021-04-14 19:35:38 +03:00
Yair Morgenstern
18e15ee1d8 Converted all "Bonus vs unitType" unit uniques to "+[amount]% Strength vs [unitType]" 2021-04-14 18:59:57 +03:00
Yair Morgenstern
d825352bf4 Converted all "Bonus vs unitType" effects to "+[amount]% Strength vs [unitType]"
Open terrain and rough terrain bonuses are now generic and uniques
2021-04-14 18:52:10 +03:00
Yair Morgenstern
b312d24d4a Rough terrain specified through uniques 2021-04-14 18:32:39 +03:00
Yair Morgenstern
e424ec4a91 "+[]% combat bonus in []" -> "+[]% Strength in []" 2021-04-14 18:25:37 +03:00
Yair Morgenstern
e01859f6b9 Added "Friendly Land" and "Foreign Land" as tile filter options, instead of limiting them to unit bonuses 2021-04-14 18:22:50 +03:00