Commit Graph

397 Commits

Author SHA1 Message Date
Yair Morgenstern
6fbb223aa5 Resolved #3888 - added template lines for mod management screen 2021-05-07 12:20:10 +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
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
94c0995b23 3.14.5 2021-05-01 23:05:30 +03:00
Yair Morgenstern
9900795e02 Specify original owner when showing option to liberate city 2021-04-30 12:44:51 +03:00
Yair Morgenstern
72bf5f198d 3.14.4 2021-04-28 22:38:49 +03:00
Yair Morgenstern
14ca67ca61
Translations update (#3845)
* 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-04-28 21:40:33 +03:00
Yair Morgenstern
bb34659d9c Resolved #3837 - Harad -> Harald in Denmark greeting 2021-04-27 00:15:47 +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
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
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
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
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
0440a70a9c 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]" 2021-04-13 22:04:00 +03:00
Yair Morgenstern
881a885c14 Differentiated between 'Land' as in 'Land unit' and 'Territory' for rankings 2021-04-13 00:13:17 +03:00
Yair Morgenstern
6e9f868cb3 'military' -> 'Military' for e.g. [Military] units, same as other unit types which are capitalized 2021-04-13 00:08:35 +03:00
Yair Morgenstern
61730ca93b Translation files generation 2021-04-10 23:14:22 +03:00
Yair Morgenstern
888d5e973c
Translations update (#3768)
* Update French.properties  (#3767)

* Create French.properties

* Update French.properties

* Update French.properties

* Update German.properties (#3764)

* Update Czech.properties (#3763)

Translated some new lines and city-states' diplomacy

* Hungarian.properties (#3761)

* Update Spanish.properties (#3774)

There were a few 'translation!' messages, I didn't check the already completed text. If any help is needed please let me know. My discord name is john2342#8925

* Deleted unnecessary space before colon, update czech.properties (#3773)

* Deleted space before colon

In VictoryScreen.kt was one extra space, looking like "Spain : 35" instead of "Spain: 35"

* Update Czech.properties

Co-authored-by: Loubard Kevin <70336598+subversive-eu@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: juan234248 <77988217+juan234248@users.noreply.github.com>
2021-04-10 22:59:55 +03:00
Yair Morgenstern
bf596586c7
Translations update (#3759)
* Update German.properties (#3758)

* Update Turkish.properties (#3754)

* Update Turkish.properties

* Update Turkish.properties

Typo fix in line 3934: amout > amount

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
2021-04-04 19:30:30 +03:00
Yair Morgenstern
6e31750b55 3.13.12 2021-03-31 23:13:04 +03:00
Yair Morgenstern
dbd682fbbe
Translations update (#3751)
* Update Dutch.properties (#3750)

* Update bulgarian.properties (#3745)

* Update bulgarian.properties

Translated some of the #Required translation! rows

* Fixed error

* Update Indonesian.properties (#3744)

* Update German.properties (#3738)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#3737)

Co-authored-by: Aron de Jong <adj00@protonmail.com>
Co-authored-by: Tony <63195157+antonpetrov145@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-31 22:50:31 +03:00
Yair Morgenstern
bc5cc4e28d Added Bulgarian, by antonpetrov145! 2021-03-29 17:32:42 +03:00
Tony
751624bf41
Create Bulgarian.properties (#2365)
* Create Bulgarian.properties

This is WIP on the Bulgarian translation

* Update Bulgarian.properties

Edited with the '='

* Update Bulgarian.properties

* Update

Updated  some move values. Sorry for the long delay.

* Update Bulgarian.properties

With the help of PresleyBG

* Renamed several variables
2021-03-29 17:28:27 +03:00
Yair Morgenstern
e0d7128bc6 3.13.11 2021-03-23 23:01:00 +02:00
Yair Morgenstern
b8f1f092d6
Translations update (#3736)
* Update German.properties (#3725)

* Update German.properties

* Update German.properties

* Update Italian.properties (#3724)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-23 22:54:58 +02:00
Yair Morgenstern
cf3e517e43 3.13.10 2021-03-21 20:42:14 +02:00
Yair Morgenstern
049744c9bb
Translations update (#3723)
* Update German.properties (#3717)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Indonesian.properties (#3715)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2021-03-21 19:19:09 +02:00
Yair Morgenstern
5a5d0a980f Removed ALL color-based notifications! 2021-03-21 00:28:58 +02:00
Yair Morgenstern
87ff4c91f5 3.13.9 2021-03-18 20:59:42 +02:00
Yair Morgenstern
a49c2cc289
Translations update (#3712)
* Update Czech.properties (#3708)

- new strings
- space ship related terminology shortened and synced
- few city states transation

* Update German.properties (#3704)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#3701)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-18 19:48:05 +02:00
Yair Morgenstern
ecee6155e8 3.13.8 2021-03-15 22:14:08 +02:00
Yair Morgenstern
996f54367d
Translations update (#3698)
* Update Czech.properties (#3693)

Translated some city states' diplomacy.
P.S. What is the definition of 'radger'? I can't find it anywhere.

* Update Czech.properties (#3690)

diplomacy and cities: polynesia, siam, spain, songhai, mongolia, aztecs, inka, denmark

* Update German.properties (#3684)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
2021-03-15 22:02:12 +02:00
lishaoxia1985
d7214b7a46
Method getImprovementIcon can Setsize for all icon (#3685)
* Method getImprovementIcon can Setsize for all icon

* categoryButton doesn't change background-color if it's disabled
2021-03-15 21:00:09 +02:00
Yair Morgenstern
a37ac74fa9 'in all coastal cities' now translated 2021-03-13 22:38:53 +02:00
Yair Morgenstern
8780107ae4 3.13.7 2021-03-11 23:49:49 +02:00
Yair Morgenstern
05a36580ba Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-11 21:22:16 +02:00
Yair Morgenstern
f6e188144e
Translations update (#3683)
* Update German.properties (#3680)

* Update German.properties

* Update German.properties

* Update German.properties

* Updated Spanish translations (#3677)

* Completed Spanish translations

* UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information

This was made in order to prevent previous idle unit and next idle unit keys' positions to change depending on how big the unit info box is.

* NotificationsScroll: Made notifications dark blue with white text.

* Improved Spanish translations

* Revert "NotificationsScroll: Made notifications dark blue with white text."

This reverts commit 63b8ba2e

* Completed Spanish translations

* UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information

This was made in order to prevent previous idle unit and next idle unit keys' positions to change depending on how big the unit info box is.

* NotificationsScroll: Made notifications dark blue with white text.

* Improved Spanish translations

* Revert "NotificationsScroll: Made notifications dark blue with white text."

This reverts commit 63b8ba2e

* Revert "UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information"

This reverts commit d970632b

* Improved Spanish translations

* Update German.properties (#3676)

* Replaced ß with ss in some words.

* Update German.properties

* Update TileImprovements.json

Fixed typo

* Update German.properties

* Update German.properties

* Update German.properties (#3673)

* Update German.properties (#3672)

* Update Czech.properties (#3670)

new strings, few typos
translated ottoman, kroean, iroquois and persian diplomacy and cities

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: 71walceli <antonini2903@hotmail.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2021-03-11 21:09:58 +02:00
Yair Morgenstern
972bf2ba1c Resolved #3681 - translation fix, "in every city" -> "in all cities" 2021-03-11 21:08:48 +02:00
Yair Morgenstern
4c5d8645d6
Translations update (#3669)
* Update Czech.properties (#3666)

Fixed some translations and deleted some unnecessary text.

* Update German.properties (#3664)

* Update German translations

* Update German translations

* Update German translations

* Update German.properties

* Update German.properties

* Update Turkish.properties (#3661)

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* update German.properties (#3660)

* Update Italian.properties (#3658)

* Update Indonesian.properties (#3657)

Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: mehmetkazim0 <69713944+mehmetkazim0@users.noreply.github.com>
Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2021-03-08 22:10:03 +02:00
Yair Morgenstern
35ed8920e9 3.13.6 2021-03-07 13:04:11 +02:00
Yair Morgenstern
e2cf60d028
Translations update (#3656)
* update German.properties (#3650)

* update German.properties

* Update German.properties

add missing placeholder

* Update Czech.properties (#3641)

india diplomacy and cities
new strings

Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2021-03-07 12:57:59 +02:00
Yair Morgenstern
011c1de102 Resolved #3635 - can remove natural wonders and roads/railroads in map editor 2021-03-07 11:41:09 +02:00
lishaoxia1985
d290ca3d33
Update translation and Android studio to 4.1.2 (#3642) 2021-03-04 18:56:05 +02:00
Yair Morgenstern
153f4f98d3 3.13.5 2021-03-03 23:48:22 +02:00