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

2066 commits

Author SHA1 Message Date
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
Ping2
13d11f02ca Update Portuguese.properties (#1517) 
Hey, I hope this is ok! I don't know if you have any other portuguese speaking people doing this or if you used google translate, but I'd like to help translating the game because you're doing such a great job with it! I had little time so I only managed to translate a few tutorial tasks and I also corrected some mispelled portuguese words I saw, but if I can I'd like to help more.
 2019-12-23 22:13:34 +02:00
Vladimir Tanakov
25a3467cb3 Add crash reporting controller and email sending on android (#1509) 2019-12-23 22:12:35 +02:00
uvehj
74dab9da63 Update Spanish.properties (#1516) 
translated the new text
 2019-12-23 22:11:11 +02:00
Prosta4okua
21b013291a Update Ukrainian.properties (#1515) 2019-12-23 22:11:01 +02:00
Yair Morgenstern
dedb46c55c 3.4.3 2019-12-23 19:15:57 +02:00
r3versi
a1aec212bd City states influence, Bugfix Greece (#1512) 
* Fix Greece Unique wasn't effective + Added CityState relation notifications

* Greece influence to CityState benefits from unique
* Added notifications when you are about to lose (or lost) friendship and alliance with a city state. Closes #1168
* Introduced restingPoint in DiplomacyManager to support constant shifts in influence

* Autogeneration translation files
 2019-12-22 23:08:46 +02:00
Yair Morgenstern
dff886939d Many many people have said that winning cultural victory is too easy, so it's now upped from 4 to 5 policy branches 2019-12-22 22:14:04 +02:00
Yair Morgenstern
3ef34f99ff Added missing translations 2019-12-22 20:00:28 +02:00
Yair Morgenstern
33ad922343 Solved bug which was caused by obsoleting scouts when they have no upgrade 2019-12-22 19:39:54 +02:00
StepanIvasyn
31b4680b5f Update Ukrainian.properties (#1510) 
Translate "Technology" and "Technology uniques".
 2019-12-22 18:16:37 +02:00
r3versi
c2dc0217b6 Rejuvenation icon + Unique promotions are listed in PromotionPickerScreen (#1506) 2019-12-22 15:29:40 +02:00
RadioMagnetofonStereofoniczny
4af80be189 Update Polish.properties HotFix (#1505) 
I hope this is my last work with this file today. I totally focused on this main file. Please forgive me that mistakes 😢
 2019-12-21 23:18:32 +02:00
Yair Morgenstern
ffd5368df4 Added Promotion information to Civilopedia 2019-12-21 21:05:54 +02:00
Yair Morgenstern
c51b751309 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-12-21 20:36:40 +02:00
Yair Morgenstern
1d2bf490b5 People said in the comments they couldn't find the "Create improvement" button, so here. 2019-12-21 20:35:04 +02:00
RadioMagnetofonStereofoniczny
ee6b0f1919 Updated Polish.properties (#1504) 
Added new translation.
 2019-12-21 20:33:49 +02:00
Smashfanful
7d746df5a2 Update Italian.properties (#1494) 
Italian updates

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2019-12-21 19:52:00 +02:00
NoNZeeZ
6004d49803 Update Thai.properties (#1501) 
I didn't delete the #Requires translation but here I am
 2019-12-21 19:44:45 +02:00
armandberger
983836b0ae Last french translations (#1500) 2019-12-21 19:44:27 +02:00
r3versi
2afda16095 Added missing translations of Natural Wonders and Civilopedia Tutorials entries (#1498) 
* Added missing translations natural wonders related

* Auto generation of translation files

* Missing Tutorial names translation

* Auto generation translation files

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2019-12-21 19:44:11 +02:00
RadioMagnetofonStereofoniczny
7cc08606ec Update Polish.properties (#1497) 
* Polish Translation 99,7% Full 

I polished a little bit previous translations. And added propably all translations (Only 3 translations missing with "//questions" near). I hope my 4h+ of work were worth it.

* Update Polish.properties

* Final Update 100%

Improved previous mistakes and, more clarity
 2019-12-21 19:37:02 +02:00
qoheniac
157c75b55c Update German.properties (#1490) 2019-12-21 19:36:28 +02:00
Yair Morgenstern
32621b6611 Game crash popup is no longer a tutorial, so it doesn't get affected by the "displayTutorials" settings and has migrated to the .properties files for translation. 2019-12-21 18:58:14 +02:00
Yair Morgenstern
3f0e33df89 Added try/catch on reading the translation file (some phones don't support UTF-8???) 
You can always pass the language screen even if we don't read the percentage files
We read the percentage files from the INTERNAL NOT THE LOCAL OBVIOUSLY
 2019-12-20 11:27:26 +02:00
Prosta4okua
6d666e168b Update Ukrainian.properties (#1488) 2019-12-20 09:56:19 +02:00
Prosta4okua
47f980ee16 Update Tutorials_Ukrainian.json (#1486) 
* Update Tutorials_Ukrainian.json

* Update Tutorials_Ukrainian.json

* Update Tutorials_Ukrainian.json
 2019-12-20 09:56:07 +02:00
uvehj
2b654ecdeb Update Spanish.properties (#1487) 
Minor corrections
 2019-12-19 19:31:23 +02:00
Yair Morgenstern
3f1edbf308 We now generate a small "percentage complete of each language" file, so that getting that information doesn't take an entire second on Android (that's a lot at startup!) - down to a couple of ms! 2019-12-19 18:29:18 +02:00
Yair Morgenstern
a41874e1a5 We now load translation percentages on initialization so we won't need to mid-game, fixed "create" and the "resume" both trying to do the same things 2019-12-19 17:48:17 +02:00
uvehj
e0171ef97a Updated Spanish translation (#1484) 
The only thing missing are the famous people quotes
 2019-12-19 15:55:14 +02:00
paveiv
79adb72141 Update Czech.properties (#1485) 
Just added few minor missing translations and tutorial.
 2019-12-19 15:54:56 +02:00
Vladimir Tanakov
4561c32f1b Update Russian.properties (#1483) 
All tutorial and some phrases from different places.
 2019-12-19 11:31:41 +02:00
NoNZeeZ
ddf216ebba Create thai.properties (#1482) 
Ohhh it took me 3 day to finish this. This work is manual translated by me. I have a little request if you could put my real name to be credit in game because I'm doing my portfolio and I want some evident to claim that I did thai translate in this game. It's ok if you don't want to it just a little sad for me TT
 2019-12-19 11:10:49 +02:00
Yair Morgenstern
77d00f35bb Translation files now take a huge amount of time to load, moved their loading into a thread and put up a "loading screen" beforehand 2019-12-18 22:24:18 +02:00
RafeHaab
83ad3c6949 Update Spanish.properties (#1481) 
Translations added
 2019-12-18 22:19:50 +02:00
Smashfanful
31a9a74abd Update Italian.properties (#1480) 
Update
 2019-12-18 22:19:40 +02:00
uvehj
e64089305e Spanish translation (#1478) 
Mostly menus/UI/messages
Some other misc corrections/additions
 2019-12-18 17:02:56 +02:00
Selyanyn
7582d59f7e Update Russian.properties (#1477) 
The translation is almost over: there're only education and a few different things left.
 2019-12-18 16:52:00 +02:00
uvehj
249a144aed Spanish translation (#1476) 
Buildings
Diplomacy
City-states
Trade
New game menu
 2019-12-18 11:55:46 +02:00
Yair Morgenstern
c4d3be6576 Th whole point of the previous operation was to add these translation lines... and so of course I forgot 2019-12-17 23:01:04 +02:00
Yair Morgenstern
fd7160b785 Added line spacings in the translation files, for organization 2019-12-17 22:57:39 +02:00
armandberger
f1de01dd89 Many new french translations (#1475) 
Thank you for your new organisation of the langages file, it's much easier to merge.
 2019-12-17 22:54:24 +02:00
Maron [RUNO]
db0d894de2 Updated Polish translation (#1474) 
Only 149 lines left ^^
 2019-12-17 22:54:15 +02:00
Prosta4okua
6e8ab97e1f Update Ukrainian.properties (#1473) 2019-12-17 22:54:07 +02:00
Kevin Fisher
52111430ef Add close icon for the UnitTable (#1472) 2019-12-17 21:44:20 +02:00
Yair Morgenstern
a90d93c27e 3.4.0-patch1 2019-12-17 21:05:25 +02:00
uvehj
7cbd7862cd Update Spanish.properties (#1471) 
Added Spanish text for the tutorial tasks
Changed Muro -> Muralla
Added translation for some buildings
 2019-12-17 20:49:28 +02:00
Yair Morgenstern
fc4eb01be8 Added tests to ensure we don't miss translations in the future 2019-12-17 19:16:31 +02:00
Yair Morgenstern
113531a695 Spanish Civ is not production-ready, and natural wonders should be opt-in at the beginning 2019-12-17 16:56:07 +02:00
Yair Morgenstern
486dba97df Added first images for resources - not implemented yet! 2019-12-17 14:25:28 +02:00
Yair Morgenstern
95b3397c48 Merge branch 'master' of https://github.com/yairm210/Unciv 
# Conflicts:
#	core/src/com/unciv/logic/civilization/TechManager.kt
 2019-12-17 14:24:17 +02:00
Yair Morgenstern
0de84e60a9 Not all Natural Wonders look good enough to enter the game as-of-now. 2019-12-17 14:23:17 +02:00
Smashfanful
5942cbdb85 Update Italian.properties (#1470) 
Fixed typo
 2019-12-17 14:00:52 +02:00
lishaoxia1985
fad3210a3d 1. some translation update. 2. modify limitOverflowScience Decision condition. (#1469) 2019-12-17 12:59:39 +02:00
r3versi
aa02a2d321 Natural Wonders (#1456) 
* NaturalWonders initial commit
* Created models/ruleset/tile/NaturalWonder and assets/json/NaturalWonders
* MapGenerator now spawns NaturalWonders in random compatible random locations
* MapParameters has a noNaturalWonders option
* TileInfo has naturalWonder property (set to null if none)
* TileInfo and  UnitMovementAlgorithms correctly manages stats and consider the tile unpassable and unimprovable

* Notification and happiness on NaturalWonder discovery

* El Dorado discovery bonus, Spain unique

* Doubled tile yields for Spain

* NaturalWonders implemented as TerrainType + Fountain of Youth promotion

* Images issue #124

* NaturalWonder TileImages (Fantasy) and Overlay (Default)

* NaturalWonderOverlay.png : https://www.flaticon.com/free-icon/mount-fuji_2166259

* Bugfix

* Added translations

* Italian translations

* Fix translation issue
* missing space after = in template.properties breaks translations

* Improved NaturalWonder spawn logic

* Great Barrier Reef spawns on 2 contiguous tiles
* Each wonder has specific spawn requirements
* Number of wonders spawned scales with map radius

* Fix unused import
 2019-12-16 20:37:49 +02:00
Yair Morgenstern
7abd0143c6 Excess settler food to production conversion moved to CityStats, solving the "0 production for settler" bug and also it's now displayed in the stats breakdown =) 2019-12-16 19:41:17 +02:00
Owlareyou
fc2286dfe3 Update Traditional_Chinese.properties (#1467) 
I changed the wording for Chinese a little bit, to make it more natural.
 2019-12-16 19:25:52 +02:00
LeMoonStar
02ccf95349 added missing German Tutorial translations and made some sound better (#1466) 2019-12-16 19:11:30 +02:00
Smashfanful
d3d8e8c2b5 Update Italian.properties (#1463) 
Tell me if I skipped some untranslated lines
 2019-12-16 13:38:27 +02:00
Erwin
5e9c4d8f68 Updated polish translation (#1465) 
I deleted  # Requires translation! comment wherever I added my own translation.
 2019-12-16 13:36:39 +02:00
LeMoonStar
4fd9d18093 added some German tutorial translations, more coming tomorrow (#1461) 2019-12-15 22:56:29 +02:00
Yair Morgenstern
4251637ac1 Added TutorialTask translations - this is SUPER IMPORTANT to translate, so I put it first! 2019-12-15 22:08:24 +02:00
Yair Morgenstern
94a960abc2 All languages should work for everyone 2019-12-15 22:00:12 +02:00
Yair Morgenstern
4b99656719 Changed Great Scientist unique and action strings in all languages, and removed BasicHelp - all the important info should be in the tutorials anyway. 2019-12-15 21:21:17 +02:00
lishaoxia1985
418a4968a4 great scienstist does the job like original game (#1453) 2019-12-15 20:41:39 +02:00
lishaoxia1985
e937ea0af1 all codes are writen in Kotlin (#1452) 2019-12-15 20:28:34 +02:00
Yair Morgenstern
5d75c3d65e 3.3.9 2019-12-15 20:04:10 +02:00
LeMoonStar
4e7ec0ac0e added some translations (#1459) 2019-12-15 13:52:45 +02:00
Prosta4okua
85df4080b2 Update Ukrainian.properties (#1458) 2019-12-15 12:51:00 +02:00
Yair Morgenstern
ddf2794902 Fixed quote typo 2019-12-14 23:37:29 +02:00
Yair Morgenstern
66af60b107 templates.properties -> template.properties 2019-12-14 23:31:11 +02:00
Yair Morgenstern
7ba5429387 Templates file is now empty for simple creation of new language files! 2019-12-14 23:26:00 +02:00
Yair Morgenstern
04ad012cd9 IT IS DONE 
Translations are now split by language, and new translations can be added to all languages by changing the templates.properties file!
 2019-12-14 23:18:46 +02:00
Yair Morgenstern
906bf19426 Better category spacing for Civilopedia 2019-12-13 14:07:46 +02:00
Yair Morgenstern
a13d6bc82e Package move & civilopedia scroll fix 2019-12-13 13:58:05 +02:00
Smashfanful
cc8c33c73e Update Diplomacy,Trade,Nations.json (#1447) 
Italian translations
 2019-12-13 00:37:42 +02:00
Smashfanful
500871f7ce Update Notifications.json (#1448) 
New translation line
 2019-12-13 00:37:22 +02:00
Smashfanful
6ded78ec51 Update NewGame,SaveGame,LoadGame,Options.json (#1446) 
Italian translations and some new lines
 2019-12-13 00:37:05 +02:00
Yair Morgenstern
58d58ef3a3 Cleaned up tutorials 2019-12-12 20:58:02 +02:00
Yair Morgenstern
acf91b4e12 Solved Application Not Responding errors when saving large games 2019-12-12 20:27:46 +02:00
Prosta4okua
f8b822eeb3 Patch 2 (#1444) 
* Update NewGame,SaveGame,LoadGame,Options.json

* Update Diplomacy,Trade,Nations.json

* Update Other.json

* Update Buildings.json

* Update Notifications.json

* Update Terrains,Resources,Improvements.json
 2019-12-11 22:52:15 +02:00
armandberger
32d425986d new french translations (#1445) 
I made an another check so I hope that it will good this time, thank you for your patience and your controls.
 2019-12-11 22:51:43 +02:00
Yair Morgenstern
5812f2026f Added Missions, to replace wall-of-text tutorials in bite-sized pieces! Very pleased with this =D 2019-12-11 22:48:18 +02:00
Prosta4okua
cfccf54f9a Update NewGame,SaveGame,LoadGame,Options.json (#1443) 
* Update NewGame,SaveGame,LoadGame,Options.json

* Update Diplomacy,Trade,Nations.json
 2019-12-11 21:19:27 +02:00
coding-human
19b2a61414 Fixed typo(Korean) (#1439) 
* Fixed typo

Oops. I missed the 'n' in the \n. My mistake.

* added Korean translation

added Korean translation
 2019-12-11 20:06:05 +02:00
Yair Morgenstern
2b384c7d01 Added tests to check that Nations files are serializable, and fixed problems in Korean and Ukrainian files 2019-12-11 20:01:29 +02:00
Ustklm
8f434c4638 Portuguese Language Updates (#1425) 
* Portuguese Update Building.json

* Portuguese Update (Building,json)

Translation:
                  Translated everything for Portuguese.
                  Minor gramatical fixes.

* Mini Update

Fixed some ' and " error.
 2019-12-11 07:28:17 +02:00
armandberger
9eb68a6565 last french translation (#1437) 2019-12-09 23:45:48 +02:00
Yair Morgenstern
54bbd5d8a2 New game screen clearly split into "Map options" and "Game options" 2019-12-09 22:48:54 +02:00
Yair Morgenstern
caf98b8470 Silly multithreading movement problems should no longer crash the game for the user - they're rare, but when you have 50,000 users they pop up every day. 2019-12-09 18:48:48 +02:00
Yair Morgenstern
969ecf6daa Merge branch 'master' of https://github.com/yairm210/Unciv 2019-12-08 21:20:36 +02:00
Yair Morgenstern
b6bb961d7c Resolved #1422 - resources are now spread over different terrains as much as possible 2019-12-08 21:19:45 +02:00
Prosta4okua
d537eca46e Update Tutorials_Ukrainian.json (#1343) 2019-12-08 21:14:12 +02:00
Yair Morgenstern
026afb2c88 Android icons up-to-date 2019-12-08 18:53:41 +02:00
Sam Rogers
cdcd7cf116 correct spelling of "Fascism" policy (#1432) 2019-12-08 18:40:48 +02:00
Yair Morgenstern
297e604bbf Long translated leader names now display nicely in civ picker popup 2019-12-08 12:59:38 +02:00
Simulant87
de50262da2 fix typo and add german translation (#1430) 2019-12-08 12:32:19 +02:00
Yair Morgenstern
02501793b3 Using nuclear weapons has large diplomatic reprecussions 2019-12-08 11:50:30 +02:00
Yair Morgenstern
81e520e608 GL 3.0 should now work for mac - kudos @lishaoxia1985 2019-12-08 10:04:16 +02:00
coding-human
14b24d17ee Update Diplomacy,Trade,Nations.json (#1429) 
fixed some Korean typo
 2019-12-08 09:23:57 +02:00
Yair Morgenstern
eace5a46b4 Disabled GL 3.0 because it causes problems in Mac computers 2019-12-08 09:10:02 +02:00
Yair Morgenstern
8c71e782a7 Better APK name for releases 2019-12-07 21:15:40 +02:00
Yair Morgenstern
9f3a943865 Resolved #1426 - starting a new game from a file-map game shows new correct options on the new game screen 2019-12-07 20:31:04 +02:00
Gnlow
8846ad8f4a Korean translations minor fix (#1424) 
* Update Other.json (Korean translations minor fix)

* Update Policies.json

* Update Notifications.json

Korean translations minor fix

* Update Buildings.json

Korean translations minor fix
 2019-12-07 19:32:29 +02:00
coding-human
6c755135c3 Added Korean (#1423) 
* Create BasicHelp_Korean

Added Korean translation of BasicHelp

* Delete BasicHelp_Korean

* Create BasicHelp_Korean.json

Added Korean translation of BasicHelp

* Create Nations_Korean.json

Added Korean translation of Babylon, Greece, China

* Update Nations_Korean.json

Added some more Korean translations

* Update Nations_Korean.json

Updated Korean translation of City States

* Update Nations_Korean.json

Added more Korean translations

* Update Nations_Korean.json

Added another Korean translations

* Create Tutorials_Korean.json

Added some Korean translation (about half)

* Update Tutorials_Korean.json

* Update Tutorials_Korean.json

Finished Korean translation

* Update Nations_Korean.json

Only 10 nations left!(Finally..)

* Update Nations_Korean.json
 2019-12-07 19:24:02 +02:00
HI_OuO
16c09ff2e2 add 'Songhai' translation (#1421) 2019-12-07 19:21:58 +02:00
Yair Morgenstern
6ab58fd8ab More map editor normalization, because people will doo whatever they can to break the system 2019-12-06 10:23:30 +02:00
Yair Morgenstern
3ea4f8bc82 Resolved #1420 - Menu in the map editor no longer opens multiple times on subsequent clicks 2019-12-06 10:12:16 +02:00
Yair Morgenstern
110e7b7052 Desktop no longer crashes/bugs on first initialization 2019-12-05 20:59:44 +02:00
Yair Morgenstern
effaa558f6 Un-broken 2019-12-05 20:10:21 +02:00
Bootjeuhz
3e2dcd7b91 Added some Dutch translations (#1417) 
See my file changes :).
 2019-12-05 18:50:14 +02:00
armandberger
f64fe0ed0c new french translations (#1415) 2019-12-05 18:49:55 +02:00
armandberger
0a3d3bf3f7 new french translations (#1414) 2019-12-05 12:00:45 +02:00
Yair Morgenstern
975531d856 Enabled HDPI for Mac OSX 2019-12-04 19:56:09 +02:00
Maron [RUNO]
a544bfc8f0 Complete polish translation for tutorial (Finally ^^) (#1410) 
And some small fixes
 2019-12-04 11:10:59 +02:00
coding-human
db077a9384 All Korean translations in "Translation" Folder (#1413) 
* Update Buildings.json

Korean translation (100%, but not in-game tested)

* Korean translations - Diplomacy,Trade,Nations.json

Updated Korean translations

* Korean translation-Diplomacy,Trade,Nations.json

Added Korean translation

* Korean update -NewGame,SaveGame,LoadGame,Options.json

Korean Translation Updated

* Add files via upload

* Add files via upload

* Kor translation - Buildings.json

Korean translation added

* Delete Units,Promotions.json

* Add files via upload

* Kor translation - Diplomacy,Trade,Nations.json

Korean translation added

* Kor translation - NewGame,SaveGame,LoadGame,Options.json

Korean translation added

* Kor translation - Notifications.json

Korean translation added

* Kor translation - Other.json

Korean translation added

* Kor translation - Terrains,Resources,Improvements.json

Korean translation added

* Kor translation - Units,Promotions.json

Korean translation added

* Kor translation - Policies.json

Korean translation added

* Kor translation - Techs.json

Korean translation added
 2019-12-04 11:10:38 +02:00
Yair Morgenstern
05fd40b306 Added tests to alert when we don't have translations for game basics 2019-12-03 22:11:04 +02:00
Yair Morgenstern
ef272b3208 Fixed "Positive" diplomatic modifier for warmongering 2019-12-03 21:28:50 +02:00
Yair Morgenstern
ab2c7fe51f 3.3.4-patch1 2019-12-03 21:04:48 +02:00
StepanIvasyn
0ded139f5a Update Units,Promotions.json (#1407) 
Add Ukrainian translation.
 2019-12-03 16:40:35 +02:00
Yair Morgenstern
0ca3d91994 Tests are back to Java, because they didn't really run via Gradle when in Kotlin 2019-12-02 22:33:48 +02:00
Yair Morgenstern
e3ac6f4e53 Resolved #1404 - AI should no longer be able to win cultural victory after being defeated 2019-12-02 22:08:57 +02:00
Augusto V B Oliveira
650ac66ff6 Complete update for this section (units, promotions, etc) (#1403) 
some minor changes and adds
 2019-12-01 22:08:21 +02:00
Maron [RUNO]
a4b0bc148f Added complete polish translation to Units,Promotions.json (#1402) 
Also i updated Tutorial file (i should complete it tommorow)
Have a nice day ^^
 2019-12-01 12:07:33 +02:00
Augusto V B Oliveira
cf7cf562fa Update Portuguese Translation (#1401) 
few changes and added some others
 2019-11-30 22:01:05 +02:00
Augusto V B Oliveira
23fde5944f Update Portuguese Translation (#1400) 
Only tech names and Era names
 2019-11-30 22:00:55 +02:00
Augusto V B Oliveira
3b8fa17e51 Update in Portuguese translation (#1398) 
There were a few things that I don't understood.
 2019-11-30 22:00:44 +02:00
Yair Morgenstern
477cd62ca8 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-11-30 21:56:25 +02:00
Yair Morgenstern
757439f2d1 3.3.3 2019-11-30 21:56:00 +02:00
fab144
250cc9627d Addes some Malay Translation (#1395) 2019-11-29 16:12:34 +02:00
fab144
5b86699155 Added alot of malay translation (#1397) 2019-11-29 16:12:01 +02:00
Smashfanful
f256e4e32a Update Notifications.json (#1391) 
Italian translation correction
 2019-11-28 22:43:07 +02:00
Yair Morgenstern
3816014ae4 Added Great Person city location to notification 2019-11-28 21:10:36 +02:00
armandberger
c50783f895 Update Terrains,Resources,Improvements.json (#1390) 
new french translation
 2019-11-28 21:06:52 +02:00
armandberger
cadb88f5d5 Update Other.json (#1389) 
french translation
 2019-11-28 21:06:39 +02:00
Yair Morgenstern
55b2da6d75 Normalized resource reveal notification 2019-11-28 21:05:36 +02:00
Yair Morgenstern
df964a5ec6 TechPickerScreen organization 2019-11-28 20:28:04 +02:00
Yair Morgenstern
de85e5bace Merge branch 'master' of https://github.com/yairm210/Unciv 2019-11-28 20:26:07 +02:00
Yair Morgenstern
d0975ebc38 I don't think you should be able to see other tech's tech trees from the victory screen. 2019-11-28 19:57:55 +02:00
fab144
83822c745c Added some malay translation (#1387) 2019-11-28 19:52:33 +02:00
Maron [RUNO]
9e825a7709 Added translation for Notifications.json (#1386) 
Thats all. Night^^
 2019-11-28 15:09:38 +02:00
Yair Morgenstern
4270142421 Should now be recognized as Game in Android 2019-11-27 20:44:15 +02:00
Yair Morgenstern
127bafdbc6 Revert "Android launcher now Kotlin, app should be recognized as Game" 
This reverts commit 8bdad4c38d.
 2019-11-27 20:38:23 +02:00
Yair Morgenstern
8232ca3aee Dammit packr 2019-11-27 20:26:09 +02:00
Smashfanful
c9cab860f6 Update Other.json (#1383) 
Italian translations
 2019-11-27 15:41:17 +02:00
Smashfanful
88a845d52a Update Units,Promotions.json (#1384) 
Italian translations
 2019-11-27 15:40:59 +02:00
Smashfanful
ecaf845192 Update Policies.json (#1385) 
Italian translations
 2019-11-27 15:40:44 +02:00
Smashfanful
5aa3e0f04c Update Diplomacy,Trade,Nations.json (#1382) 2019-11-27 15:40:23 +02:00
Maron [RUNO]
76cbbe3008 Few changes and added basic info (#1379) 
* Update Diplomacy,Trade,Nations.json

Added rest of Polish translation for Diplomacy etc file

* Changes

Changed some translations.
Added markers to check context ingame.
Added basic help (complete)
Started translating tutorial
 2019-11-27 08:56:38 +02:00
Yair Morgenstern
405536beba I think the Windows64 executables haven't been compiling well from the get-go... 2019-11-26 22:18:07 +02:00
armandberger
d926dfbe98 Update Units,Promotions.json (#1378) 
New french translation
 2019-11-26 20:51:59 +02:00
Yair Morgenstern
5907d02403 Oil well images split into Coast and not-Coast 2019-11-26 20:46:53 +02:00
Maron [RUNO]
6e96235b55 Update Diplomacy,Trade,Nations.json (#1377) 
Added rest of Polish translation for Diplomacy etc file
 2019-11-26 19:36:53 +02:00
ThatIsAPseudo
2e4c5830b0 Update Buildings.json (#1373) 
- add French translations
 2019-11-26 10:28:47 +02:00
Yair Morgenstern
8bdad4c38d Android launcher now Kotlin, app should be recognized as Game 2019-11-25 15:59:16 +02:00
lishaoxia1985
7453ee637f 1. overflow science when finishing and starting research. 2. in the cityscreen unit should be not visible. 3. modifier the policy "Commerce Complete" according to original game. 4. the action of "Great Merchant" now is the same as original game. 5. translation update. (#1355) 
* update

* update

* update

* update

* update

* update
 2019-11-25 12:03:20 +02:00
Yair Morgenstern
3fad0985b4 Attempt to use GL 3.0 when possible 2019-11-25 06:34:02 +02:00
Yair Morgenstern
f626381c31 I think we're ready to pack! 2019-11-24 22:22:47 +02:00
matthiakl
e93e6b2bfd Update german translations (#1367) 2019-11-24 14:18:20 +02:00
StepanIvasyn
2efed72fde Update Buildings.json (#1366) 
Add Ukrainian translation.
 2019-11-24 13:02:46 +02:00
Yair Morgenstern
a8c98f60d7 Railroads are now much more visible! 2019-11-23 22:43:35 +02:00
Yair Morgenstern
095deee125 UncivGame rename 2019-11-23 22:28:23 +02:00
Smashfanful
fb13147519 Update NewGame,SaveGame,LoadGame,Options.json (#1360) 2019-11-23 22:06:26 +02:00
Coruna
efc669addd added further German translation (#1357) 
* Update Policies.json

some new words, some corrections

* Update Techs.json

added some words, corrected some other

* Update Terrains,Resources,Improvements.json

some new words, some corrections

* Update Units,Promotions.json

some more words and corrections

* Update Units,Promotions.json

completed

* Update Buildings.json
 2019-11-23 22:06:12 +02:00
Yair Morgenstern
86fdf3ebd7 3.3.0-patch1 2019-11-23 21:36:00 +02:00
Yair Morgenstern
62fd7d8588 Desktop Unciv now sends status to Discord! 
Basically stole the Discord RPC implementation outta Mindustry
 2019-11-21 16:24:27 +02:00
Coruna
a4dac0f67a added German translation (again) (#1356) 
* Update NewGame,SaveGame,LoadGame,Options.json

* Update Notifications.json

added a comment about exclamation and questions marks

* Update Other.json
 2019-11-21 12:45:47 +02:00
Yair Morgenstern
6772e19981 3.3.0 2019-11-20 23:40:06 +02:00
Smashfanful
022b388d35 Update Other.json (#1351) 
Italian translations
 2019-11-20 18:03:36 +02:00
Smashfanful
8c2026dcd9 Update Buildings.json (#1350) 
Italian translations
 2019-11-20 18:03:15 +02:00
Smashfanful
d69fc380af Update Policies.json (#1215) 
* Update Policies.json

* Update Policies.json
 2019-11-20 18:02:47 +02:00
Smashfanful
df2942a4ad Update Terrains,Resources,Improvements.json (#1348) 
Italian translations
 2019-11-20 15:59:26 +02:00
Smashfanful
90e3d72ec4 Update Units,Promotions.json (#1349) 
Italian translation
 2019-11-20 15:58:30 +02:00
Yair Morgenstern
b1868accc5 Nuclear Weapon setting moved to Options, s it can be more easily explored by players 2019-11-19 22:00:16 +02:00
lishaoxia1985
dd28711ee7 update translation (#1352) 
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-19 21:58:56 +02:00
Yair Morgenstern
15e59b161b Technology description no longer includes Manhatten Prokect or Nuclear Missile in description when nuclear weapons are disabled 2019-11-19 19:34:48 +02:00
lishaoxia1985
1eb5ced75c add map modifier and the benefit when we research the technology other Civs have. (#1339) 
* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-19 19:11:01 +02:00
Duan Tao
111030e457 Nuke your enemy! (#1318) 
* Nuke your enemy!

* Fantasy tiles. Worker automaticly clears fallout.

* Some AI improvement for choosing wonder and military unit.

* Add nuclear weapon option.
 2019-11-19 08:43:04 +02:00
Yair Morgenstern
9533a35d15 3.2.4 2019-11-18 22:00:44 +02:00
Smashfanful
ab5c5809e4 Update Nations_Italian.json (#1335) 2019-11-18 20:22:34 +02:00
Coruna
a9ac34b2fc German translation (#1345) 
* Update Buildings.json

added German and a bit Spanish translation

* Update Diplomacy,Trade,Nations.json

added further German translation
 2019-11-18 14:51:08 +02:00
Yair Morgenstern
f7bb5c4a59 Added lines between prerequisite techs in TechPickerScreen - now you can see the entire tree! 2019-11-17 22:41:08 +02:00
Yair Morgenstern
aa4c70f090 Fixed trades always beng denied because "our proposed trade is no longer relevant" 2019-11-17 21:16:51 +02:00
Yair Morgenstern
19fd2bd205 Yet even more images by The Bucketeer! 2019-11-17 20:00:43 +02:00
Yair Morgenstern
1ecc6bbb2a Performance improvement - tile taps and long-clicks are now done at the TileMapHolder level, meaning we can only create one instead of one per tile, massive memory saving! 
Map now zooms with mouse scroll in Desktop!
 2019-11-16 23:02:09 +02:00
lishaoxia1985
70c9d989c6 update (#1337) 2019-11-16 22:38:21 +02:00
Yair Morgenstern
a48c356920 Base image tiles on tiles with improvement images are now grayed out when not visible 2019-11-16 21:15:33 +02:00
Yair Morgenstern
8fad2fd680 Removed my dumb plantation art so that The Bucketeer's masterpieces can shine through =D 2019-11-16 19:52:30 +02:00
Yair Morgenstern
dd8f812465 Units &c updated! 2019-11-16 19:42:34 +02:00
Smashfanful
1ffa329ffe Update Nations.json (#1328) 
* Update Nations.json

Changed a couple of lines

* Update Nations.json

Correction
 2019-11-15 15:59:20 +02:00
Yair Morgenstern
827bf3d4b2 Images update! By The Buketeer again! 2019-11-15 14:28:46 +02:00
Yair Morgenstern
8729100993 altas commit 2019-11-14 22:30:14 +02:00
Yair Morgenstern
24e62e7cc1 Added all of The Bucketeer's improvements, and units until Landskecht 2019-11-14 22:14:23 +02:00
Yair Morgenstern
e21d7eb54a We can now have "layered" images for the base tile, such as grassland + manufactory! 2019-11-14 21:01:24 +02:00
Yair Morgenstern
6eaa4c320f 3.2.2 2019-11-13 23:07:04 +02:00
VoyteeG
d3694b600b Update Buildings.json (#1330) 
Some Polish translation added.
 2019-11-13 22:58:34 +02:00
Yair Morgenstern
c6b550e43d Resolved #1312 - More obvious division between promotion 'pick now' and description 
Civilopedia redone!
Now with simpler picking and images!
 2019-11-13 22:54:10 +02:00
Smashfanful
1abc649d59 Update Nations_Italian.json (#1329) 2019-11-13 19:55:38 +02:00
VXplayGames
392afab35d Update Buildings.json (#1309) 
two translations corrected and one added (Polish)
 2019-11-12 08:20:59 +02:00
sveckarel
7a9c99ee81 Update czech translations (#1327) 
* Czech translations improvements

* Update Czech translations
 2019-11-12 06:52:48 +02:00
Yair Morgenstern
b0e29c5d3c City-state alliance Bugfix 2019-11-11 21:07:16 +02:00
Smashfanful
2bd9a2fbd6 Update Nations.json (#1319) 
Added Kuala Lumpur and Manila, and changed Ur's defeat quotes
 2019-11-10 21:57:53 +02:00
Yair Morgenstern
63f9bc28c8 Now let's see if it detects the fix properly 2019-11-10 21:50:59 +02:00
Yair Morgenstern
f105364493 Intentionally breaking json to see if the Travis test catches it 2019-11-10 21:45:41 +02:00
Yair Morgenstern
91eed3fc02 3.2.1-patch1 2019-11-10 18:34:44 +02:00
dic1911
3efb0d67f8 fix typo (#1324) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one

* Traditional Chinese for Techs.json

* t.chinese translation

* fix typo

* fix translation

* fix typo
 2019-11-10 15:52:07 +02:00
dic1911
7199fc5e89 Fix translation derp and add placeholder chinese tutorial (#1322) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one

* Traditional Chinese for Techs.json

* t.chinese translation

* fix typo

* fix translation
 2019-11-10 10:29:59 +02:00
Yair Morgenstern
637b487a2c City-states allied to Civs no longer attempt to declare war when it does on Civs they haven't met yet 2019-11-09 20:25:30 +02:00
Smashfanful
065b7586b2 Update Diplomacy,Trade,Nations.json (#1317) 
Translation line correction - now you can see it translated, hopefully
 2019-11-09 19:51:15 +02:00
Yair Morgenstern
7b8d335902 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-11-09 19:17:54 +02:00
Yair Morgenstern
1a034cba03 Removed mod civs from nation metadata 2019-11-09 19:07:35 +02:00
Prosta4okua
4a312c3197 Ukrainian translation (#1281) 
* init

* 1

2

* 3

* from StepanIvasyn

* Preparing.
Other.json

* Fully translated file Other.json

* Fix

* Fully translated BasicHelp_Ukrainian.json

* 1

* resolved conflicts

* 1

* 2
 2019-11-09 19:06:10 +02:00
Yair Morgenstern
e1350cdb05 separated whiteDot for images from TableBackground for backgrounds 2019-11-08 15:42:19 +02:00
lishaoxia1985
4d5ae8fa25 now you only need to create font once. (#1269) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-08 15:31:11 +02:00
dic1911
39314a5543 fix typo (#1310) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one

* Traditional Chinese for Techs.json

* t.chinese translation

* fix typo
 2019-11-07 17:31:03 +02:00
Smashfanful
528ded112e Update Notifications.json (#1311) 2019-11-07 17:30:32 +02:00
Yair Morgenstern
d8ec67bb43 Resolved #1307 - you no longer get a notification when conneccting to the cities of other Civs 
New notification when cities have disconnected from your capital
 2019-11-06 21:43:48 +02:00
dic1911
d2121075f0 Make t.chinese translation 99% complete! (#1308) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one

* Traditional Chinese for Techs.json

* t.chinese translation
 2019-11-06 21:00:54 +02:00
Yair Morgenstern
1bd6f5fc73 Atlas updated now (: 2019-11-06 19:34:02 +02:00
Yair Morgenstern
f6d2143ff6 Fixed weird resizing bug - #1304, thanks @ninjatao! 2019-11-06 19:25:02 +02:00
dic1911
8fd0f39ed4 more t.chinese (#1306) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one

* Traditional Chinese for Techs.json
 2019-11-06 12:16:28 +02:00
VoyteeG
3632fa714b Update NewGame,SaveGame,LoadGame,Options.json (#1303) 
Hopefully this time is OK. Some polish additions.  By the way I've noted missing starting eras. Is it correct?
 2019-11-05 21:25:47 +02:00
Yair Morgenstern
140753e9c4 Resolved #1302 - captured settlers are converted workers as per original Civ V 2019-11-05 18:16:37 +02:00
Smashfanful
1ea961b54a Update Diplomacy,Trade,Nations.json (#1301) 2019-11-05 15:24:18 +02:00
Smashfanful
24b6dffad6 Update Notifications.json (#1300) 2019-11-05 15:23:44 +02:00
Yair Morgenstern
777802ab04 Can no longer click 'next turn' if popups are open - #1289 2019-11-05 15:21:28 +02:00
dic1911
1b1c7228a6 Replace Traditional Chinese flag icon (#1298) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one
 2019-11-05 13:01:09 +02:00
Duan Tao
1e403442f7 City-state allies with most influencing civ. (#1291) 
* City-state allies with most influencing civ.

* More notifications for alliance. More intense status update.

* Fix a crash about lateinit tiles.

* More reasonable civInfo.setTransients.
 2019-11-05 12:23:21 +02:00
Smashfanful
5816bb213c Update NewGame,SaveGame,LoadGame,Options.json (#1293) 2019-11-04 16:49:54 +02:00
Smashfanful
0c4968e553 Update Other.json (#1294) 2019-11-04 16:49:38 +02:00
BenBooth1344
92ddc864fa Implemented One City Challenge (#1279) 
* Implemented One City Challenge

Implemented One City Challenge

* prevent OCC from capturing settlers

* Fixed spellling of Destroy

* fixed capture logic for barbarian
 2019-11-04 14:24:43 +02:00
Smashfanful
d22598d6ac Update Policies.json (#1214) 
Added sketches for Patronage and Order
 2019-11-04 12:50:10 +02:00
dic1911
aa1246d03c More traditional chinese translation (#1290) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json
 2019-11-04 08:16:24 +02:00
Smashfanful
af2f136c4c Update NewGame,SaveGame,LoadGame,Options.json (#1285) 
Italian translations
 2019-11-04 08:13:15 +02:00
Smashfanful
7964d3c680 Update Units,Promotions.json (#1288) 
Italian translation
 2019-11-04 08:12:32 +02:00
Smashfanful
7b1d33dead Update Diplomacy,Trade,Nations.json (#1284) 
Italian translations
 2019-11-04 08:12:12 +02:00
Smashfanful
345884c0a7 Update Notifications.json (#1286) 
Italian translation
 2019-11-04 08:11:40 +02:00
Smashfanful
e7d81de517 Update Buildings.json (#1283) 2019-11-04 08:11:23 +02:00
Smashfanful
d6dcb8ae46 Update Nations_Italian.json (#1282) 2019-11-04 08:10:57 +02:00
Yair Morgenstern
57b0040df7 Added Siam civ - #703 2019-11-03 23:22:49 +02:00
Yair Morgenstern
9610f9f918 bugfix - Music volume slider no longer auto-sets to sound effect volume 2019-11-03 20:15:49 +02:00
BenBooth1344
b82a52ce38 added no ancient ruins option (#1280) 2019-11-03 16:17:15 +02:00
Nikulin Nikolai
51dd38eac3 more russian (#1278) 
* more russian

* more russian#2
 2019-11-03 08:00:03 +02:00