wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3682 commits 7 branches 304 tags 288 MiB
Commit graph

1909 commits

Author SHA1 Message Date
Prosta4okua
a5c9895ef5
Update Nations_Ukrainian.json (#1897) 
* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json
 2020-02-10 18:27:31 +02:00
Freshy
c2d29db09f
Completed and corrected translation (#1895) 2020-02-10 18:27:08 +02:00
paontv
7228d735c6
Update Japanese.properties (#1893) 
* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties
 2020-02-10 18:24:44 +02:00
Smashfanful
214730a71c
Update Italian.properties (#1890) 
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-02-10 18:24:17 +02:00
Federico Luongo
6d2cf860a7 Reset advanced settings to default (#1894) 
* Reset to default

* Translations
 2020-02-10 10:25:48 +02:00
Yair Morgenstern
26affe7943
Translation (#1878) 
* Update Nations_Italian.json (#1864)

* Update Japanese.properties (#1867)

* 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 Japanese.properties

* Update Thai.properties (#1871)

I'm back!!

* Update German.properties (#1873)

Revised promotions

* Update German.properties (#1874)

added missing unit translations

* Update Italian.properties (#1875)

Typo fix

* Update Nations_Russian.json (#1877)

* rfe

* Update Nations_Russian.json

* Update Nations_Russian.json

* Update Russian.properties (#1876)

* Translation roundup + added Mongolian civ translations

* Update Russian.properties (#1879)

Mongolia update

* Additional translation strings related to the custom map settings (#1881)

* Diplomacy screen: Secondary relationships line is added (#1880)

* Additional translation strings

* Update Japanese.properties (#1883)

* Update Japanese.properties

* Update Japanese.properties

* Update to Ukrainian translations + fix of the translation call (#1888)

* Final touches before version

Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
 2020-02-09 20:29:34 +02:00
BeeWall
ddf86ecf2f
Add support for loading mods on Android (#1825) 
* Add support for loading mods

* Move mod folder copying into its own function

* Only request permission to read storage, not write

* Only allow mods on KK+ (removes storage permission)
 2020-02-09 10:28:31 +02:00
Federico Luongo
edf0294dfd
Mongolia (#1855) 
* Mongolia

* Translation & Atlas

* Remove debug option

* Remove erroneous import

* Promotions.addXP

* Khan heals 15 HP

* XP bonus fix

* Added 'Mongol Terror' which is the term used for the mongolian combat bonus

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-02-08 20:51:21 +02:00
Yair Morgenstern
5ee882c20d
Translations (#1863) 
* Add japanese translations (#1854)

* Terrains, Resources, Units japanese translate.

* Add some translate.

* Add technology translation.

* Update Japanese.properties (#1860)

* Update Japanese.properties

Second half

* Update Japanese.properties

* Update Japanese.properties

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

* Create Nations_Japanese.json, and add translation a little (#1861)

* Update German.properties (#1862)

Added technology quotes and revised translation

* Autocleanup

Co-authored-by: pekomiya <hongu.yk@gmail.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
 2020-02-06 22:35:13 +02:00
Yair Morgenstern
44777b8b30
Translations (#1848) 
* added some translations (#1832)

* new french translations (#1833)

* Completed translation (#1834)

* Update Italian.properties (#1840)

Also added a new translation line

* Update Ukrainian.properties (#1845)

Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>

* rewrite

Co-authored-by: LeMoonStar <webmaster@unitcore.de>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
 2020-02-04 23:12:31 +02:00
Yair Morgenstern
eb1ce0f6cb Resolved #1457 - no AI trades are 'automatically accepted', they all require an active decision of the proposed side and will only happen on their turn 2020-02-04 16:13:37 +02:00
Yair Morgenstern
a73fe3d9de Tile update by The Bucketeer 2020-02-02 18:31:45 +02:00
Yair Morgenstern
ef19775545 More translation related stuff that I forgot =/ 2020-02-02 18:00:08 +02:00
Yair Morgenstern
352e4e8939
Translation (#1829) 
* Update German.properties (#1819)

Added city states, some notifications and revised translations

* Update Czech.properties (#1824)

translated missing strings (carriers, settings, some miscellaneous items)
fixed naming of promotions to correct terminology (military) and synced with descriptions

* Update Italian.properties (#1815)

* Create Japanese.properties (#1803)

* Create Japanese.properties

* Update Japanese

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update

* 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 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

* Added Japanese flag icon

Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
 2020-02-02 16:23:20 +02:00
JackRainy
db5cc82ec7
"Sleep until healed" functionality (#1821) 
* "Sleep until healed" functionality

* Unit test for actions translations is added

* "Fortify until healed" functionality

* Refactoring
 2020-02-02 09:55:10 +02:00
Yair Morgenstern
d7310aa90a typo fix withing -> within 2020-01-31 14:17:38 +02:00
Yair Morgenstern
e69f092d3a 3.5.8 2020-01-30 21:03:03 +02:00
Yair Morgenstern
3214bfbbfa
Translations update (#1809) 
* Update Turkish.properties (#1799)

* Update German.properties (#1807)

* Improved translations for Ukrainian and russian languages (#1802)

* Chinese translation update. delete some old code about "Scientific Revolution" because its effort has changed. (#1805)

Co-authored-by: lyrjie <lyrjie@gmail.com>

Co-authored-by: rayray61 <54810477+rayray61@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: lyrjie <lyrjie@gmail.com>
 2020-01-30 20:33:19 +02:00
Yair Morgenstern
267c98be55 Resolved #1757 - Can now see version when running from a desktop Jar 2020-01-29 21:45:44 +02:00
Yair Morgenstern
d22b3acbb3 3.5.7 2020-01-27 22:59:39 +02:00
stoupa007
12780afde4 Update Czech.properties (#1793) 
Translated missing texts (production queue, spain, natural wonders, diplomacy, events), some typo fixes and improvements.
 2020-01-27 22:55:45 +02:00
Smashfanful
f4727bf02b Update Italian.properties (#1790) 
Also preparing for the Mongolian units
 2020-01-27 22:08:38 +02:00
rayray61
4861f499b8 Update Turkish.properties (#1791) 2020-01-27 22:08:10 +02:00
Freshy
057e933114 Small corrects (#1792) 2020-01-27 22:07:56 +02:00
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
CaptainKlutz
a2ee0ca4e1 Rework existing ship sprites, and add a sprite for Carrier (#1771) 
* Upload carrier FH sprite

* Update Battleship and Destroyer FH sprites

* Make unfarmed wheat look wilder
 2020-01-25 19:58:57 +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
Yair Morgenstern
ce50828cdb 3.5.5-patch1 2020-01-22 19:09:16 +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
Yair Morgenstern
e6e6ed0aa4 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-01-09 00:40:41 +02:00
Yair Morgenstern
3fda35138b 3.4.9 2020-01-09 00:32:39 +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
365dced442 Non-continuous rendering isn't quite ready yet 2020-01-06 09:47: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
Yair Morgenstern
9907e4429c Removed game settings from crash report, not very helpful 2020-01-03 15:20:38 +02:00
Oheto
ca5cc57315 Update Russian.properties (#1602) 2020-01-03 10:33:16 +02:00
r3versi
a1b0c1dcd4 TileMapHolder refactor & Map Editor update (#1584) 
* TileMapHolder renamed to MapHolder
* EditorMapHolder and WorldMapHolder inherits from ZoomableScrollPane
* MapEditor Brush Size (from 1 to 5)
* MapEditor painting mode (dragging the pointer on screen paints continuously)
 2020-01-02 20:02:38 +02:00
Yair Morgenstern
908c6ad54a 3.4.7 2020-01-02 19:42:52 +02:00
hyunamae
d254838278 Update Indonesian.properties (#1597) 
Added Translation on Tech Names by Aikuu ✨
 2020-01-02 19:02:34 +02:00
Marerjh
3b334f528b Update Nations_Ukrainian.json (#1592) 2020-01-01 16:50:12 +02:00
F4R3LB3ST
d642331ec9 Update Indonesian.properties (#1591) 
* Update Indonesian.properties

tutorial completed

* Update Indonesian.properties

* Update Indonesian.properties

more translated

* Update Indonesian.properties

more and more translation
 2020-01-01 16:49:00 +02:00
Marerjh
0eaf630c53 Update Nations_Ukrainian.json (#1590) 2019-12-31 20:22:53 +02:00
Marerjh
68ccaee890 Update Ukrainian Translation (#1589) 
* Update Ukrainian.properties

* Update Ukrainian.properties
 2019-12-31 19:39:01 +02:00
hyunamae
f354663971 Update Indonesian.properties (#1588) 
Fixing some typo and mistranslation
 2019-12-31 18:01:38 +02:00
RadioMagnetofonStereofoniczny
0167c635d3 Well.. (#1587) 2019-12-31 17:50:03 +02:00
Smashfanful
89d2886294 Update Italian.properties (#1586) 2019-12-31 15:58:37 +02:00
Oleg
9fb5031415 Update Ukrainian.properties (#1582) 
* Update Ukrainian.properties

Added translations

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties
 2019-12-31 15:57:49 +02:00
F4R3LB3ST
8cf56781ac Update Indonesian.properties (#1585) 
the tutorial is half done, cuz my brother keeps forcing me to stop
 2019-12-31 15:57:42 +02:00
Oleg
b457d9d2c8 Update Russian.properties (#1581) 
Added translations.
 2019-12-31 13:58:13 +02:00
RadioMagnetofonStereofoniczny
74a4fc9155 Update Nations_Polish.json (#1583) 2019-12-31 13:57:57 +02:00
RadioMagnetofonStereofoniczny
545d44311d Update Polish.properties (#1580) 2019-12-31 13:57:37 +02:00
Yair Morgenstern
61050feca1 3.4.6 2019-12-30 18:36:05 +02:00
r3versi
7b7ad9ecc7 Missing translations (#1578) 2019-12-30 18:19:15 +02:00
Oleg
3bb762cf39 Update Tutorials_Russian.json (#1577) 
* Update Tutorials_Russian.json

Fixed errors and all translated
220 line I'm don't know how сorrectly translate 'Puppeting the city' -> 'Делание города марионеткой' or 'Замарионетивание города'
And,maybe, i'm didn't correctly translate 'idle' -> 'простой'

* Update Tutorials_Russian.json
 2019-12-30 18:18:58 +02:00
Marerjh
9b63c4ee3b Update Nations_Ukrainian.json (#1576) 2019-12-30 18:18:37 +02:00
Marerjh
a1093c1bb6 Update Ukrainian.properties (#1575) 
* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2019-12-30 18:18:13 +02:00
armandberger
6428d68255 new french translation (#1574) 2019-12-30 18:17:06 +02:00
Oleg
37624bcaec Update Russian.properties (#1573) 
* Update Russian.properties

141-1617 Fixed errors and added translations.
1417 Untranslateble thing .

* Update Russian.properties
 2019-12-30 18:16:47 +02:00
Oleg
c2c5e1f010 Update Russian.properties (#1572) 
1-140 line - fixed errors in words
141 line - Wat is untranslatable thing so I change Roman alphabet on Cyrillic alphabet .
I'm will continue tomorrow.
 2019-12-30 18:16:30 +02:00
lyrjie
cedb6ff5e3 Added the notification for the third-party civilizations (#1558) 
* Added the notification for the third-party civilizations

If a civilizations knows about some two civilizations, it will be notified when:
* They declare the war
* They make a peace
* They sign the declaration of peace
* One denounce the other

Additionally, when civ enters a new era, all civs that know about it get a notification

* Fixed the translation `.properties`

* Cleanup

* Fix: 2 notifications for each peace treaty

Russia and America...
America and Russia...

* Typo

* Code style changes

* Resolved conflicts

* Simple getCommonKnownCivs() tests
 2019-12-30 18:12:14 +02:00
RadioMagnetofonStereofoniczny
1f3c1b013c Update Tutorials_Polish.json (#1571) 2019-12-29 18:59:14 +02:00
RadioMagnetofonStereofoniczny
4470bcb185 Update Polish.properties (#1570) 2019-12-29 18:56:38 +02:00
Yair Morgenstern
ca8de2e379 Latest images 2019-12-29 18:02:10 +02:00
Yair Morgenstern
006b2d7690 External merge resolve of #1566 
Merge branch 'spain' of https://github.com/r3versi/Unciv into r3versi-spain
 2019-12-29 17:56:05 +02:00
Yair Morgenstern
7b8042ac8b Merge branch 'master' of https://github.com/yairm210/Unciv 2019-12-29 17:52:04 +02:00
Yair Morgenstern
4dd3a69a72 Can now display pixel resources on the map! 2019-12-29 17:51:39 +02:00
Marerjh
d981c393ce Update Nations_Ukrainian.json (#1568) 2019-12-29 17:47:17 +02:00
StepanIvasyn
57635da155 Update Ukrainian.properties (#1551) 
Update tutorial tasks
 2019-12-29 17:46:04 +02:00
Yair Morgenstern
050db70fff All nat wonders are go, courtesy of The Bucketeer! 2019-12-29 15:55:53 +02:00
Smashfanful
784b94742d Update Italian.properties (#1564) 2019-12-28 23:40:39 +02:00
Marerjh
aa9628fd60 Update Tutorials_Ukrainian.json (#1563) 2019-12-28 23:14:55 +02:00
r3versi
aa034d73c2 Fix natural wonders (#1550) 
* Natural Wonders Uniques

* Fix Natural Wonders in Map Editor

* Translation files

* Terrain uniques test

* GBR spawn update Fix #1552
 2019-12-28 23:11:37 +02:00
Marerjh
af610dd61a Update Ukrainian.properties (#1561) 2019-12-28 22:14:02 +02:00
Yair Morgenstern
e02038d4bf Fixed crashing bug from trying to move the the enemy unit instead of to the place to attack from 2019-12-28 21:15:57 +02:00
uvehj
a34e131baa Update Spanish.properties (#1555) 
Added missing quotes
 2019-12-28 19:10:46 +02:00
RadioMagnetofonStereofoniczny
4baf5416ce Update Polish.properties (#1559) 2019-12-28 19:08:02 +02:00
Yair Morgenstern
94ce264ad0 3.4.5 2019-12-27 14:22:33 +02:00
uvehj
b16b251078 Update Spanish.properties (#1549) 
Last missing translation :)
 2019-12-27 11:14:47 +02:00
RadioMagnetofonStereofoniczny
20a0a91d13 Create Nations_Polish.json (#1547) 2019-12-27 11:14:35 +02:00
Kickerapoo
fb7c9a2129 More things translated (#1548) 
An update
By kickerapoo
 2019-12-27 11:14:21 +02:00
Yair Morgenstern
80be3c276e Small steps towards mods 2019-12-27 00:15:42 +02:00
RadioMagnetofonStereofoniczny
4b15200487 Update Tutorials_Polish.json (#1546) 2019-12-26 21:13:27 +02:00
SirLantro
467bb01d9b Update Spanish.properties (#1545) 
+Tranlations added:
- Buldings
-- Stonehenge: 
-- Notre Dame
-- Great Wall
-- Machu Picchu

- Technologies:
-- All translation were added.
-- Mass Media: Quotation added and translated.
 2019-12-26 21:13:08 +02:00
RadioMagnetofonStereofoniczny
29c1ad2310 Update Polish.properties (#1544) 2019-12-26 19:20:34 +02:00
Prosta4okua
cc0d3912a7 Update Ukrainian.properties (#1543) 
* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties
 2019-12-26 19:20:08 +02:00
Smashfanful
258d813951 Update Italian.properties (#1536) 
How about this new popup message feature?
 2019-12-26 15:41:54 +02:00
Yair Morgenstern
eac9647829 Bahasa_Indonesia -> Indonesian, for uniformity among languages names 2019-12-26 14:52:16 +02:00
lyrjie
539758b905 Translation placeholder testing (#1542) 
* Added translation string placeholders test

* Fixed the placeholder typos in all translations

* [30] to 30 migration
 2019-12-26 14:39:15 +02:00
Yair Morgenstern
94f1b074c9 Indonesian is in and has a flag 2019-12-26 12:15:26 +02:00
Vladimir Tanakov
7f06ae0cce Refactor Tutorials and fix some issues, write tests (#1524) 2019-12-26 11:40:48 +02:00
lyrjie
0455c856a0 Russian translation update (#1539) 2019-12-26 11:36:08 +02:00
NoNZeeZ
32140b9112 Update Thai.properties (#1537) 
About thai language problem. Hmm I think most of thai people, Can use the context clue to understand the missing thai vowel. Did your encoding use UTF-8? Or is it the font that cause the problem?
 2019-12-26 11:35:48 +02:00
Kickerapoo
d823d3d664 Renaming Indonesian to BahasaIndonesia (#1538) 
Translating over 300+ lines
By Kickerapoo
 2019-12-26 11:17:10 +02:00
LeMoonStar
8e0d90ad8d added German error message translation (#1534) 2019-12-25 23:38:30 +02:00
r3versi
00f26b1510 Fix #1531 + Indonesian.properties added (#1532) 
* Fix #1531

* Requested on Discord

* Update Indonesian.properties

Co-authored-by: hyunamae <59202601+hyunamae@users.noreply.github.com>
 2019-12-25 23:37:49 +02:00
RadioMagnetofonStereofoniczny
dd1e8e02d4 Update Polish.properties (#1530) 2019-12-25 23:37:29 +02:00
Yair Morgenstern
81ccc09e5d Translation updates 2019-12-25 13:06:30 +02:00
Yair Morgenstern
3dfc6503a1 Mount Fuji artwork by The Bucketeer means it's now in the game! 2019-12-25 13:01:29 +02:00
Ping2
8d6a791a74 Update Portuguese.properties (#1527) 2019-12-25 11:03:13 +02:00
lyrjie
2c07bae6f2 Fix: barbarians won't enter tiles owned by other civs (#1523) 
* Fix: barbarians won't enter tiles owned by other civs

* Barbarians ability to enter player tiles is now affected by difficulty setting
 2019-12-24 23:43:26 +02:00
Smashfanful
95e74f6355 Update Nations_Italian.json (#1526) 2019-12-24 16:11:23 +02:00
Smashfanful
7873df2802 Update Italian.properties (#1525) 2019-12-24 15:48:19 +02:00
Yair Morgenstern
97f3260047 Grand Mesa artwork by The Bucketeer means it's now in the game! 2019-12-24 15:28:59 +02:00
Smashfanful
e0fb6cd39d Update Italian.properties (#1520) 
Updates
 2019-12-24 12:46:26 +02:00
armandberger
e7bb2d2f02 new french translations (#1521) 
everywhere  tiles is now "cases"
 2019-12-24 12:46:16 +02:00
r3versi
b6dbc3a833 Fix nat wonder #2 (#1519) 
* Fix Natural Wonders tile worked happiness not computed & double bonus from discovering extended (like GBR) Natural Wonder in same turn

* Bugfix Barbarians spawning on Natural Wonder + Notification on Barbarian Spawn

* Added notification text to ranslations
 2019-12-23 23:55:19 +02:00