Commit graph

1530 commits

Author SHA1 Message Date
Teague Lander
ac8a1f144b Add specialist slot tooltip for buildings that provide them (#1776)
* Add specialist slot tooltip for buildings that provide them
 - #1762

* Remove duplicate translations
2020-01-27 08:33:10 +02:00
stoupa007
7b5e1e3cbf Update Czech.properties (#1783)
Fixed some most glaring typos.
2020-01-26 22:55:49 +02:00
Freshy
24520aa00c Completed translation (#1780) 2020-01-26 21:29:31 +02:00
rayray61
7c441e8e48 Update Turkish.properties (#1777) 2020-01-26 21:29:17 +02:00
The Bucketeer
9dded56813 Trad. Chinese Translation update (#1778)
Added all current missing translations, as well, some edits on some translations. (•ω•)

(by GeneralWadaling/ The Bucketeer)
2020-01-26 21:29:02 +02:00
Smashfanful
84b822aaac Update Nations.json (#1770)
* Update Nations.json

Added Lhasa, Vancouver, M'Banza-Kongo and Mogadishu

* Update Nations.json
2020-01-26 21:26:47 +02:00
Teague Lander
30a50a8c6b Add missing Forge and Seaport production bonus uniques (#1773)
* Add missing Forge and Seaport production bonus uniques
 Parital fix for #1762
 - Forge gets "+15% production of land units"
 - Seaport gets "+15% production of naval units"

* Adds missing translation "+15% production of land units"
2020-01-26 20:17:26 +02:00
Yair Morgenstern
ae8fdb3b7d "Must be within 2 spaces of mountain" for Neuschwanstein and Macchu Pichu - #1762 2020-01-25 20:35:33 +02:00
Yair Morgenstern
ed222a7839 Translation template fixes 2020-01-25 20:31:35 +02:00
Yair Morgenstern
f0372ea9ec 3.5.6 2020-01-25 20:28:30 +02:00
Coruna
0bcd213c3f Update German.properties (#1772) 2020-01-25 19:52:17 +02:00
Smashfanful
cbc92a753c Update Italian.properties (#1769) 2020-01-25 19:52:04 +02:00
rayray61
4bbc8fe08f Update Turkish.properties (#1765) 2020-01-25 19:51:51 +02:00
Marerjh
8469956f91 Update Ukrainian.properties (#1761)
* Update Ukrainian.properties

* Update template.properties

* Update Ukrainian.properties

* Update ConstructionsTable.kt

* Update CityInfoTable.kt

* Update Ukrainian.properties

* Update Ukrainian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-25 19:47:38 +02:00
armandberger
d39b255b54 new french translations (#1760) 2020-01-25 19:46:06 +02:00
tianshidoubi
b3e95cb115 Update Simplified_Chinese.properties (#1756)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-25 19:45:47 +02:00
JackRainy
e0a00eb9a5 Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions (#1754)
* Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions

* Template for the translation strings

* New icons are added

Co-authored-by: ltrcao <ltrcao@users.noreply.github.com>
2020-01-25 19:43:53 +02:00
Yair Morgenstern
e9a6fd86f9 Added 'mountain within 2 tiles' restriction to Machu Picchu as per #1762 2020-01-23 23:44:25 +02:00
Yair Morgenstern
c29ccadc60 Exploring units no longer auto-enter city states 2020-01-23 20:50:53 +02:00
lishaoxia1985
42e16ec80a Now we and AI can sign research agreement. (#1671) 2020-01-23 20:12:24 +02:00
Freshy
e4308f947e Little correction od my mistake (#1748) 2020-01-22 18:34:02 +02:00
lyrjie
66c61541a3 Russian translation update (#1745)
Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
2020-01-22 18:33:42 +02:00
Marerjh
648075c89b Update Ukrainian.properties (#1749) 2020-01-22 18:33:25 +02:00
Smashfanful
9f4eb9eff0 Update Italian.properties (#1750)
* Update Italian.properties

Added new translation lines in game

* Update Italian.properties
2020-01-22 18:33:04 +02:00
rayray61
64a1db64c9 Update Turkish.properties (#1752) 2020-01-22 18:32:22 +02:00
tianshidoubi
4446f018d5 更新 (#1751)
更新了地名,以及工程列表和一些小杂项【顺带一提,perlin是什么意思我真搞不懂】
2020-01-22 18:32:02 +02:00
lyrjie
9e0ed36bba Map editor menu (#1739)
* Refactor: map size is enum

* Feature: map editor menu

* Cleanup

* Added "Empty" map generation type for the map editor
2020-01-22 13:10:39 +02:00
Freshy
45dc3d3587 Completed and corrected translation (#1743)
Some of the Polish words were wrong, so I corrected them and named some stuff the way it's called in Civilization V.
2020-01-21 21:57:56 +02:00
Yair Morgenstern
8508362496 3.5.5
Fixed problem with the Manila translation
2020-01-21 21:17:05 +02:00
JackRainy
78d0c84cc1 Corrections to Ukrainian translations (#1721)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-21 21:03:39 +02:00
Yair Morgenstern
7ea6fc2551 Added 4-way tile images (base,feature,improvement,resource) by The Bucketeer
Fixed some issues with existing tile images
2020-01-21 21:02:11 +02:00
Smashfanful
fb51f89f6d Update Italian.properties (#1737) 2020-01-21 20:03:01 +02:00
Oleg
88ca14fac4 Update Russian.properties (#1730)
* Update Russian.properties

small fix

* Update Russian.properties
2020-01-21 20:02:04 +02:00
Yair Morgenstern
5c42e7f1fb New translations 2020-01-20 23:28:52 +02:00
JackRainy
1441dd49f5 Aircraft carrier is added (#1731)
* Implemented aircraft carrier by @ltrcao in PR #1723

* New icon for the Carrier unit
2020-01-20 22:53:59 +02:00
Marerjh
43e9ee112e Update Ukrainian translation + Missing translations (#1714)
* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Tutorials_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Ukrainian.properties

* Update template.properties

Missing translations
2020-01-19 22:02:09 +02:00
Yair Morgenstern
f154ac1d6d 3.5.4 2020-01-19 21:58:38 +02:00
Smashfanful
f47df6d8b2 Update Italian.properties (#1716) 2020-01-19 21:45:31 +02:00
uvehj
7a0afc5c33 Update Spanish.properties (#1709) 2020-01-19 21:43:51 +02:00
LeMoonStar
f7eb5f5aa4 fixed typo in German sheep translation (#1717)
* added German error message translation

* fixed typo in German sheep translation
2020-01-19 21:43:40 +02:00
armandberger
4a5e15f094 small mistake correction (#1706) 2020-01-19 21:43:09 +02:00
Yair Morgenstern
32ba55b2fe Added many more resource+improvement images 2020-01-18 22:35:18 +02:00
Yair Morgenstern
02def2ffa9 Resource+Improvement is go!
Added resource-specific plantations by The Bucketeer
2020-01-17 15:07:47 +02:00
SheepYang
db5c7234f3 simplified Chinese translations (#1707)
* simplified Chinese translations

* simplified Chinese translations
2020-01-17 14:30:50 +02:00
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
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
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
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
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
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
Horațiu Mlendea
aad18f29c8 Romanian translations (#1659)
* Update Romanian.properties

* More romanian translations
2020-01-12 23:27:28 +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
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
r3versi
a1b03849ec Fix city screen (#1657)
* Last CityScreen fix

* Atlas & Translations
2020-01-11 22:46:17 +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
r3versi
065e944896 Songhai (#1636)
* Songhai, Burial Tomb, Gold for capturing city

* Burial Tomb unique: double gold gained when city is captured

* Rebuilt Atlas and Translations

* Italian translation + fix missing translations

* Barbarian Camp Reward

Is now modified by Speed and Difficulty
2020-01-09 19:23:00 +02:00
armandberger
64a8a137be one french translation (#1629) 2020-01-09 00:18:10 +02:00
Yair Morgenstern
f554d8c2c4 Multiple mods work OK! 2020-01-07 19:50:36 +02:00
Smashfanful
aa3af7e42a Update Tutorials_Italian.json (#1632) 2020-01-07 19:18:47 +02:00
JackRainy
2c30348168 Improved translations for Ukrainian and Russian languages (#1631) 2020-01-07 19:09:26 +02:00
Yair Morgenstern
4f2e9966b6 Revert "Update Nations_Ukrainian.json (#1627)"
This reverts commit 06c23c10dc.
2020-01-07 19:09:08 +02:00
Oheto
06c23c10dc Update Nations_Ukrainian.json (#1627)
some cities
2020-01-07 19:08:11 +02:00
Yair Morgenstern
99e3ebed67 The mod now has its own own git repo =) 2020-01-07 18:52:58 +02:00
Yair Morgenstern
1008e9c4f6 More resource images by The Bucketeer 2020-01-06 23:01:18 +02:00
Yair Morgenstern
3851440ede Added credits to example mod, cause if you're setting an example... 2020-01-05 23:08:43 +02:00
Yair Morgenstern
285c92150c Incan mod is successful! We can haz mods! =D 2020-01-05 22:55:48 +02:00
Yair Morgenstern
7462aae94c Big changes to mods and rulesets - almost production ready!
Rulesets are heavy to load so we now have a RulesetCache, which can construct "custom" rulesets with a list of mods!
We now pack mod images on Desktop run, and load the atlases for the loaded mods on load game!
2020-01-05 22:11:10 +02:00
Yair Morgenstern
6a9de727ad misc. so they don't get in the way of the main work 2020-01-05 21:45:09 +02:00
Oheto
43d68c2638 Update Russian.properties (#1622) 2020-01-05 19:00:40 +02:00
Oheto
f7005bf063 Update Ukrainian.properties (#1621) 2020-01-05 16:02:11 +02:00
Oheto
97d40f882f Update Ukrainian.properties (#1620) 2020-01-05 16:01:55 +02:00
Lau1406
8443900c02 Dutch (#1619)
* Update Dutch.properties

* Update Dutch.properties

Corrected mistake

* Finish Dutch translations for 'Tutorial tasks'
2020-01-05 12:49:50 +02:00
Smashfanful
339d3ca510 Update Nations_Italian.json (#1617)
Spain Civilization fix
2020-01-05 10:08:08 +02:00
Yair Morgenstern
7eb4b0db2d 3.4.8 2020-01-04 21:26:33 +02:00
RadioMagnetofonStereofoniczny
52ef60660b Update Polish.properties (#1616) 2020-01-04 21:14:27 +02:00
F4R3LB3ST
9e28228e64 Update Indonesian.properties (#1615)
- Save game menu completed
- Notification completed
- World Screen UI completed
- Victory half completed
- by OkutaJager~
2020-01-04 21:14:04 +02:00
Oleg
d667638293 Update Tutorials_Russian.json (#1610)
fixed errors
2020-01-04 21:00:39 +02:00
Oleg
40b9e7d75b Update Russian.properties (#1609)
Fixed errors
2020-01-04 21:00:30 +02:00
armandberger
0dbe78b0eb new french translations (#1606) 2020-01-04 21:00:07 +02:00
Oheto
ca5cc57315 Update Russian.properties (#1602) 2020-01-03 10:33:16 +02:00