Commit Graph

2377 Commits

Author SHA1 Message Date
01877fee7c Fixed Great Barrier Reef spawn rules 2021-03-11 22:17:59 +02:00
c7e424d661 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-11 21:58:19 +02:00
b3a62f4b1a Withdraw before melee is the same as original game (#3674) 2021-03-11 21:40:44 +02:00
05a36580ba Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-11 21:22:16 +02:00
f6e188144e Translations update (#3683)
* Update German.properties (#3680)

* Update German.properties

* Update German.properties

* Update German.properties

* Updated Spanish translations (#3677)

* Completed Spanish translations

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

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

* NotificationsScroll: Made notifications dark blue with white text.

* Improved Spanish translations

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

This reverts commit 63b8ba2e

* Completed Spanish translations

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

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

* NotificationsScroll: Made notifications dark blue with white text.

* Improved Spanish translations

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

This reverts commit 63b8ba2e

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

This reverts commit d970632b

* Improved Spanish translations

* Update German.properties (#3676)

* Replaced ß with ss in some words.

* Update German.properties

* Update TileImprovements.json

Fixed typo

* Update German.properties

* Update German.properties

* Update German.properties (#3673)

* Update German.properties (#3672)

* Update Czech.properties (#3670)

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

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

Fixed some translations and deleted some unnecessary text.

* Update German.properties (#3664)

* Update German translations

* Update German translations

* Update German translations

* Update German.properties

* Update German.properties

* Update Turkish.properties (#3661)

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* update German.properties (#3660)

* Update Italian.properties (#3658)

* Update Indonesian.properties (#3657)

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

* update German.properties

* Update German.properties

add missing placeholder

* Update Czech.properties (#3641)

india diplomacy and cities
new strings

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

* Translation

* missing !

* Update Italian.properties (#3630)

Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-03 22:47:08 +02:00
639be3b01d 3.13.4 2021-03-01 21:05:53 +02:00
12e3005294 [663] Allow unit rename on promote (#3620)
* Add nullable "instanceName" field to MapUnit to capture name for individual units
* Add "displayName" property to MapUnit which takes instanceName if set, name
  otherwise
* Add dialog to PromotionPicker to allow setting instanceName of unit, if not
  already set
2021-03-01 20:52:46 +02:00
237884a60d Translations update (#3629)
* Update Czech.properties (#3627)

few tutorial/civilopaedia texts

* Update French.properties (#3625)

* Update German.properties (#3624)

* Update Czech.properties (#3623)

* Update Italian.properties (#3621)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Subcher <70058565+Subcher@users.noreply.github.com>
Co-authored-by: Johannes Schreiber <58529898+devbeutler@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-01 19:05:48 +02:00
7eeeee5212 Strength bonus from capital is now part of the Palace bonuses to make it moddable 2021-02-28 22:40:54 +02:00
ed8d642036 3.13.3-patch1 2021-02-27 23:47:08 +02:00
ff05fa601d Translations update (#3618)
* Translations update

* Minor changes to the translation
2021-02-25 19:01:58 +02:00
19c7a87371 Renamed "Siege" image to "Besiege" - #3617 2021-02-24 21:31:07 +02:00
0501261d21 Update Italian.properties (#3613) 2021-02-24 20:43:58 +02:00
e464ba5328 Map generation parameters are moddable, allowing players to create custom terrains for map generation! 2021-02-24 20:34:01 +02:00
ccae026df2 Resolved #1804 - Renamed "Siege" promotion to "Besiege". Closes #2458 2021-02-23 20:07:49 +02:00
c9a96358da Changed "Gold" resource to be called "Gold Ore" to not conflict with the yield type for translations - #2458 2021-02-23 20:05:00 +02:00
4bd40125b0 All resource stats from buildings converted to building uniques 2021-02-22 23:00:48 +02:00
0ef44fc4da Changed deprecated StringBuilder.appendln with .appendLine 2021-02-22 21:13:16 +02:00
b7c25f30e5 3.13.2 2021-02-20 23:26:52 +02:00
40a59782d0 Translations update (#3612)
* Update German.properties (#3611)

* Added Dutch translations (#3599)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

Line 561 misspelled [attacker]

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update TechPickerScreen.kt

Changed the current tech color from a grey color to a more distinguishable blue color.

* Update TechPickerScreen.kt

Co-authored-by: SRS <deringenieur71@gmail.com>
Co-authored-by: Louis Deconinck <louis.dck@gmail.com>
2021-02-20 23:08:20 +02:00
36949410a7 Resolved #3586 - Added 'Destroy' translation for capturing cities in one-city challenge 2021-02-18 13:20:49 +02:00
fda3c1053d 3.13.1 2021-02-16 20:24:50 +02:00
1b45f93b16 Translations update (#3602)
* Update Czech.properties (#3597)

* Update Czech.properties

new strings, american and japan diplomacy

* Update Czech.properties

fixed param typo

* Update Malay.properties (#3596)

Translate some of the tutorial phase, dialogues and other in-game selection buttons.

* Update Italian.properties (#3594)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SNN95 <41881544+SNN95@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-02-16 20:19:45 +02:00
1e981abe53 Display scroll position on minimap (#3593) 2021-02-14 11:48:57 +02:00
f2af128546 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-13 21:53:12 +02:00
48a330fddc 3.13.0 2021-02-13 21:52:33 +02:00
75ef42f31e Update Italian.properties (#3589) 2021-02-13 21:51:13 +02:00
e92a1dd088 Better tech descriptions for increased improvement stats 2021-02-12 14:13:11 +02:00
8b1778eea3 Removed Scenario Maps entirely - was not a well thought-out concept and caused more confusion than actual fun.
Case in point - 0 mods are Scenario mods.
2021-02-11 22:33:52 +02:00
74cc421b62 3.12.14 2021-02-09 23:17:42 +02:00
ae3e6524f5 Translations update (#3588)
* Update Simplified_Chinese.properties (#3585)

* Update Simplified_Chinese.properties

* fix

fix case problem

* Update Italian.properties (#3581)

* Update Portuguese.properties (#3580)

* Update Portuguese.properties

* Update Portuguese.properties

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

Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Tiger13p <58396220+Tiger13p@users.noreply.github.com>
2021-02-09 23:07:18 +02:00
5328efa233 Updated to latest LibGDX and Kotlin versions 2021-02-06 23:25:48 +02:00
71266b213e 3.12.13 2021-02-06 22:39:36 +02:00
3d683c767a Added "Consumes [amount] [resourceName]" unique for buildings 2021-02-06 21:12:44 +02:00
b0bf18afa0 Added custom victory conditions 2021-02-05 16:06:58 +02:00
84c200bd32 New cityFilter for cities connected to capital 2021-02-05 15:34:20 +02:00
1e6c8dacff Deprecated old uniques 2021-02-05 12:22:47 +02:00
45b43849bd Resolved #3578 - More readable colors for Korea civ, kudos @ravignir 2021-02-05 10:27:31 +02:00
1ada5aff43 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-05 10:15:55 +02:00
679ca2ba6c changed case sensitivity (#3577)
somehow I forgot to change most of the texts
2021-02-04 21:50:44 +02:00
b0c9c797f6 3.12.12 2021-02-04 20:18:14 +02:00