mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-11 07:47:41 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,704 Commits 7 Branches 1,036 Tags 1.1 GiB
4f30d27d0b
Commit Graph

3833 Commits

Author SHA1 Message Date
Yair Morgenstern
7fe2b9e99b Resolved #8350 - unit icons no longer overlap unit action images, improved render time for unit images 2023-01-09 23:30:23 +02:00
Yair Morgenstern
8cd9bca7bf MoveTo image visible - #8350 2023-01-09 22:17:28 +02:00
vegeta1k95
0006aaef55
Modding: allow custom ResourcePortraits (#8330) 
* Modding: allow custom ResourcePortraits

* Modding: big generification of the icons/portraits mechanism

* Resolve conflict

* Fix background fallback, remove dimming of improvement icons

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-09 21:03:00 +02:00
Yair Morgenstern
506d9e65ff 4.3.19 2023-01-09 19:37:35 +02:00
Yair Morgenstern
a7b45251d4
Version rollout (#8347) 
* Bump version and create initial changelog entry

* Update Italian.properties (#8345)

* Update German translation (#8344)

* Update Catalan.properties (#8342)

* Update Korean.properties (#8341)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Brazilian_Portuguese.properties (#8340)

* Update Simplified_Chinese.properties (#8339)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
 2023-01-09 19:30:31 +02:00
letstalkaboutdune
9600a254d4
Platform Graphical Asset Update (#8343) 
* Platform Graphical Asset Update

Updated repository graphical assets to match latest versions being used on all storefronts

* Update banner.png

* Reverted GH, resized banner
 2023-01-09 19:08:46 +02:00
Yair Morgenstern
2b0bd6a5f9 Updated Unciv Android icons 2023-01-08 19:58:12 +02:00
Yair Morgenstern
f9da3204b6 Resolve #8336 - Remove 'incorrect area' code for super-old maps 2023-01-08 19:09:17 +02:00
Yair Morgenstern
37cfc12a64 4.3.18 2023-01-08 15:11:45 +02:00
Yair Morgenstern
2863143122
Version rollout (#8338) 
* Bump version and create initial changelog entry

* fix SimplifiedChinese translation (#8331)

Co-authored-by: chr56 <_>

* Fixed 'ConditionalsPlacement' with 'after' (#8319)

* Update Simplified_Chinese.properties (#8318)

* Update Simplified_Chinese.properties

* A little modification

* Update Korean.properties (#8317)

* Update Italian.properties (#8316)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-01-08 15:05:00 +02:00
Yair Morgenstern
fe6c19532a UI: Better unit table 2023-01-07 22:12:31 +02:00
Yair Morgenstern
a233cbc43a Resolve #8322 - fix Faith tutorial text 2023-01-07 21:13:15 +02:00
vegeta1k95
a5f68612ad
Better visibility for city status icons (#8329) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-07 19:27:55 +02:00
Yair Morgenstern
bdad914b87 4.3.17 2023-01-05 16:26:22 +02:00
Yair Morgenstern
52e3540936
Version rollout (#8315) 
* Bump version and create initial changelog entry

* Update German translation (#8313)

* Update Spanish.properties (#8311)

* Update Brazilian_Portuguese.properties (#8310)

* Fill in missing Ukrainian translations (#8309)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update French.properties (#8308)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2023-01-05 16:16:44 +02:00
Yattong the Mackerel
d69c645035
Fixing duplocation (#8314) 
[0516] It looks like your map can't be saved! = 
[0685] Multiplayer = 
[1155] National ability = 
[1357] Version = 
[1508] Location = 
[1599] Filter: = 
[1600] Enter search text =
 2023-01-05 15:39:05 +02:00
Yair Morgenstern
a47984dad6 4.3.16 2023-01-04 15:59:23 +02:00
Yair Morgenstern
81b08dd73f
Version rollout (#8306) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8303)

* Update Korean.properties (#8299)

* Update Korean.properties

* Update Korean.properties

* Update Brazilian_Portuguese.properties (#8292)

* Update German translation (#8290)

* Update German translation

* Update German translation

* Update Italian.properties (#8289)

* Update French.properties (#8287)

* Update Indonesian.properties (#8286)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
 2023-01-04 15:51:18 +02:00
Yattong the Mackerel
0be1794e94
Update template.properties (#8305) 2023-01-04 15:42:00 +02:00
Philip Keiter
1532216335
Add new game option to randomly select from map options. (#8271) 
* Add new game option to randomly select from map options.

* Remove unused isPortrait.

* Remove unused isPortrait.

* Make other settings collapsable when using random generated.

* Make Random Generated settings start collapsed. Make padding consistent.

* Remove colons from ExpanderTab titles.

* Append "Enabled" before random map options.

* Append missing = in template.

* DRY the world wrap warning.

* Update JavaDoc of MultiCheckboxTable.
 2023-01-03 21:56:41 +02:00
Ouaz
1c85388ee8
Translate "Sell" in city screen (#8297) 2023-01-03 00:40:34 +02:00
vegeta1k95
3b7b54aab6
Barbarian Civ icon (#8295) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-02 19:20:51 +02:00
vegeta1k95
72eb9504b8
Fixed PolicyScreen branches requirements text (#8280) 
* Fixed PolicyScreen branches requirements text

* Generify conditionals text pattern

* Remove GlobalAlert uniques from displaying in Policy descriptions

* Fix translations

* Fix freeze on "Tiny" displays

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-02 18:48:11 +02:00
Yair Morgenstern
f2ad07a96c 4.3.15 2023-01-01 16:25:29 +02:00
Yair Morgenstern
2ce16696bd
Version rollout (#8285) 
* Bump version and create initial changelog entry

* Update Korean.properties (#8284)

* Updated Brazilian_Portuguese.properties (#8275)

* Update Spanish.properties (#8270)

* Update French.properties (#8269)

* Update Italian.properties (#8267)

* Update Polish.properties (#8266)

* Fixed Polish translations

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: pyotr_p <pyotr.pietrzak@gmail.com>
 2023-01-01 16:22:34 +02:00
Yair Morgenstern
d20f8a53f8 Validate unique parameters for mods 2023-01-01 15:55:41 +02:00
letstalkaboutdune
b5a021cc16
SFX Update - Arrow, Crossbow (New), Metal Hit (#8262) 
* Arrow, Crossbow, Metal Hit sound updates

Sourced from pixabay.com
https://pixabay.com/service/license/

* Update Credits.md
 2022-12-29 23:20:33 +02:00
alexban011
0273f8a38b
added buttons for controlling music (#8256) 
* added buttons for controlling music

* translations

* checks

* added `Music` to translations
 2022-12-29 21:20:45 +02:00
Yair Morgenstern
fb62ddb711 4.3.14 2022-12-29 15:51:13 +02:00
Yair Morgenstern
deef19b5bb
Version rollout (#8265) 
* Bump version and create initial changelog entry

* Update Catalan.properties (#8264)

* Update French.properties (#8259)

* Update Korean.properties (#8254)

* Update Italian.properties (#8253)

* Update Italian.properties

* Update Italian.properties

* Update Simplified_Chinese.properties (#8245)

* Update Spanish.properties (#8244)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2022-12-29 15:46:53 +02:00
vegeta1k95
8fd561de50
Added WLTKD status icon (#8257) 
* Added WTLKD status icon

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-29 13:52:35 +02:00
CrispyXYZ
68c6c60f77
Show CrashScreen instead of quit when crash on Android (#8263) 2022-12-29 13:51:53 +02:00
vegeta1k95
be573f2b76
Big rework of City plates (#8239) 
* Big rework of City plates

* New city plates design, new status icons

* A little bit of padding for construction icon

* Better border for defence counter

* Better border for defence counter

* Solid colored icons

* Solid colored icons

* Credits

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-28 17:32:26 +02:00
Philip Keiter
37250cc65d
Add checkbox to Settings AdvancedTab to enable or disable easter eggs. (#8248) 2022-12-28 08:17:27 +02:00
Yair Morgenstern
f45d23d8d5 Revert "Demographics removed - resolves #8215" 
This reverts commit c7f5a34c04.
 2022-12-28 08:10:27 +02:00
Yair Morgenstern
e06b2be623 4.3.13 2022-12-27 22:58:24 +02:00
Yair Morgenstern
c784e13112
Version rollout (#8242) 
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#8241)

* Update French.properties (#8233)

* Create Afrikaans.properties (#8231)

* Update Simplified_Chinese.properties (#8228)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Updated Brazilian_Portuguese.properties (#8225)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update Korean.properties (#8220)

* Update Korean.properties

* Update Korean.properties

* Fix afrikaans and add icon

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: LifeCanvasDev <93025509+LifeCanvasDev@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
 2022-12-27 22:52:25 +02:00
Yair Morgenstern
c7f5a34c04 Demographics removed - resolves #8215 2022-12-27 22:33:07 +02:00
Yair Morgenstern
d1cb47054c World wrap available by default for all players 2022-12-27 22:30:27 +02:00
Yattong the Mackerel
e4264213c7
Update template.properties (#8236) 2022-12-26 17:05:25 +02:00
vegeta1k95
42a17aab5b
Corrected Civilizations colors (#8224) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-25 10:01:40 +02:00
Yair Morgenstern
0c58488e42 4.3.12 2022-12-24 20:02:11 +02:00
Yair Morgenstern
d612286d81
Version rollout (#8219) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#8217)

* Update traditional_chinese.properties (#8213)

* Update German translation (#8205)

* Update French.properties (#8204)

* Updated Brazilian_Portuguese.properties (#8201)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Italian.properties (#8199)

* Update Indonesian.properties (#8196)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
 2022-12-24 19:52:05 +02:00
itanasi
bc483e8984
G&K Neutral Tile Road Maintenance (#8138) 
* Redo

* New parameterized and actually used Road Unique

* Remove unneeded

* Update CURRENT_COMPATIBILITY_NUMBER since adding new serialization data

* Make neutralRoads for CivilizationInfo.kt Transient
 2022-12-24 19:43:37 +02:00
letstalkaboutdune
8d0acd0647
Added keyboard shortcut to toggle World Screen UI elements (#8211) 
* AbsoluteUnits - Mongolian Uniques

* Added keyboard shortcut to toggle World Screen UI elements

Ctrl+U to toggle

* Update WorldScreen.kt

* Added a pesky space

* Remove "Experimental" warning text

* Revert "Remove "Experimental" warning text"

This reverts commit 3c8456db95.
 2022-12-24 19:41:35 +02:00
alexban011
994169944a
showed unknown civs as Unknown civilization in GP and Diplomacy screens (#8184) 
* added mod topics to wiki

* fixed stats from revealing unknown civs and cityStates

* Revert "added mod topics to wiki"

This reverts commit 5528950a96.

* used knows() instead of getKnownCivs().contains()

* showed politics when you don't know the civ in GlobalPoliticsOverviewTable

* Replaced unknown civs name with `Unknown civilization` in DiplomacyScreen

* forgot to remove a couple lines

* translated the strings for the protectors

* reviews

* made function and tested translations
 2022-12-24 19:40:36 +02:00
vegeta1k95
78c4f6de68
Big rework of Policy Picker UI, added new ninepatch RoundedEdgeRectangleSmall (#8218) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-24 19:17:00 +02:00
letstalkaboutdune
1fdbea0a45
Trim Nuke SFX (#8216) 2022-12-24 18:55:21 +02:00
vegeta1k95
0aa7c0e79b
Added gradle task of Atlas texture packing for Android build (#8208) 
* Added gradle task of Atlas texture packing for Android build

* ImagePackers check also for creation date

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-23 14:49:08 +02:00
Philip Keiter
9f6aa4b90f
Add new game option: No City Razing. (#8203) 2022-12-22 07:41:08 +02:00
Yair Morgenstern
01309be510 4.3.11 2022-12-21 12:02:05 +02:00
Yair Morgenstern
3a91a99143
Version rollout (#8195) 
* Bump version and create initial changelog entry

* Update Japanese.properties (#8194)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#8190)

* Update Catalan.properties (#8183)

* Update German translation (#8181)

* Provide Ukrainian translations for the lately introduced original strings (#8177)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Korean.properties (#8176)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Updated Brazilian_Portuguese.properties (#8175)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: K0baU <63403741+K0baU@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2022-12-21 11:51:45 +02:00
vegeta1k95
2bc91f1216
Rework of City Screen: new Great People list + misc changes (#8180) 
* Rework of City Screen: new Great People list + misc changes

* Added a bit of padding

* Buildings are united under one tabs, GP font icons replaced by tinted UnitIcons

* Fix color of separators

* Big update to "Detailed stats" UI

* Rebuild pngs

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2022-12-21 11:46:35 +02:00
vegeta1k95
1346eea4ca
Huge update of Technology Picker screen UI (Civ 5), new original icons + misc changes (#8188) 
* Huge update of Technology Picker screen UI, new original icons + misc changes

* Fix possible memory leak

* Fix lines Z-Depth, shifted era boundary lines, thicker queue-path lines

* Fix lines Z-Depth more correctly

* Size checks replaced by truncation

* Icons credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-21 11:25:10 +02:00
Yattong the Mackerel
68fc0487c1
Update template.properties (#8189) 2022-12-20 11:39:18 +02:00
Philip Keiter
f974c3a8a5
Continent and Islands (#8187) 
* Update comments that got outdated.

* Add map type: Continent and Islands
 2022-12-20 08:35:13 +02:00
letstalkaboutdune
6192de325e
AbsoluteUnits - Mongolian Uniques (#8186) 2022-12-20 08:26:16 +02:00
Yair Morgenstern
107edeab1f Fallback image for modded buildings - see #8158 2022-12-18 22:12:05 +02:00
Yair Morgenstern
6b4da20d85 Fallback image for modded buildings - see #8158 2022-12-18 22:11:56 +02:00
Yair Morgenstern
81f3ecd998 Fallback image for modded techs - see #8158 2022-12-18 22:05:17 +02:00
Ouaz
f331ac69e4
Fix new "temperature" map setting not translatable (#8173) 2022-12-18 21:23:05 +02:00
Yair Morgenstern
cf8e6b39e2 4.3.10 2022-12-18 19:42:45 +02:00
Yair Morgenstern
0a3f1c6384
Version rollout (#8172) 
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#8171)

* Update French.properties (#8160)

* Update Korean.properties (#8157)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Simplified_Chinese.properties (#8156)

* Update Italian.properties (#8155)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-12-18 19:36:04 +02:00
Yair Morgenstern
b44ac9eaa4 Better unit action icons 2022-12-17 20:06:43 +02:00
Yair Morgenstern
c95befaf1b 4.3.9 2022-12-16 11:20:50 +02:00
Yair Morgenstern
889a2c5946 Added thin line around tech icons in tech screen 2022-12-16 11:15:36 +02:00
Yair Morgenstern
0d19bf9cef Better icons for 'next turn' button 
@vegeta1k95 sorry about this, but the way this works without resizing is simply not up to the standards of the current UI :/
 2022-12-16 11:15:36 +02:00
Yair Morgenstern
e4a7f7e131
Version rollout (#8154) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#8153)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#8146)

* Update Korean.properties (#8145)

* Update German translation (#8142)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: MartinP <mape6@posteo.de>
 2022-12-16 11:15:19 +02:00
Philip Keiter
02f9176f78
Flat Earth Hexagonal (#8140) 
* Add new map shape: Flat Earth Hexagonal.

* Make flat earth logic easier to read.

* Make flat earth set temperature based on tile distance from center.

* Make flat earth waste less space on the ice ring.

* Add variety to the flat earth ice ring.

* Use baseTerrain for snow on flat earth edge instead of addTerrainFeature.

* Ensure flat earth center tiles and edge tiles are ocean not coast.

* Give flat earth ice ring some random juts and dips.

* Make 3rd continent smaller when flat earth.

* Enable more continent positions for three continents when flat earth.

* Add parens around or statement.

* Refactor flat earth temperature code into functions.

* Invert some flat earth if statements to reduce nesting.

* Allow coast near flat earth ice walls.

* Make flat earth ice wall generation more efficient.

* Stop adding ice to flat earth mountains.

* Move flat earth ice wall generation to its own function.

* Improve flat earth water placement comments.

* Move flat earth extra water generation to its own function.

* Move flat earth center ice spawn to its own function.

* Move flat earth edge ice spawn to its own function.

* Minor efficiency tweak.

* Add Flat Earth Hexagonal to template.
 2022-12-16 11:08:04 +02:00
Yattong the Mackerel
20062c1c3a
Update Nations.json (#8151) 2022-12-16 10:05:32 +02:00
vegeta1k95
bf81bb25e1
Change styles and behaviour of Unit flags as in Civ 5 (#8128) 
* Change styles and behaviour of Unit flags as in Civ 5

* Make shadow mask an optional (removed from default atlas)

* Make shadow mask an optional (removed from default atlas)

* Remove magical numbers, scaling dependent on a ratio of the source

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-15 21:51:46 +02:00
vegeta1k95
dc3809de84
"Auto Unit Cycle" and "Automated units move on turn start" options implemented (Civ 5) (#8144) 
* "Auto Unit Cycle" and "Automated units move on turn start" options implemented (Civ 5)

* Removed threading, added translation template for strings

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-15 21:51:17 +02:00
alexban011
d7c11cc990
added icon for Conduct Trade Mission button (#8125) 
* added icon

* rescaled image to 100px
 2022-12-15 21:02:45 +02:00
vegeta1k95
e1afa1e10e
NextTurnActions (pick tech/policy/etc) now can have icons (#8119) 
* NextTurnActions (pick tech/policy/etc) now can have icons

* Remove default NextTurn notification icons

* Added default notification icons. "Next unit" action priority is lowered (as in Civ 5)

* Added missing files

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-15 08:41:43 +02:00
Ouaz
65c5ce52ec
New map options translatable (#8135) 2022-12-15 07:20:52 +02:00
Yair Morgenstern
b67fc7d030 4.3.8 2022-12-15 00:26:51 +02:00
Yair Morgenstern
662141d661 Resolved #7479 - Removed copyrighted intro texts 2022-12-15 00:23:57 +02:00
Yair Morgenstern
0d9c6c105f
Version rollout (#8132) 
* Bump version and create initial changelog entry

* Update Bulgarian.properties (#8130)

* Update Spanish.properties (#8121)

* Update Korean.properties (#8113)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Updated Brazilian_Portuguese.properties (#8106)

* Update French.properties (#8105)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: excessmind <52409643+excessmind@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-12-15 00:13:50 +02:00
Yair Morgenstern
d3f8f680d1 4.3.7 2022-12-09 12:56:34 +02:00
Yair Morgenstern
32d46b24df
Version rollout (#8103) 
* Bump version and create initial changelog entry

* Update Italian.properties (#8100)

* Update German translations (#8097)

* Update French.properties (#8096)

* Update Spanish.properties (#8095)

* Updated Brazilian_Portuguese.properties (#8094)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2022-12-09 12:52:38 +02:00
vegeta1k95
58c57d6626
UnitActions seprated into own atlas (#8102) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-09 12:46:46 +02:00
alexban011
ccb1d769f1
added button to paste from clipboard when downloading a mod (#8101) 2022-12-07 21:14:54 +02:00
Yair Morgenstern
faf1b66a88 4.3.6 2022-12-05 19:24:25 +02:00
Yair Morgenstern
0063b92e07
Version rollout (#8093) 
* Bump version and create initial changelog entry

* update traditional_chinese.properties (#8092)

* Update German translation (#8089)

* Update Filipino.properties (#8082)

* Update Simplified_Chinese.properties (#8079)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Brazilian_Portuguese.properties (#8078)

* Update Italian.properties (#8076)

* Update French.properties (#8075)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-12-05 19:20:36 +02:00
Yair Morgenstern
454f999948 Resolved #8090 - Replaces misunderstood 'virtual resolutions' with more intuitive 'screen size' 2022-12-05 18:56:47 +02:00
itanasi
bb1e8dc10d
Volley only for Siege in G&K (#8086) 2022-12-05 18:23:00 +02:00
Yair Morgenstern
1d5d445c19 After-combat notification for promotable units - see #4697 2022-12-03 23:12:01 +02:00
Yair Morgenstern
c9ed9d5d74 modding: Double Happiness from Natural Wonders -> [stats] from every known Natural Wonder 2022-12-02 11:50:11 +02:00
Yair Morgenstern
94605911a2 4.3.5 2022-11-30 18:06:28 +02:00
Yair Morgenstern
dceaf832b9
Version rollout (#8074) 
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8072)

* Update Filipino.properties (#8071)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Dutch.properties (#8067)

* Update Dutch.properties

* Update Dutch.properties

* Update Simplified_Chinese.properties (#8066)

* Update Spanish.properties (#8062)

* Update French.properties (#8060)

* Fix tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartijnCBV <49876349+MartijnCBV@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-11-30 18:03:20 +02:00
letstalkaboutdune
4d025caf61
AbsoluteUnits - Unique Chariot Archers (#8073) 2022-11-30 09:59:49 +02:00
itanasi
37d808936a
Fix Repair Crash (#8065) 
* Add Hammer Icon to Repair Civilopedia Entry

* Fix crash from logic bug in getRepairTurns
 2022-11-28 16:11:26 +02:00
Yair Morgenstern
d1225377e0 4.3.4 2022-11-27 19:24:17 +02:00
itanasi
16a7eed4ff
Add Repair and Pillaging Roads (#8015) 
* Reapply Changes

* Logic clean up

* Adding getImprovementToPillage() and getRepairableImprovement()

* Cleaning up Unit Actions

* getImprovementToPillage() needs to check for Unpillagable

* Remove redundant logic since canBuildImprovement() returns true if currently repairing

* More redundant logic

* Prevent City Center from being Pillage status
addRepairAction will not show a Repair Action
Adding the improvement to be repaired/pillaged in button text
Utilizing getImprovementToPillage() more

* Some import cleanup
Add Irremovable to blockers
More consolidation of code

* More translation files

* When improvements/roads are built/removed, pillaged flag set to False

* Better and more consistent logic

* Fix dumb logic bug
 2022-11-27 19:12:26 +02:00
Yair Morgenstern
545b4afc5a Generalized "Stats per policies" unique 2022-11-26 21:39:26 +02:00
letstalkaboutdune
683c3483b4
AbsoluteUnits - Unique Elephants (#8053) 2022-11-26 20:33:48 +02:00
The Bucketeer
10e8f3169d
HexaRealm units are here, finally! (#8052) 
* Initial upload of HexaRealm units

(Just to get folder created

* Add files via upload

* Add files via upload
 2022-11-26 18:46:45 +02:00
Yair Morgenstern
59c2f4bb09 4.3.3 2022-11-24 11:43:28 +02:00
Yair Morgenstern
98900d9162
Version rollout (#8048) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#8043)

?

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2022-11-24 11:33:25 +02:00
Yair Morgenstern
551c6c562e 4.3.2 2022-11-22 23:39:07 +02:00
Yair Morgenstern
ee8c190c06
Version rollout (#8042) 
* Bump version and create initial changelog entry

* Update Indonesian.properties (#8039)

* Update Greek.properties (#8038)

* Update Greek.properties

* Translating to Greek for unciv.

* Update Simplified_Chinese.properties (#8037)

* Update German.properties (#8035)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: RA1DEN-cyborg <73561839+RA1DEN-cyborg@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
 2022-11-22 23:11:57 +02:00
Yair Morgenstern
19d591dd89 Fixed json tests 2022-11-22 00:17:10 +02:00
Yair Morgenstern
e83e733104 Added validations for city-state uniques 2022-11-21 23:03:52 +02:00
Yair Morgenstern
ee2ab74715 Converted all era uniques to conditional uniques for city-states 2022-11-21 22:46:32 +02:00
Yair Morgenstern
2e5e221158 CityStateType overhaul!!!! 2022-11-21 20:30:52 +02:00
Yair Morgenstern
6976360da6 Added CityStateTypes into rulesets! Not in use yet 2022-11-21 19:59:55 +02:00
Yair Morgenstern
3dfdcd1cbf 4.3.1 2022-11-20 23:27:02 +02:00
Yair Morgenstern
2d37f3c473
Version rollout (#8034) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8033)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update French.properties (#8032)

* Update Catalan.properties (#8031)

* Update Catalan.properties

* ca-ES: Change some hyphens with dashes.

* Update Italian.properties (#8030)

* Update Italian.properties

* Update Italian.properties

* "Updated Brazilian Translation" (#8029)

* Update German translation (#8027)

* Update Indonesian.properties (#8025)

* Update Spanish.properties (#8024)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2022-11-20 23:22:31 +02:00
Yair Morgenstern
c5bde45c5d Moved city state icons to separate folder 2022-11-20 18:48:28 +02:00
Yair Morgenstern
e5fbb472b0 Moddable quest weighting for city-states 2022-11-19 23:54:16 +02:00
letstalkaboutdune
694e0d33fc
AbsoluteUnits - Unique Spearmen (#8026) 2022-11-19 18:01:13 +02:00
Yair Morgenstern
ac614c3a44 4.3.0 2022-11-17 22:28:25 +02:00
Yair Morgenstern
4038d75035
Version rollout (#8023) 
* Bump version and create initial changelog entry

* Update German translation (#8020)

* Update Spanish.properties (#8019)

* Update French.properties (#8018)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-11-17 22:22:33 +02:00
Yair Morgenstern
0b864cd2d2 Resolved #8016 - fixed civilopedia text that says city-states don't conquer other cities 2022-11-16 17:53:00 +02:00
Yair Morgenstern
0a13e58bde 4.2.20 2022-11-15 19:02:22 +02:00
Yair Morgenstern
bf4172dba0
Version rollout (#8014) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8013)

* Update Filipino.properties (#8012)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#8009)

* Update German translation (#8008)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
 2022-11-15 18:58:13 +02:00
Ouaz
5dc46c3ad5
New "Unitset" option translatable (#8006) 
Makes "Unitset" translatable (related to #7980)
 2022-11-13 07:26:58 +02:00
Yair Morgenstern
67f33c8ac6 Renamed AbsoluteUnits unitset @letstalkaboutdune - see #7980 2022-11-13 00:34:51 +02:00
Yair Morgenstern
705cbb79b5 4.2.19 2022-11-12 21:26:24 +02:00
Yair Morgenstern
76f25e5fde
Version rollout (#8004) 
* Bump version and create initial changelog entry

* Update Catalan.properties (#8002)

* update (#7999)

* Update Spanish.properties (#7998)

* Update French.properties (#7997)

* Update Italian.properties (#7996)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-11-12 21:22:45 +02:00
letstalkaboutdune
d1ccdfdba5
AbsoluteUnits - Unique Archers (#8000) 
* AbsoluteUnits - Unique Archers

Also fixes bug with Spanish unique embarked sprite.

* Unique Archers - Tilesets.atlas/png update
 2022-11-10 08:54:05 +02:00
Yair Morgenstern
f3d7524dcd 4.2.18 2022-11-09 14:06:41 +02:00
Yair Morgenstern
83f2c7825f
Version rollout (#7995) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#7993)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
 2022-11-09 14:01:01 +02:00
Yair Morgenstern
c98a36c10f Added before/after X turns conditionals - see #3242 2022-11-07 22:56:58 +02:00
Yair Morgenstern
3e05b875bd Added before/after Pantheon conditionals - see #3242 2022-11-07 22:39:55 +02:00
Yair Morgenstern
b0c84f5eea 4.2.17 2022-11-07 18:20:19 +02:00
Yair Morgenstern
01d95652c0
Version rollout (#7992) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#7983)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Catalan.properties (#7979)

* little amend

* Update Catalan.properties

* Translate vietnamese (#7978)

* update vietnam

* update Vietnamese.properties

* Update Bulgarian.properties (#7974)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Dob <100198047+dobval@users.noreply.github.com>
 2022-11-07 18:15:36 +02:00
Yair Morgenstern
803062781c
Resolves #7985 - Added layout for promotions (#7991) 
* Converted existing promotions to table layout

* Added col/row to G&K promotions

* Added ruleset error tests for promotion locations
 2022-11-07 17:53:42 +02:00
Yair Morgenstern
0858f8c038 Added AbsoluteUnits as default units for Hexarealm tileset :D 2022-11-02 23:10:40 +02:00
Yair Morgenstern
039d0b3540 4.2.16 2022-10-29 22:27:13 +03:00
Yair Morgenstern
4a3da8fcfd
Version rollout (#7973) 
* Bump version and create initial changelog entry

* Update German translation (#7961)

* Update Filipino.properties (#7960)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Provide some of the missing Ukrainian translations (#7958)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update French.properties (#7955)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-10-29 22:16:01 +03:00
Yair Morgenstern
731e9f5815 4.2.15 2022-10-24 20:54:04 +03:00
Yair Morgenstern
2f693547b4 Fixed spearman not being to be able to upgrade to anything after Gunpowder and before Metallurgy 2022-10-24 20:51:52 +03:00
Yair Morgenstern
3246b82531
Version rollout (#7954) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#7950)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Improve Ukrainian translations a tad (#7949)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Brazilian_Portuguese.properties (#7948)

* Update Polish.properties (#7945)

* Update Spanish.properties (#7943)

* Update Indonesian.properties (#7942)

* Update Italian.properties (#7941)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: pyotr_p <pyotr.pietrzak@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-10-24 20:16:17 +03:00
The Bucketeer
55908cb115
Unit era variants added to FantasyHex tileset (#7944) 
* Add files via upload

* Add files via upload
 2022-10-23 19:57:43 +03:00
Yair Morgenstern
a450ddbb2c 4.2.14 2022-10-22 20:32:30 +03:00
Yair Morgenstern
7c6df3db7e
Version rollout (#7940) 
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7932)

* One hungarian update (#7928)

I'm back, tried my best with this one.

* Update German translation (#7927)

* Update Spanish.properties (#7924)

* Update Japanese.properties (#7923)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* update Vietnamese (#7922)

* Update Traditional_Chinese.properties (#7921)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update French.properties (#7919)

* Update Filipino.properties (#7918)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Russian.properties (#7917)

* Update Russian.properties

* Update Russian.properties

* Update Traditional_Chinese.properties (#7916)

* Update Brazilian_Portuguese.properties (#7915)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
Co-authored-by: JurDan | Led Cut <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: K0baU <63403741+K0baU@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: 羅少希 <83118946+Tab-Etuc@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2022-10-22 20:24:46 +03:00
itanasi
55e6541ee0
Add Temperature Offset Slider (#7891) 
* Add slider
Align spawnIce latitude and offset code to applyHumidityAndTemperature

* A bunch of debug code
Make default Water Level -0.05 for Default

* Remove debug println
Fix Desert at 0.9-1.0 temp and <0.2 humidity

* Disable reseed for debug comparison
Reset Plains/Grassland for high temp. Adjust max humidity for safety of Grasslands
Humidity debugger
Better slider

* Remove all debug code

* Undo Desert temp setting
 2022-10-22 20:12:57 +03:00
itanasi
c39aca7a31
Change Default Map Generation to Perlin (#7856) 
* Changes

* Slight adjustment to MainMenuScreen

* Make default waterThreshold for Default to be -0.05

* blip

* blip

* Rename cellular automata to Smoothed Random
 2022-10-22 20:11:55 +03:00
Yair Morgenstern
984e91a73e Resolved #7934 - Fixed Temple of Artemis production bonuses 2022-10-21 16:14:43 +03:00
Yair Morgenstern
4526b0f17d 4.2.13 2022-10-13 20:10:19 +03:00
Yair Morgenstern
fdd5d0c796
Version rollout (#7914) 
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#7913)

* Update Brazilian_Portuguese.properties (#7911)

fixing brazilian portuguese wrong translation

* Update Lithuanian.properties (#7909)

* Update Catalan.properties (#7908)

* Update Indonesian.properties (#7907)

* Update Italian.properties (#7906)

* Update Ukrainian.properties (#7905)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

smol fix

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update French.properties (#7903)

* update (#7902)

* Update Filipino.properties (#7900)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update German translation (#7899)

* Update Brazilian_Portuguese.properties (#7897)

* Update Spanish.properties (#7896)

* Update Russian.properties (#7895)

* Update Russian.properties

* Update Russian.properties

* tests fixed by removing bad translation

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: 羅少希 <83118946+Tab-Etuc@users.noreply.github.com>
Co-authored-by: David Wesley <david.moura12@hotmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
 2022-10-13 20:06:49 +03:00
nacro711072
ad72c42911
fix untranslated string about politics (#7901) 
* fix untranslated string about politics

* update shortcut about textbutton

* check all usage of template "[numberOfTurns] Truns Left"

* revert textbotton and add click event by chain.
 2022-10-07 12:36:00 +03:00
Yair Morgenstern
a45c5cfa92 Resolved #7881 - Thron->Throne 2022-10-05 23:15:55 +03:00
Yair Morgenstern
2ef0284235 4.2.12 2022-10-05 23:13:32 +03:00
Yair Morgenstern
07acbee9ad
Version rollout (#7894) 
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7885)

* Update Filipino.properties (#7874)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Fix grammar mistake (#7873)

* Fix grammar mistake

"Abandonada"?? Quién puso eso?? No pudo ser yo... o_o

* Update Spanish.properties

* update traditional_chinese.properties (#7872)

* Update Traditional_Chinese.properties (#7871)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Spanish.properties (#7868)

* Update Czech.properties (#7867)

* Update Czech.properties

* Update Czech.properties

* Update Czech.properties

* Update Lithuanian.properties (#7866)

* Update Vietnamese.properties (#7865)

* update

* update

* Updated Brazilian_Portuguese.properties (#7864)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update French.properties (#7861)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Chris <cmanlove1234@outlook.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-10-05 23:10:52 +03:00
Yair Morgenstern
6ba98c82ac 4.2.11 2022-09-25 16:44:34 +03:00
Yair Morgenstern
6623991079
Version rollout (#7859) 
* Bump version and create initial changelog entry

* Update Catalan.properties (#7858)

* Update Catalan.properties

* Update Catalan.properties

* Update Simplified_Chinese.properties (#7845)

* Update Simplified_Chinese.properties

Small fixes

* Update Simplified_Chinese.properties

* Update Traditional_Chinese.properties (#7841)

* translate some unit & beliefs.

* translate buildings

* translate some character name.

* Update Filipino.properties (#7840)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7837)

* update Vietnamese (#7836)

* update

* update Vietnamese

* update Vietnamese.properties

* update Vietnamese

* Update Italian.properties (#7835)

* Update Simplified_Chinese.properties (#7834)

* Update Lithuanian.properties (#7831)

* Update German translation (#7829)

* Update German translation

* Update German translation

* Update French.properties (#7827)

* Update Brazilian_Portuguese.properties (#7824)

* Update Indonesian.properties (#7823)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
 2022-09-25 16:37:56 +03:00
Yair Morgenstern
11de54d8d5 4.2.10 2022-09-19 16:24:11 +03:00
Yair Morgenstern
55c7183160
Version rollout (#7822) 
* Bump version and create initial changelog entry

* Update Polish.properties (#7818)

* Update Traditional_Chinese.properties (#7815)

* translate policy/technology/tile/building

* correct typo

* Update French.properties (#7813)

* Update Indonesian.properties (#7812)

* Translate vietnamese (#7810)

* dịch thêm

thêm fanpage và group UnCiv Việt Nam

* update Vietnamese.properties

#update đã dịch tới dòng 3000

* update Vietnamese

add new line

* update Vietnamese.properties

dịch full 4.2.9

* Update Vietnamese.properties

* Update Vietnamese.properties

* fix

* fix

* f

* Update Brazilian_Portuguese.properties (#7808)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Japanese.properties (#7803)

Few translations added

* Update Simplified_Chinese.properties (#7802)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties (#7801)

Two small fix

* Updated dutch translations (#7796)

* Updated dutch translations

* Fixed translation typos

* Used a better translation in dutch translation

Co-authored-by: Mark ter Maat <livestockmanagement@nedap.com>

* Update Vietnamese.properties (#7780)

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

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: BJiggers <113617818+BJiggers@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: marktermaat <mark.termaat+github@gmail.com>
Co-authored-by: Mark ter Maat <livestockmanagement@nedap.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
 2022-09-19 16:18:09 +03:00
Xander Lenstra
7f365423e1
Spies now show their current action and take time to move and set up (#7776) 
* Spies now show their current action and take time to move and set up

* Fixed tests

* Reviews

* More reviews
 2022-09-19 16:13:57 +03:00
The Bucketeer
a75a157dff
Add files via upload (#7820) 2022-09-19 16:12:58 +03:00
alexban011
d980b0d9ff
Global politics overview screen (#7469) 
* getting the data

* finished getting the data

* optimization + separator

* vrtical separators

* more functions

* made it look good

* reverted debug variables

* cleanup

* added icon

* credits

* translations

* removed redundant equalizeColumns

* removed redundant separator

* column headers

* reviews

* removed redundant function

* latest translations

* latest review

* checks 1

* removed space

* removed vars and used DiplomacyManager instead

* combined overview screens

* 2 more translations

* little cleanup and fix
 2022-09-19 16:12:24 +03:00
Yair Morgenstern
d5134f84cd 4.2.9 2022-09-15 16:21:23 +03:00
Yair Morgenstern
2bd705d43e
Version rollout (#7800) 
* Bump version and create initial changelog entry

* translate opening statement of civ. (#7798)

* Update Catalan.properties (#7789)

* Update German translation (#7786)

* Update Indonesian.properties (#7779)

* Update Simplified_Chinese.properties (#7778)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update android/assets/jsons/translations/Simplified_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Translate vietnamese (#7774)

* dịch thêm

thêm fanpage và group UnCiv Việt Nam

* update Vietnamese.properties

#update đã dịch tới dòng 3000

* update Vietnamese

add new line

* Update Brazilian_Portuguese.properties (#7773)

* Updated Lines from Unique Types

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Delete Brazilian_Portuguese.properties

* updated

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update French.properties (#7767)

* Update Italian.properties (#7765)

* Update Spanish.properties (#7764)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2022-09-15 16:09:08 +03:00
Xander Lenstra
8fd3b3194e
Enabled vietnamese (#7772) 
* Enabled vietnamese

* Fixed tests

* Fix tests (again)
 2022-09-15 16:02:14 +03:00
OptimizedForDensity
291b962f97
Generalize Great Wall unique (#7660) 
* Generalize Great Wall unique

* Update JSON entries

* And movement calculation too

* Rename other functions

* Cache movement penalty uniques

* Check destination tile instead of unit type
 2022-09-15 16:00:19 +03:00
Yair Morgenstern
8fec196db1 Got rid of uppercase C in Unciv in ALL places! 2022-09-12 23:26:28 +03:00
Yair Morgenstern
74d8d79a74 Added Macedonian flag 2022-09-12 21:22:54 +03:00
Yair Morgenstern
04ee2b716e Updated preview images and added guide to doing so 2022-09-12 20:58:27 +03:00
xk730
452d152176
Added missing translatables (#7770) 
* Update template.properties

Add the ’No space to place this unit‘

* Update template.properties

Add the "Couldn't connect to Multiplayer Server!"
 2022-09-10 08:00:17 -07:00
The Bucketeer
16253407de
Add files via upload (#7766) 2022-09-09 10:08:12 +03:00
Yair Morgenstern
2cc6594df2 4.2.8 2022-09-08 23:55:36 +03:00
Yair Morgenstern
9a95825ed7
Version rollout (#7763) 
* Bump version and create initial changelog entry

* dịch thêm (#7760)

thêm fanpage và group UnCiv Việt Nam

* Update Simplified_Chinese.properties (#7753)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* update traditional_chinese.properties (#7752)

* update chinese.properties.

* update chinese.properties.

* Update Spanish.properties (#7751)

* Update Indonesian.properties (#7750)

* Update Filipino.properties (#7746)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Catalan.properties (#7744)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
 2022-09-08 23:51:13 +03:00
Yair Morgenstern
b11c01bfdc
Resolve #7625 - show Unciv icon when loading game, instead of happy face (#7756) 2022-09-08 16:17:05 +03:00
Ouaz
81d2320824
Add "UI Skin" to make it translatable (#7748) 2022-09-06 10:27:14 +03:00
Yair Morgenstern
b4bbcfb458 4.2.7 2022-09-04 17:12:59 +03:00
Leonard Günther
f4dc138186
Moddable UI Skins [Basics] (#7714) 
* Made UI skins selectable

This allows mods to provide alternative skin pngs without overriding the default skin purely by being downloaded

* Added UI Skin loading from NinePatches

This allows mod creators to define the stretch region and padding directly in the png

* Update baseScreen skin on skin reload

* Merged displayTab onChange functions

As all of them are equal anyway
 2022-09-04 17:09:14 +03:00
Yair Morgenstern
30ed0f544d
Version rollout (#7742) 
* Bump version and create initial changelog entry

* Update Lithuanian.properties (#7736)

* update traditional chinese. (#7735)

* Update Korean.properties (#7731)

* Update Romanian.properties (#7729)

* Update Italian.properties (#7728)

* Update French.properties (#7724)

* Update Simplified_Chinese.properties (#7723)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#7722)

* Update German translation

* Update German translation

* Update Indonesian.properties (#7719)

* Update Romanian.properties (#7725)

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

* Removed invalid translation

* Fixed tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Auvergne <97716654+ARPD-release@users.noreply.github.com>
Co-authored-by: MihaiTurlea <111897551+MihaiTurlea@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
 2022-09-04 17:06:17 +03:00
nacro711072
df2f0a3185 4.2.6 2022-08-28 23:55:01 +03:00
Yair Morgenstern
71c5177c34
Version rollout (#7716) 
* Bump version and create initial changelog entry

* Ukrainian translations (#7711)

* Update Traditional_Chinese.properties (#7709)

* add basic and notification translative sentence.

* update missing placeholder.

* Upadate Catalan.properties (#7704)

* Update Indonesian.properties (#7703)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Czech.properties (#7702)

* Update Czech.properties

* Update Czech.properties

Wrong translation

* Update Czech.properties

* Update Polish.properties (#7700)

* Update Vietnamese.properties (#7699)

* Update Simplified_Chinese.properties (#7698)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#7697)

* Update Spanish.properties (#7693)

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#7692)

* Update French.properties (#7690)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: persinger <63961560+Weltzer@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-08-28 23:40:04 +03:00
Xander Lenstra
a19fed5d28
Added a screen to move spies between cities (#7665) 
* Added a screen to move spies between cities

* Fixed tests

* Reviews

* Avoid labels blinking

Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
 2022-08-28 23:25:14 +03:00
alexban011
f64c5b36d0
added game option to disable unwanted spectators from a multiplayer game (#7290) 
* feature

* only display option if onlineMultiplayer is enabled

* translatable

* no more negativity

* 1

* threw UncivShowableException

* reviews

* reviewed myself
 2022-08-22 21:11:12 +03:00
Yair Morgenstern
121bda2833 4.2.5 2022-08-22 21:09:04 +03:00
Yair Morgenstern
87a4b57bf0
Version rollout (#7688) 
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7686)

* Update Filipino.properties (#7677)

* Update Filipino.properties

* Update Filipino.properties

* update traditional_chinese for Maya. (#7675)

* update traditional_chinese for Maya.

* update

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Catalan.properties (#7667)

* Update Catalan.properties

* Update Catalan.properties (names of spies)

* Update Catalan.properties

* Update Indonesian.properties (#7664)

* Update Indonesian.properties

* Update Indonesian.properties

* Ukrainian translations (#7659)

* Ukrainian translations

* Misprints corrected

* New strings from a master branch

* Translations for the spy names

* More names translated

* Update German translation (#7657)

* Update French.properties (#7654)

* Update Simplified_Chinese.properties (#7652)

* Update Simplified_Chinese.properties

* Fix error

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Italian.properties (#7651)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Weltzer <63961560+Weltzer@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-08-22 21:02:45 +03:00
Leonard Günther
18ef8fc20e
Removed legacy tileset code (#7658) 
* Removed legacy tileset code

which was only used for the "Default" tileset

* Updated "Default" tileset to support new rendering

* Updated docs

* Fixed fogOfWar coloring bug

* Removed cityImage variable completely

* Renamed variable out to baseHexagon

* Moved color lerp out of for loop

* Renamed "Default" tileset to "Minimal"

* Made "HexaRealm" the games fallback tileset

* Implemented requested changes

* Readded accidentally removed variable

* Reverted updateTileImage back to foreach loop

Since indices are not needed anymore

* Regenerated game.atlas and game.png
 2022-08-22 13:02:52 +02:00
Ouaz
c5c0f24a5f
Add "Wait" command in "Idle Units" tutorial (#7672) 
* Add "Wait" command in "Idle Units" tutorial

* Improve wording for "Wait" command tutorial
 2022-08-18 16:16:13 +03:00
Ouaz
90e582a0c3
Add an icon for "Wait" unit action (#7668) 2022-08-16 12:30:37 +02:00
Yair Morgenstern
87c1662462
Hopefully resolved #7663 by upgrading androidx.work version 2022-08-14 14:36:12 +03:00
Xander Lenstra
202e0bcf47
Basic version of EspionageManger, added a unique to gain spies (#7641) 
* Handfull of comment questions, small refactorings

* Code changes

* Reworded a unique, removed a file

* Added spy names for all nations, minor consistency change

* Removed debug output

* Added an empty constructor so gdx can reconstruct it
 2022-08-13 22:45:16 +03:00
Ouaz
9326f47cdf
Fix an untranslated string (#7656) 
when trying to launch a new game on a map that is not compatible with the ruleset.
 2022-08-13 13:08:53 +02:00
Yair Morgenstern
9898789772 4.2.4 2022-08-12 14:36:01 +03:00
Yair Morgenstern
afa2327828
Version rollout (#7650) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties（2nd attempt） (#7646)

* Update Simplified_Chinese.properties

* A checkpoint for undoing commits

* Update Simplified_Chinese.properties

* Fix error

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7644)

* Update German translation (#7642)

* Update German translations

* Updat German translations

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Polish.properties (#7640)

* Update Spanish.properties (#7639)

* Update Spanish.properties

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#7636)

* Perform housekeeping for Ukrainian translations - symbols, word order, and extra translations (#7626)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Catalan.properties (#7614)

* Update Catalan.properties

* Update Catalan.properties. Change verbal periphrases and apostrophe symbol.

* Update Catalan.properties

* Update French.properties (#7608)

* Update French.properties

* Update French.properties

Update translation to 4.2.3

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-08-12 14:30:26 +03:00
OptimizedForDensity
8f23ae52cc
List which city owns each tile in the city screen UI (#7631) 2022-08-12 14:26:09 +03:00
OptimizedForDensity
28f65a7599
Add free belief unique + refactor a few religion functions (#7612) 
* Free belief unique

* Fix edge case

* Another edge case

* Bug fixes

* Fix some conditions

* Refactor another function

* Handle edge case where the civ has enough faith for a pantheon but also gets a free pantheon pick on the same turn (allow civ to have both picks)

* Fix the edge case handling

* Cleanup

* Reviews + more refactoring and cleanup

* Update comments

* Unnecessary comment

* Improvements

* Typo
 2022-08-12 14:24:42 +03:00
Yair Morgenstern
0df499b9fe Increment sdk version to 32, to see if it passes Github build 2022-08-08 14:02:49 +03:00
Ouaz
9ca5b0f850
Fix missing "HP" in battle notifications (#7638) 
These two missing "HP" caused these two lines to not be translated in the notification log.
 2022-08-08 08:50:02 +03:00
Yair Morgenstern
cf44f41372 Increment sdk version to 31, to see if it passes Github build 2022-08-08 00:02:15 +03:00
Yair Morgenstern
068d903ee5 Revert ktx version 2022-08-07 23:59:28 +03:00
Yair Morgenstern
b296d014b5 4.2.3 2022-08-07 23:51:02 +03:00
Yair Morgenstern
29b6b35f56
Version rollout (#7635) 
* Bump version and create initial changelog entry

* Update German translation (#7634)

* Update Korean.properties (#7630)

* fix a few style issues in the German translation (#7621)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Kristian Rother <krother@academis.eu>
 2022-08-07 23:48:01 +03:00
OptimizedForDensity
b630388984
Add unit type to Civilopedia (#7620) 2022-08-07 17:37:11 +03:00
itanasi
69e6093e2e
Update Damage Notifications (#7623) 
* Minor Compile change

* Update to -[amount] HP for battle notifications
Update Unseen Interceptor Notification

* Update to -[amount] HP for battle notifications
Update Unseen Interceptor Notification

* Revert "Update to -[amount] HP for battle notifications"

This reverts commit 63961029da.

* Rename variables

* Even if you can't see the Interceptor Tile, still get full info if not killed
 2022-08-06 13:23:42 -04:00
Kostiantyn Kolesnichenko
7a30e29e07
Add missing string to the translations template file (#7627) 
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
 2022-08-06 09:14:21 -04:00
Yair Morgenstern
b14870fbc5 Reinstated desugaring since it broke the build 2022-08-05 16:11:02 +03:00
Yair Morgenstern
1dc7c6bfa8 Android gradle update - explicitly state build tools version, update to 32.0.0, remove desugaring. 2022-08-05 11:00:04 +03:00
Yair Morgenstern
948b95a9dc Android gradle update - explicitly state build tools version, remove desugaring 2022-08-05 10:49:38 +03:00
Yair Morgenstern
a1357414a0 4.2.2 2022-08-04 18:37:23 +03:00
Yair Morgenstern
7473213d77
Version rollout (#7601) 
* Bump version and create initial changelog entry

* Update Ukrainian translations - add missing, correct existing (#7597)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Simplified_Chinese.properties (#7590)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

* Update Korean.properties (#7585)

* Update Catalan.properties (#7583)

* Update French.properties (#7575)

* Update Spanish.properties (#7574)

Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>

* Update Italian.properties (#7572)

* Update Dutch.properties (#7547)

* Update Dutch.properties

* Paar spellingsdingetjes eruit gehaald

* Vertalingen toegevoegd

Verwarrend: speler-ID en gebruiker-ID worden door elkaar gebruikt! vb regel 675
Mag het pull request worden geamendeerd of moet er een apart pull request gemaakt worden?

* Paar spellingsdingetjes

* Nieuwe vertalingen

* Fixed tests not working

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TPunkiee <110175928+TPunkiee@users.noreply.github.com>
 2022-08-04 18:32:20 +03:00
Nika Kasradze
33ca2d8ef9
fix #7565: Remove duplicate "Consumes ..." lines of city screen (#7592) 
* fix #7565: Delete one "Consumes ..." lines of city screen

* fix #7565: Delete one "Consumes ..." lines of city screen

* fix #7565: Delete one "Consumes ..." lines of city screen
 2022-08-03 13:38:35 -04:00
itanasi
61d48a5c37
Add Damage numbers to Battle Notifications (#7587) 
* Initial changes

* Adding damage numbers
 2022-08-03 20:24:19 +03:00
OptimizedForDensity
67fbc07552
Add translation for XP on World Screen (#7595) 2022-08-03 20:22:46 +03:00
Xander Lenstra
01cc67cee4
Reworded a tutorial, deleted unused line (#7594) 
* Reworded a tutorial, deleted unused line

* Fixed faith symbol
 2022-08-03 20:22:29 +03:00
itanasi
2671babefd
Fix Air Sweep Notification Translations (#7577) 
* Fix Air Sweep Notification Translations

* Modify all translation files

* Fix a missing space
 2022-08-03 17:34:21 +03:00
xk730
ebafe97e67
Updated the interface introduction content in the Encyclopedia of civilization (#7586) 
* Add files via upload

* Upload the World_Screen.png

This will match the latest presentation

* Upload the World_Screen.png

because it is so old

* Update Tutorials.json

The Tutorials.json add the ：
㉑: The Multiplayer Button - Here will help you easily check your current multiplayer game",
This will match the latest presentation
and
ⓗ: Here you will see what you currently have ☮Faith quantity, of course, if you don't open it ☮Faith Before starts the game, this will be ‘Off’
 2022-08-03 17:33:37 +03:00
Ouaz
7f1c91ddaf
Update template.properties (#7576) 
Fix untranslatable strings (issue #6131)
 2022-08-02 22:57:10 +02:00
Yair Morgenstern
a3e7d5ccb6 fastlane cleanup for bad translations 2022-08-01 23:39:03 +03:00
Yair Morgenstern
1d83d16e85 4.2.1 2022-08-01 19:50:30 +03:00
Yair Morgenstern
99cda99f41
Version rollout (#7571) 
* Bump version and create initial changelog entry

* Update Korean.properties (#7569)

* Update Korean.properties

Checking every 10~20 lines...

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Ukrainian translations (#7560)

* Update Ukrainian.properties - add missing translations

* Missing translations are added

* Trailing spaces are restored

* More translations are added

* More translations are added

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Hungarian translation #idk (#7558)

Another translation coming up from here ^^

* Update Polish.properties (#7556)

* Update Italian.properties (#7555)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#7553)

* Update Spanish.properties (#7552)

* Update Spanish.properties

Woah, I got fuzzy with so many "Interceptor" conjugations 0_o\

* Update Spanish.properties

* Improve Spread Religion tutorial

Co-authored-by: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com>

* Update Catalan.properties (#7551)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Turkish.properties (#7548)

`Domalan` is too local a translation and has other meanings. `Yermantarı"` is better.

* Update Simplified_Chinese.properties (#7546)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7541)

* Update Indonesian.properties

* Fixed tests

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: JurDan | Led Cut <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Selim <slmyldz41@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
 2022-08-01 19:48:09 +03:00
Joan Josep
6a943bb46f
Rename "Show minimap" to "Minimap size" (#7567) 2022-07-31 15:56:45 -04:00
Xander Lenstra
8331b87f64
Removed duplicate placeholders (#7544) 2022-07-28 16:18:01 +03:00
Yair Morgenstern
c738da892c 4.2.0 2022-07-28 09:12:57 +03:00
Yair Morgenstern
a6b55ca14a
Version rollout (#7538) 
* Bump version and create initial changelog entry

* Translate a few missing lines to Ukrainian (#7537)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Finnish.properties (#7535)

* Update Finnish.properties

* Update Finnish.properties

* Update Korean.properties (#7531)

* Update Traditional_Chinese.properties (#7527)

* Update Polish.properties (#7525)

* Update Catalan.properties (#7524)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Russian.properties (#7520)

* Update Lithuanian.properties (#7518)

* Update Traditional_Chinese.properties (#7516)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update German translation (#7511)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Simplified_Chinese.properties (#7509)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7506)

* Update Filipino.properties (#7505)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7503)

* Update French.properties (#7501)

* Update Swedish.properties (#7500)

* Update Italian.properties (#7498)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Securetux <110048962+Securetux@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-07-28 09:06:46 +03:00
Xander Lenstra
4eb0038d10
Allows inquisitors to block holy cities (#7521) 
* Inquisitors can disable holy cities

* Templates and notifications

* Combined with changes of previous religious PR

* Reviews
 2022-07-27 22:18:04 +03:00
itanasi
af6ab8e4e5
Add Air Sweep (#7484) 
* Add Air Sweep Unique
Enable Dogfighting Promotion
Add Air Sweep mode button and crosshair overlay

* Adding Air Sweep Battle Table

* Add airSweep to Battle
Remove double XP
While in AirSweep can't select other units on tile

* initial airsweep code

* Implement airSweep

* BattleTable indicates tile you're AirSweeping

* some notifications

* Clean up notifications.
Add icons

* Revert game.atlas and game.png

* Fix selection properly

* Update Vanilla UnitPromotions.json

* Better handling of movement use
comment cleanup

* missing credit

* Proper code so that Seas units also deal no damage
Adding Tutorials!

* Remove Intercept Bonus Damage/Protection

* Remove chance of Interceptor missing

* Battle Table a bit more consistent

* Defender also gets Air Sweep Modifiers

* Defender doesn't get bonus

* Remove unused getInterceptBonus
Combine logic

* Show damage in notifications for Air Sweep

* Randomize intercepting Civ and prioritize Air Units

* Remove debug code

* Updated atlas

* Clean up Uniques

* Object-ify DamageDealt for ease of reference

* code clean up

Co-authored-by: itanasi <spellman23@gmail.com>
 2022-07-27 22:16:53 +03:00
SimonCeder
9fa00a9fa9 change wording 2022-07-22 23:12:55 +02:00
SimonCeder
0e00ec22c6 workers will replace city ruins 2022-07-22 20:53:01 +02:00
Caballero Arepa
0e0e245365
Allow HexaRealm to render jungles on hills (#7502) 2022-07-22 14:30:58 +02:00
Yair Morgenstern
2f8acff08c 4.1.21 2022-07-21 09:33:35 +03:00
Yair Morgenstern
5b50106ea5
Version rollout (#7496) 
* Bump version and create initial changelog entry

* Update Russian.properties (#7493)

* Update Filipino.properties (#7487)

* Update Simplified_Chinese.properties (#7480)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
 2022-07-21 09:19:22 +03:00
alexban011
06096eaa8e
Mod categories (#7298) 
* feature

* more categories

* added categories

* filter installed part1

* display vanilla rulesets in rulesets category + fix download from URL not showing

* filter installed mods

* removed isVanilla variable

* only look at second topic

* same but for online mdos as well

* replaced tilesets with graphics

* translations

* code duplication

* removed vanilla content from rulesets

* combined the function into one

* revert amountPerPage even tough its already on master

* Filter class

* 1

* mutableListOf<>()

* mutableListOf<>() again

* getFilterText removed

* !categoryFilter(filter)

* matchesCategory

* if (modTopic.size < 2) return false
 2022-07-21 09:15:26 +03:00
Yair Morgenstern
aa8cbb49a3 4.1.20 2022-07-18 19:19:39 +03:00
Yair Morgenstern
d95cf13a41
Version rollout (#7481) 
* Bump version and create initial changelog entry

* Update Turkish.properties (#7473)

* Ukrainian translations (#7472)

* Update Spanish.properties (#7471)

* Update Catalan.properties (#7467)

* Update French.properties (#7466)

* Update Italian.properties (#7464)

* Update German translation (#7463)

* Update German translation

* Update German translation

* Update Lithuanian.properties (#7462)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
 2022-07-18 19:17:36 +03:00
OptimizedForDensity
1287eb2c05
Minor reweight of AI policy selection (#7252) 
* Reweight AI policy selection

* Vanilla ideological weights updated

* Update science victory weights
 2022-07-17 11:21:12 +03:00
Yair Morgenstern
d9389b3c4e 4.1.19 2022-07-15 12:04:41 +03:00
Yair Morgenstern
9d20f991d0
Version rollout (#7460) 
* Bump version and create initial changelog entry

* Update Catalan.properties (#7446)

* Update Spanish.properties (#7445)

* Ukrainian translations (#7439)

* Update German translation (#7435)

* Update French.properties (#7431)

* Update Traditional_Chinese.properties (#7430)

* Update Filipino.properties (#7428)

* Update Filipino.properties

* Update Filipino.properties

* Update Indonesian.properties (#7425)

* Update Italian.properties (#7424)

* Update Italian.properties

* Update Italian.properties

* Update Lithuanian.properties (#7423)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
 2022-07-15 12:01:15 +03:00
OptimizedForDensity
2a2b4bc531
Better era-specific tile image support (#7453) 
* Better era specific tile images

* Use ImageAttempter to reuse code

* Redundant code

* Unify era-specific image loading

* Revert change

* I guess I'll commit these
 2022-07-15 10:51:46 +03:00
Xander Lenstra
160b51d578
Added more unit tests (#7448) 2022-07-14 10:27:06 +03:00
Ouaz
0f3fb48ebe
Remove all in-game mentions of 1.5x unhappiness for puppeted cities (#7420) 
* Update Tutorials.json

Remove mention in the "After conquering" tutorial of 1.5x unhappiness for puppeted cities (according 87aa5bc)

* Update template.properties

Remove mention when conquering a city of 1.5x unhappiness for puppeted cities (according 87aa5bc)

* Remove mention of unhappiness for puppeted cities

* Modify "After Conquering" tutorial

Remove mention of unhappiness for puppeted cities
 2022-07-11 21:44:29 -04:00
Yair Morgenstern
23026202ec 4.1.18 2022-07-11 10:43:49 +03:00
Yair Morgenstern
5c1ca900b7
Version rollout (#7422) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#7415)

* Update Traditional_Chinese.properties (#7413)

* Update French.properties (#7406)

* Update French.properties

* Update French.properties

Revert bad (idea) changes

* Update German translation (#7405)

* Update Spanish.properties (#7401)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
 2022-07-11 10:35:56 +03:00
Xander Lenstra
ae5a0221ed
Refactorings & three more unit tests for uniques (#7412) 2022-07-10 23:19:45 +02:00
OptimizedForDensity
cdecb3f52d
Fix monastery purchase cost (#7417) 2022-07-10 19:15:43 +03:00
Yair Morgenstern
f2365568d4
Fix multiple capture uniques resulting in double-capture (#7403) 2022-07-10 01:12:59 +02:00
Yair Morgenstern
6c533d63fb Hopefully resolved ANRs caused by available fonts taking too long to load 2022-07-08 16:54:21 +03:00
Yair Morgenstern
550ac30bff 4.1.17 2022-07-08 16:06:59 +03:00
Yair Morgenstern
f08dedea31
Version rollout (#7400) 
* Bump version and create initial changelog entry

* Update Indonesian.properties (#7398)

* Update Simplified_Chinese.properties (#7397)

* Herbad patch 1 (#7395)

* Update Persian_(Pinglish-UN).properties

* Update Persian_(Pinglish-UN).properties

Edit the problem

* Update German translation (#7391)

* Update Catalan.properties (#7389)

* Update Lithuanian.properties (#7385)

* Update Filipino.properties (#7384)

* Update French.properties (#7383)

* Update Spanish.properties (#7381)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Herbad <108671374+Herbad@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
 2022-07-08 16:00:38 +03:00
OptimizedForDensity
9fd85edb72
Fix latest untranslated strings (#7382) 2022-07-07 17:52:33 +03:00
Yair Morgenstern
fe2d3243fc 4.1.16 2022-07-05 22:12:27 +03:00
Yair Morgenstern
99367c2212
Version rollout (#7366) 
* Bump version and create initial changelog entry

* Update Persian_(Pinglish-UN).properties (#7365)

Translate some English words

* Update Persian_(Pinglish-UN).properties (#7364)

* Update Spanish.properties (#7362)

Improve unique understanding, not even I could really understand xDDD

* Update French.properties (#7361)

* Update Simplified_Chinese.properties (#7356)

* Update Simplified_Chinese.properties

* Update android/assets/jsons/translations/Simplified_Chinese.properties

* Some buttons were just filled (Brazillian Portuguese)! (#7355)

* Yet another section filled!

Just translated some menu options and buttons. I feel nice.

* Removed 'Requires translation' text

* new translations (#7352)

* Update Lithuanian.properties (#7350)

* Update German translation (#7349)

* Update Spanish.properties (Floating Gardens) (#7346)

In Mexico they are called "Chinampas"

* Revert "Update Persian_(Pinglish-UN).properties (#7365)" (#7367)

This reverts commit bb09098ce9.

* Revert "Update Persian_(Pinglish-UN).properties (#7364)" (#7368)

This reverts commit 6e337127ab.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Herbad <108671374+Herbad@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Pssstr <85759927+Pssstr@users.noreply.github.com>
Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: KESMGAMA <108433075+KESMGAMA@users.noreply.github.com>
 2022-07-05 22:04:28 +03:00
OptimizedForDensity
76d1c0b4c9
Add missing Plains Hill Forest Lumber mill image for FantasyHex (#7372) 
* Add missing lumber camp for FantasyHex

* Update atlas

* Update image

* Add missing plains hill forest camp

* Update image and remove added camp tile

* Remove redundant image

* Undelete atlas

* Delete extra GrasslandsHillForestLumbermill image
 2022-07-05 08:06:09 +03:00
OptimizedForDensity
8b4bb89995
Fix duplicate version in string (#7374) 2022-07-05 08:05:06 +03:00
OptimizedForDensity
9477b319bc
Generalize production-to-stat conversion uniques (#7342) 
* Generalize production to stat conversion enabling uniques

* Remove unnecessary code

* Rename class

* Update sound
 2022-07-04 16:38:24 +03:00
letstalkaboutdune
716d5d3214
Unit icon alpha control (#7343) 
* Unit icon alpha/size control

Implemented sliders in Options -> Display to give user control over unit icon opacity and size.

* Simplified sliders and re-added idle 50% transparency

* Minor fixes from PR review

* Removed unit icon size adjustment
 2022-07-04 16:35:36 +03:00
Yair Morgenstern
21f0f9255d
Version rollout (#7348) 
* Bump version and create initial changelog entry

* Update in Hungarian (#7341)

After all this time.... I'm back with a translating. Tried my best.

* More translations to Portuguese-Brazilian (#7340)

* More translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Translations to Brazilian Portuguese

* Update Turkish.properties (#7338)

* Update Spanish.properties (#7327)

* Update Catalan.properties (#7324)

* Update Filipino.properties (#7320)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Indonesian.properties (#7319)

* Update German translation (#7318)

* Update German translation

* Update German translation

* Update German translation

* Update Lithuanian.properties (#7317)

* Update Simplified_Chinese.properties (#7315)

* Update Simplified_Chinese.properties

* Apply suggestions from code review

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update French.properties (#7308)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-07-01 10:07:48 +03:00
SomeTroglodyte
64ab79faf3
Moddable prettier Tutorials - Step 1 (#7326) 
* Moddable prettier Tutorials - Step 1

* Moddable prettier Tutorials - TranslationFileWriter

* Moddable prettier Tutorials - Kdoc

* Moddable prettier Tutorials - UX for open options task
 2022-07-01 09:36:11 +03:00
Timo T
57ed61af41
Save compatibility handling (#7255) 
* Add serialization version to GameInfo

* Add handling of incompatible saves due to a dfiferent save version

* Fix compilation?

* Fix ios compilation

* Refactor: Make it clearer that GameInfo serialization version is only supposed to be incremented when it's guaranteed to cause issues & rename to compatibility version

* Update initial version

* Update initial version

* Fix merge mistake
 2022-07-01 09:34:41 +03:00
alexban011
119440ccec
fixing translatable (#7277) 
* 1 - speeds not translatable

* 2 - start year:
 2022-07-01 09:34:13 +03:00
OptimizedForDensity
b3cd36c70e
Fix translation issues caused by nested brackets and braces (#7242) 
* Fix translation issues

* Readd comment

* Reviews

* Update translation line
 2022-07-01 09:32:56 +03:00
Yair Morgenstern
8f0e64e02d 4.1.14 2022-06-25 22:47:35 +03:00