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

224 commits

Author SHA1 Message Date
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
lishaoxia1985
42e16ec80a Now we and AI can sign research agreement. (#1671) 2020-01-23 20:12:24 +02:00
Freshy
e4308f947e Little correction od my mistake (#1748) 2020-01-22 18:34:02 +02:00
lyrjie
66c61541a3 Russian translation update (#1745) 
Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
 2020-01-22 18:33:42 +02:00
Marerjh
648075c89b Update Ukrainian.properties (#1749) 2020-01-22 18:33:25 +02:00
Smashfanful
9f4eb9eff0 Update Italian.properties (#1750) 
* Update Italian.properties

Added new translation lines in game

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

* Feature: map editor menu

* Cleanup

* Added "Empty" map generation type for the map editor
 2020-01-22 13:10:39 +02:00
Freshy
45dc3d3587 Completed and corrected translation (#1743) 
Some of the Polish words were wrong, so I corrected them and named some stuff the way it's called in Civilization V.
 2020-01-21 21:57:56 +02:00
Yair Morgenstern
8508362496 3.5.5 
Fixed problem with the Manila translation
 2020-01-21 21:17:05 +02:00
JackRainy
78d0c84cc1 Corrections to Ukrainian translations (#1721) 
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-01-21 21:03:39 +02:00
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
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
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
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
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
r3versi
065e944896 Songhai (#1636) 
* Songhai, Burial Tomb, Gold for capturing city

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

* Rebuilt Atlas and Translations

* Italian translation + fix missing translations

* Barbarian Camp Reward

Is now modified by Speed and Difficulty
 2020-01-09 19:23:00 +02:00
armandberger
64a8a137be one french translation (#1629) 2020-01-09 00:18:10 +02:00
JackRainy
2c30348168 Improved translations for Ukrainian and Russian languages (#1631) 2020-01-07 19:09:26 +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
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
40b9e7d75b Update Russian.properties (#1609) 
Fixed errors
 2020-01-04 21:00:30 +02:00
armandberger
0dbe78b0eb new french translations (#1606) 2020-01-04 21:00:07 +02:00
Oheto
ca5cc57315 Update Russian.properties (#1602) 2020-01-03 10:33:16 +02:00
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
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
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
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
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
4470bcb185 Update Polish.properties (#1570) 2019-12-29 18:56:38 +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
StepanIvasyn
57635da155 Update Ukrainian.properties (#1551) 
Update tutorial tasks
 2019-12-29 17:46:04 +02:00
Smashfanful
784b94742d Update Italian.properties (#1564) 2019-12-28 23:40:39 +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
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
Kickerapoo
fb7c9a2129 More things translated (#1548) 
An update
By kickerapoo
 2019-12-27 11:14:21 +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