Commit graph

3304 commits

Author SHA1 Message Date
Marerjh
02f57b4b09 Update Nations_Ukrainian.json (#1698)
* Update Nations_Ukrainian.json

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Ukrainian.properties
2020-01-16 22:08:52 +02:00
rayray61
21e47741fe Patch 1 (#1705)
* Create Turkish.properties

* Update Turkish.properties

* Update completionPercentages.properties

* Update completionPercentages.properties

* Update Turkish.properties
2020-01-16 14:28:11 +02:00
lyrjie
d3e88906d6 Fix: starting units being able to spawn on Ancient Ruins/Barbarian encampments (#1691)
* Fix: starting units being able to spawn on Ancient Ruins/Barbarian encampments

* Added doc and commentary
2020-01-16 12:06:43 +02:00
Yair Morgenstern
90abfda3a4 3.5.3 2020-01-15 23:57:52 +02:00
Yair Morgenstern
5af6dd1ad5 More resource images by The Bucketeer 2020-01-15 23:56:02 +02:00
Oleg
7b87ad01ef Update Russian.properties (#1702)
Fixed translation
2020-01-15 23:26:04 +02:00
Smashfanful
dc7b1464d3 Update Italian.properties (#1695) 2020-01-15 23:25:11 +02:00
Yair Morgenstern
c1c6f93f6d Ancient ruins are no longer save-scummable 2020-01-15 22:21:00 +02:00
Yair Morgenstern
b73e7100c0 Resolved #1700 - As per original civ, you no longer start with a scout. 2020-01-15 22:11:05 +02:00
lyrjie
ad1a57dd02 Map reveal after singleplayer defeat (#1681)
* Added map reveal when the player is defeated in singleplayer

* Added victory (actually defeat) screen when the player is defeated

* Moved the victory screen navigation to an appropriate place

* Moved the map reveal logic to WorldMapHolder

* Tutorials and Diplomacy button are hidden after the defeat
2020-01-15 19:56:01 +02:00
Timo T
8e12e059ac Fix meaning of work boat capability translation (#1694)
"May create improvements on water resources" was translated as if it was "May create improvements on water tiles". I fixed this so the translation is correct now
2020-01-14 18:46:46 +02:00
lyrjie
0a12062c70 Fix: "Pick construction" tutorial never completes (#1693) 2020-01-14 15:28:18 +02:00
lyrjie
81258297d5 Fix: ability to buy the same building multiple times (#1692) 2020-01-14 15:21:12 +02:00
Yair Morgenstern
525b67c7c6 3.5.2 2020-01-13 19:21:12 +02:00
armandberger
ce5afae215 new french translation (#1688) 2020-01-13 19:03:13 +02:00
Horațiu Mlendea
4886e2f259 Romanian translations (#1677)
* Update Romanian.properties

* More romanian translations

* Update Romanian.properties

* Update Romanian.properties

* Update Romanian.properties

* Fix
2020-01-13 19:02:58 +02:00
Oheto
32772919d0 Update Russian.properties (#1668)
* Update Russian.properties

* Update Russian.properties
2020-01-13 19:02:25 +02:00
Federico Luongo
f118be5d40 Adopted JSONC standard for assets files (#1674)
* Adopted JSONC standard for assets files

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Normalized Nations_Ukrainian too

Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
2020-01-13 19:01:27 +02:00
lyrjie
2d0aec5a26 Fix: idle units not being properly selected after settling a city (#1685)
Closes #1682
2020-01-13 13:29:38 +02:00
NoNZeeZ
4f0435bdc6 Create Tutorials_Thai.json (#1683)
I still waiting for thai language release in someday. So sad man TT
2020-01-13 12:32:58 +02:00
Duan Tao
72df6869a3 Make sure all building be built before producting science. (#1678) 2020-01-13 12:06:19 +02:00
Yair Morgenstern
9a426318ba Proper destruction notification for city states
Added Fur resource image
2020-01-13 00:09:09 +02:00
JackRainy
0d889989c6 Improved Ukrainian translations (#1673)
* Improved Ukrainian translations

* Minor corrections
2020-01-12 23:35:57 +02:00
Federico Luongo
5e003cfd64 Fix Map Editor Lag (#1670)
In painting mode, only the last drawn tiles are updated.
2020-01-12 23:29:26 +02:00
Horațiu Mlendea
aad18f29c8 Romanian translations (#1659)
* Update Romanian.properties

* More romanian translations
2020-01-12 23:27:28 +02:00
JackRainy
de7a369131 Fix of the Regex expression to heal after the battle (#1676) 2020-01-12 23:24:00 +02:00
Yair Morgenstern
08218b954e healUnit and tryPillageImprovement in BarbarianAutomation use their counterparts from UnitAutomation, because they're basically exactly the same 2020-01-12 23:21:34 +02:00
JackRainy
8a327fa7be Fix for the "Back button can't end Unciv (#1513)" (#1661)
* Callback to exit the game by 'Back' button

* Prompt dialog for the game exit

* Additional strings for translations are generated

* Do not show exit prompt dialog twice
2020-01-12 23:05:49 +02:00
Yair Morgenstern
ca59dc4e1f Removed redundant "else"s for less indentation and 'happy pathing' 2020-01-12 20:52:23 +02:00
Vladimir Tanakov
725edc2a31 Better barbarian automation (#1560) 2020-01-12 20:48:34 +02:00
Oheto
02ec64f14f Update Ukrainian.properties (#1667)
* Update Ukrainian.properties

«Кіннота» is more ukrainian word then «Кавалерія»

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties
2020-01-12 08:44:09 +02:00
Smashfanful
011368571c Update Italian.properties (#1666)
* Update Italian.properties

* Update Italian.properties
2020-01-12 08:42:20 +02:00
lyrjie
5c6ae7c123 Added tests for development-only toggles (#1655)
* Added tests for development-only toggles

* Revert "Added tests for development-only toggles"

This reverts commit eee4de78

* Added the `rewriteTranslationFiles` check to debug test
2020-01-11 23:17:13 +02:00
JackRainy
109b60db2c Disable France culture boost after Steam Power research (#1663) 2020-01-11 22:59:45 +02:00
r3versi
51ecb0e99d Legalism grants Culture Buildings asap (#1658)
* Legalism grants Culture Buildings asap

* Buildings granted by Legalism cost no maintenance
2020-01-11 22:52:58 +02:00
r3versi
a1b03849ec Fix city screen (#1657)
* Last CityScreen fix

* Atlas & Translations
2020-01-11 22:46:17 +02:00
lyrjie
c37ea14df5 Defeat improvements (#1654)
* Fix: civilization not being destroyed when disbanding the initial settler

* Fix: destroyed unit providing visibility until the end of the turn
2020-01-11 22:33:27 +02:00
Vladimir Tanakov
fd5d38fb01 Fix issue when city can not bombard enemy (#1644) 2020-01-11 22:11:20 +02:00
Yair Morgenstern
857763654f Merge branch 'master' of https://github.com/yairm210/Unciv 2020-01-11 21:54:00 +02:00
Yair Morgenstern
2b56cf8a87 3.5.1 2020-01-11 21:49:12 +02:00
Smashfanful
759ab09293 Update Nations_Italian.json (#1660) 2020-01-11 21:41:31 +02:00
Mtroga
7a3401c202 Update Romanian.properties (#1652)
I am translated some words and sentences, but when i will play constantly the game i will watch the context of those words and i will change with the correct version of each words in the game context.
2020-01-11 21:41:19 +02:00
F4R3LB3ST
dde4488cdd Update Indonesian.properties (#1653)
Tradition complete
2020-01-10 13:54:34 +02:00
r3versi
2daf27278d WIP Construction Queue (#1648)
* Construction Queue

* Added constructionQueue in addition to currentConstruction: if currentConstruction is done, next construction from Queue is started; if Queue is empty invoke ConstructionAutomation
* Queue utility methods: add, remove, higher prio, lower prio
* Icons to move constructions in queue
* Top left city stats moved to top right panel
* Added current construction and queue construction to top left
* Extended selected construction (containing description) moved to bottom right, it is now displayed alternatively to selected tile
* Max queue size, cannot change queue in puppet city or in other player turn
* Queue and current construction reset on puppeting city

* Cleanup again

* CityStatsTable is a separate class so we can play around with where it's located with minimal code changes

* Rejection reason wrap & removing nothing on enqueue a construction

* Crude UI proposal

* Tutorial updates for queues

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-10 11:41:43 +02:00
r3versi
12a98aa4bb City construction queue (#1479)
* Construction Queue

* Added constructionQueue in addition to currentConstruction: if currentConstruction is done, next construction from Queue is started; if Queue is empty invoke ConstructionAutomation
* Queue utility methods: add, remove, higher prio, lower prio
* Icons to move constructions in queue
* Top left city stats moved to top right panel
* Added current construction and queue construction to top left
* Extended selected construction (containing description) moved to bottom right, it is now displayed alternatively to selected tile

Rework

* Max queue size, cannot change queue in puppet city or in other player turn

* Queue and current construction reset on puppeting city

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-09 20:58:15 +02:00
Yair Morgenstern
977fcfb97e Code cleanup - when{} instead of if-else chains, toLabel() instead of Label(...) 2020-01-09 20:54:33 +02:00
lyrjie
ba324c9fad Added the "crudely-drawn map" to ancient ruins outcomes (#1645)
* Added the "crudely-drawn map" to ancient ruins outcomes

Closes #1640

* Extracted the constants for readability

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-09 20:40:59 +02:00
Smashfanful
0aa2061637 Update Italian.properties (#1647)
* Update Italian.properties

Fix

* Update Italian.properties

Fix, again
2020-01-09 20:40:49 +02:00
Oheto
8b44ffcd0e Update Nations_Ukrainian.json (#1641) 2020-01-09 20:29:23 +02:00
drwhut
b1b82c6a67 Fixed a bug where the growth bar's height exceeded the group. (#1646)
This happened on the turn that a city was taken.
2020-01-09 20:18:37 +02:00