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

1474 commits

Author SHA1 Message Date
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
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
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
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
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
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
armandberger
d926dfbe98 Update Units,Promotions.json (#1378) 
New french translation
 2019-11-26 20:51:59 +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
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
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
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
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
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
lishaoxia1985
dd28711ee7 update translation (#1352) 
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-19 21:58:56 +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
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
lishaoxia1985
70c9d989c6 update (#1337) 2019-11-16 22:38:21 +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
24e62e7cc1 Added all of The Bucketeer's improvements, and units until Landskecht 2019-11-14 22:14:23 +02:00
VoyteeG
d3694b600b Update Buildings.json (#1330) 
Some Polish translation added.
 2019-11-13 22:58:34 +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
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
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
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
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
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
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
Yair Morgenstern
791439397e Added Brandenburg Gate wonder - #643 
Fixed translation bugs
 2019-11-02 23:08:55 +02:00
Prosta4okua
94a0228e45 [WIP]Ukrainian translation (#1270) 
* init

* 1

2

* 3

* from StepanIvasyn

* Preparing.
Other.json

* Fully translated file Other.json

* Fix

* Fully translated BasicHelp_Ukrainian.json
 2019-11-02 22:43:58 +02:00
Yair Morgenstern
edb5ff92ed Fixed Indirect Fire promotion 2019-11-02 20:10:01 +02:00
StepanIvasyn
403bd173a8 Update Notifications.json (#1275) 
Add Ukrainian translation. Fixed some names is square brackets in Czech.
 2019-11-02 19:41:14 +02:00
dic1911
cc7e2b9e87 More Traditional Chinese translation (#1277) 
* 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
 2019-11-02 19:39:42 +02:00
dic1911
31b9319905 Traditional Chinese translation for Other.json (#1272) 
* 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
 2019-11-01 11:53:35 +02:00
Nikulin Nikolai
f249c43529 some russian (#1271) 2019-11-01 08:47:48 +02:00
dic1911
e3dbc94a3c Add some Traditional Chinese translation strings (#1267) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json
 2019-10-31 17:50:31 +02:00
Yair Morgenstern
78027ef249 Distinguished notifications of "trade item TO nation has ended" from "trade item FROM nation has ended" 2019-10-31 15:55:13 +02:00
Prosta4okua
ff731a9c1a init (#1262) 2019-10-31 15:47:58 +02:00
lishaoxia1985
05eb1b40ea update translation, thank deluxghost! (#1264) 
* 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
 2019-10-31 13:49:42 +02:00
sveckarel
e44707f0e5 Update Czech translations (#1263) 
* Czech translations improvements

* Update czech transaltions
 2019-10-31 09:03:49 +02:00
lishaoxia1985
1f8db38ea2 update translation (#1258) 
* 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
 2019-10-30 15:45:03 +02:00
Smashfanful
94061f045e Update NewGame,SaveGame,LoadGame,Options.json (#1259) 2019-10-30 15:44:22 +02:00
Smashfanful
c3a4f69f04 Update Other.json (#1261) 2019-10-30 15:43:58 +02:00
Smashfanful
e8a9a55491 Update Notifications.json (#1260) 2019-10-30 15:43:33 +02:00
sveckarel
d7d437cfc8 Cz translations - another fixes (#1255) 
* Czech translations improvements

* Czech translations - Bugfixing (#1249)

* Czech translations - Bugfixing

* typo

* typo
 2019-10-30 08:21:59 +02:00
StepanIvasyn
df4ca861c3 Update NewGame,SaveGame,LoadGame,Options.json (#1253) 
Add Ukrainian translation without messed others. Improved some sentences in Ukrainian.
 2019-10-29 15:30:35 +02:00
lishaoxia1985
8af6a5ffa6 update translation (#1247) 
* 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
 2019-10-29 06:20:27 +02:00
sveckarel
41971471f5 Czech translations - Bugfixing (#1249) 
* Czech translations - Bugfixing

* typo

* typo
 2019-10-28 19:15:16 +02:00
sveckarel
e0c0d18030 Czech translations - part 4 (Wonders quotes) 2019-10-28 06:41:28 +02:00
Smashfanful
9cf2b9e6eb Update Other.json 2019-10-27 20:27:44 +02:00
Smashfanful
5c08b8abf7 Update NewGame,SaveGame,LoadGame,Options.json 2019-10-27 20:26:53 +02:00
lishaoxia1985
e865055488 update translation (#1243) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-27 17:30:56 +02:00
Akito13
9c5331a704 Couple of German translations 
Part 1
 2019-10-27 15:35:42 +02:00
sveckarel
5abaff7905 Added next few czech words, fixed issue with Save game from last commit 2019-10-27 11:39:24 +02:00
sveckarel
c12ed1842c Translations improvements, fixed few czech words 2019-10-27 11:39:24 +02:00
Yair Morgenstern
4d285e972d Can now translate [year] BC / [year] AD (#1240) 2019-10-26 20:27:01 +03:00
sveckarel
dd69a1250e code cleanup 2019-10-26 20:18:55 +03:00
sveckarel
388e848a90 Czech translations - Quotes (Techs.json) 2019-10-26 20:18:55 +03:00
sveckarel
39747cb6e3 Correction of Czech tranlations, adding missing keys 2019-10-26 20:17:03 +03:00
Smashfanful
9d61cdc4f1 Update Tutorials_Italian.json 2019-10-26 20:15:22 +03:00
Smashfanful
ae43b984b6 Update Other.json 
New translation lines
 2019-10-26 20:14:54 +03:00
Yair Morgenstern
891ea5584f Resolved #1234 - improvements that replace the current improvement now indicated in the improvement picker screen 2019-10-24 22:18:47 +03:00
lishaoxia1985
88da508b82 update translation (#1222) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-23 21:59:20 +03:00
sveckarel
e3e49e8229 Czech translations - part 3 (Tutorials) 2019-10-23 21:57:42 +03:00
VoyteeG
73544feffc Update Buildings.json 2019-10-23 21:57:01 +03:00
Smashfanful
da48de42e0 Update Other.json 2019-10-22 21:10:51 +03:00
Yair Morgenstern
777d1391f4 Changed options for "Show worked tiles" and "Show resources and improvements" because it was less clear than the other options 2019-10-22 19:41:22 +03:00
Yair Morgenstern
f400a03358 Renamed "Immortal" to "Persian Immortal" because of the conflict in naming between the unit and the difficulty 
Also, changed existing units of Immortal or with Range promotion
 2019-10-22 19:25:58 +03:00
sveckarel
651e9359e9 Czech translations - part 2 (BasicHelp) 2019-10-22 16:52:40 +03:00
Yair Morgenstern
965217d95c Undid "Immortal" name change 
Fixed json errors
Added Korean and Czech flags
 2019-10-21 23:23:38 +03:00
sveckarel
3c40e0247f Czech translations - 1st part (Translations directory) (#1220) 2019-10-21 23:12:00 +03:00
lishaoxia1985
362c67e348 1. rename the unit "Immortal" and the Promotion "Range" 2. fix the korean translation, it lost a ("). (#1216) 
* update

* update

* update

* update

* update

* update

* update

* range extension
 2019-10-21 23:00:36 +03:00
Smashfanful
894ec1ee6f Update Buildings.json (#1211) 2019-10-18 16:40:50 +03:00
allrbsacp000
f0521ee92b Update NewGame,SaveGame,LoadGame,Options.json (#1209) 
Add Korean translation
 2019-10-18 16:40:28 +03:00
Yair Morgenstern
77f479e39b Added river toggles to map editor to see how it looks. Not good, btw - can't see rivers behind mountain/forest/hill tiles... 
Disabled for now, until we find a better way to display rivers.
 2019-10-18 16:39:23 +03:00
allrbsacp000
7aa55f8024 Update Terrains,Resources,Improvements.json (#1210) 
Add Korean translation
 2019-10-18 16:19:08 +03:00
Yair Morgenstern
96281db945 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-10-17 10:25:31 +03:00
Yair Morgenstern
4c3840e2ff Fixed problem in Italian tutorials which caused crash when entering Civilopedia when language was Italian 2019-10-17 00:15:44 +03:00
Duan Tao
691a305e50 Duantao/settler food info (#1198) 
* Better info for building settler.

* Shorter message.

* Fix message.
 2019-10-16 18:16:27 +03:00
Smashfanful
00d0f27871 Update Diplomacy,Trade,Nations.json 2019-10-16 18:15:56 +03:00
Smashfanful
200931cfd6 Update Other.json 
Italian translations and corrections
 2019-10-16 18:15:44 +03:00
Smashfanful
f7f7d89992 Update NewGame,SaveGame,LoadGame,Options.json 2019-10-16 18:15:15 +03:00
Smashfanful
cd1fa9b79e Update Notifications.json 2019-10-16 18:14:55 +03:00
Smashfanful
aa55fdb424 Update Units,Promotions.json (#1205) 2019-10-16 18:14:39 +03:00
Smashfanful
6c898174d9 Update Units.json (#1206) 2019-10-16 18:13:51 +03:00
Yair Morgenstern
ecc32365f5 Added notification when cities are connected to the capital 2019-10-16 00:40:37 +03:00
Smashfanful
556ba11bba Update Nations.json (#1192) 
Added new City-States, and modified Venice
 2019-10-15 20:37:03 +03:00
Smashfanful
f968b55949 Update Nations_Italian.json (#1191) 2019-10-15 20:36:56 +03:00
Smashfanful
b996e163e0 Update Terrains,Resources,Improvements.json (#1195) 
Added Moai translations
 2019-10-15 20:34:47 +03:00
Smashfanful
75d584c473 Update Diplomacy,Trade,Nations.json (#1196) 2019-10-15 20:34:30 +03:00
Smashfanful
6c8c851ea2 Update Policies.json (#1187) 
Some Italian corrections according to the original Civ V Italian localization
 2019-10-15 20:33:47 +03:00
Smashfanful
73eedcf63d Update NewGame,SaveGame,LoadGame,Options.json (#1186) 
* Update NewGame,SaveGame,LoadGame,Options.json

* Update NewGame,SaveGame,LoadGame,Options.json
 2019-10-15 20:33:29 +03:00
Yair Morgenstern
36ffc5520a Added annex/puppet/liberate/raze explanations on the popup where you choose between them 2019-10-15 20:30:11 +03:00
Yair Morgenstern
14cbe9e21d Even more pixel images! 
Added Pillaging tutorial
 2019-10-15 16:00:07 +03:00
Yair Morgenstern
b661308a9d Improvements that provide resources now specified in the improvement picker screen 
Tutorials for resources now specify that a specific improvement is needed
 2019-10-12 22:27:45 +03:00
lishaoxia1985
7d14c0924b 1.update translation 2. delete population number back the city name of city screen because there is a detail table in the screen. 3. now when you touch "X" you can close unit table. (#1184) 2019-10-12 21:39:58 +03:00
Yair Morgenstern
e77fdd2993 Polynesia works! 2019-10-11 14:54:08 +03:00
Yair Morgenstern
4da70dfe88 Added polynesia icon and colors 2019-10-11 12:49:07 +03:00
Smashfanful
6fdfc5a72c Update Techs.json (#1183) 2019-10-11 12:47:18 +03:00
Yair Morgenstern
a8dac82157 Added Moai as part of Polynesian civ - lots of changes to be made for that! 2019-10-11 12:09:22 +03:00
Smashfanful
bde11941c5 Update NewGame,SaveGame,LoadGame,Options.json (#1180) 
Some more lines
 2019-10-10 12:50:29 +03:00
Smashfanful
5674250826 Update Diplomacy,Trade,Nations.json (#1174) 
* Update Diplomacy,Trade,Nations.json

I think you should turn "[leaderName] of [nation]" into [leaderName] of the [adjective] empire", I think it makes more sense. Also, corrections.

* Update Diplomacy,Trade,Nations.json
 2019-10-10 12:50:14 +03:00
Smashfanful
b30a82ce7f Update Techs.json 
Now all tech quotes are now translated in Italian!
 2019-10-10 12:49:31 +03:00
Smashfanful
0a4047c2da Update Other.json (#1167) 
* Update Other.json

Corrections, translations and a new line

* Update Other.json
 2019-10-10 12:42:40 +03:00
lishaoxia1985
4baa7b6105 fix display tutorial, please update immediately (#1176) 
* update

* update
 2019-10-09 23:40:02 +03:00
Yair Morgenstern
f21e508b28
Merge pull request #1172 from ninjatao/duantao/some_chinese_translation 
Correct some Chinese translation.
 2019-10-08 10:47:03 +03:00
Yair Morgenstern
ebe612ee54
Merge pull request #1164 from lishaoxia1985/master 
update translation, now it can run, but it also have a problem.
 2019-10-08 10:44:58 +03:00
Yair Morgenstern
5d6ecd1ca4 More tutorial name changes so it looks better in the Civilopedia 2019-10-08 10:44:14 +03:00
YueR
43cf084b9f Merge remote-tracking branch 'upstream/master' 
update
 2019-10-08 15:35:27 +08:00
Duan Tao
cdf29a8ca7 Correct some Chinese translation. 2019-10-08 10:39:10 +08:00
Duan Tao
6d94b3d8c8 Fix parameter. 2019-10-08 10:17:20 +08:00
Duan Tao
b1c5398804 Difficulty bonus vs barbarian. 2019-10-08 10:17:14 +08:00
YueR
edf4588355 Merge remote-tracking branch 'upstream/master' 
update
 2019-10-08 04:33:17 +08:00
Smashfanful
c32f4bba56 Update Tutorials_Italian.json 2019-10-07 22:30:57 +03:00
YueR
264b1484d2 update 2019-10-07 21:25:06 +08:00
YueR
1a9a2ac886 update 2019-10-07 17:29:49 +08:00
YueR
80122faecf update 2019-10-07 16:43:18 +08:00
YueR
b0cd8e318a update 2019-10-07 16:23:20 +08:00
Yair Morgenstern
b3a2bc3307 Tutorials now accessible from Civilopedia! 
Mass tutorial renaming
 2019-10-06 23:18:51 +03:00
Smashfanful
69aecfe419 Update Nations_Italian.json 2019-10-06 18:10:56 +03:00
lishaoxia1985
a4ea63ac4c update translation (#1160) 2019-10-06 10:28:12 +03:00
Smashfanful
f3a8a64491 Update Techs.json 
Added translation lines for the tech quotes :D
 2019-10-06 06:15:29 +03:00
divizdev
f8351da1c4 Russian translation (#1158) 
* Russian translation

* Russian translation

* Russian translation

* Russian translation
 2019-10-06 06:14:58 +03:00
Smashfanful
272f58fe5d Update NewGame,SaveGame,LoadGame,Options.json 
New line
 2019-10-05 21:17:54 +03:00
Smashfanful
815ce27f6c Update Units,Promotions.json 2019-10-05 21:14:49 +03:00
Smashfanful
8d31d2c0ad Update Tutorials_Italian.json 
Update
 2019-10-05 21:14:31 +03:00
Smashfanful
2f2ace5f3c Update Buildings.json (#1153) 2019-10-05 21:14:00 +03:00
lishaoxia1985
09420786bc modify battle damage calculation method about city attack. (#1141) 2019-10-05 21:10:10 +03:00
Smashfanful
1aa9640d1c Update Other.json 
New lines
 2019-10-05 20:59:48 +03:00
Smashfanful
67916f9be2 Update Policies.json 
Italian translation corrections
 2019-10-04 16:50:12 +03:00
Smashfanful
e42cadbf09 Update Diplomacy,Trade,Nations.json 2019-10-04 16:49:47 +03:00
Yair Morgenstern
aafe23a2f5 freeTechs parameter in buildings replaced with Free Technology unique 2019-10-04 16:23:17 +03:00
Yair Morgenstern
5049831c18 Great Wall no longer provides a free tech - whoops! 2019-10-03 22:11:06 +03:00
Smashfanful
9b86055fc7 Update Other.json 2019-10-03 16:32:00 +03:00
Yair Morgenstern
3358baab52 Added alert popups on finished tech 2019-10-02 18:21:43 +03:00
Yair Morgenstern
512a68c2ae Fixed bad nations comment end... 2019-10-01 23:30:04 +03:00
MrUldiggg
5c9baaf15a Sweden.json 
Just add any color you want
 2019-10-01 21:59:41 +03:00
lishaoxia1985
3b2777e098 some translation update (#1135) 2019-10-01 21:55:37 +03:00
Smashfanful
a91fe87e26 Update Nations_Italian.json 2019-09-29 15:25:39 +03:00
Smashfanful
f4243550ce Update Other.json 2019-09-29 15:25:23 +03:00
Yair Morgenstern
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +03:00
lishaoxia1985
e5370c9b00 1.split different eras in tech tree, although color is not very good. 2. in original game, Japanese UA should be not used in Air Unit, so I fix it. 3. according to original game, edit the method to calculate battle damage. 4. there is two "Mohawk Warrior" words in the file "Units.json", and its obsoleteTech should be"Gunpowder", so i delete the wrong one and edit the right one. 5. edit "Building.json" to make it describing more accurate, of course, i edit "TileInfo.kt" according to the edited"Building.json". 6. some translation update. (#1127) 
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update

* update

* update

* update

* update

* viewport

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-09-29 10:33:18 +03:00
Yair Morgenstern
5980f18f89 Puppeted cities now always auto assign production 
Resolved #1124 - added annex and puppet tutorial
 2019-09-28 21:43:27 +03:00
Yair Morgenstern
27e2b0615a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-28 21:42:45 +03:00
Smashfanful
58fd3b2c6c Update NewGame,SaveGame,LoadGame,Options.json 
Added new lines
 2019-09-28 21:21:30 +03:00
Yair Morgenstern
49d3ea2c0e Resolved #1125 - cities can bombard over all tiles in a radius of 2 2019-09-27 11:25:23 +03:00
Smashfanful
751c33c609 Update Buildings.json 2019-09-24 20:28:22 +03:00
Smashfanful
a6684a6640 Update Buildings.json (#1118) 
More fixes
 2019-09-24 20:27:23 +03:00
Duan Tao
38a28888ef Duantao/ai bonus (#1117) 
* Ai bonus.

* AI modifiers apply correctly.

* AI initial units.

* Use gameInfo.getDifficulty() instead of civInfo.getDifficulty().

* Minor fix.
 2019-09-24 16:19:17 +03:00
Smashfanful
ad07db9334 Update Nations_Italian.json 
Some Italian fixes
 2019-09-24 14:04:55 +03:00
Smashfanful
bc1154c71f Update Notifications.json 
Some Italian fixes
 2019-09-24 14:04:43 +03:00
Smashfanful
3b4bf817c0 Update Buildings.json 
More Italian translations
 2019-09-23 20:14:44 +03:00
Duan Tao
65b8fe531e Duantao/liberate city (#1097) 
* Allow to liberate city to its founder.

* Workaround : Avoid exception on conquering city with infantry unit.

* Liberate button actually works.

* Fix trade resources check.

* Postpone the 2nd part of postBattleActions until choice is made.

* Add puppet option.

* Puppet city cannot be controlled directly.

* Add annex and puppet happiness/culture/science bonus.

* Add courthouse. Icon is missing.

* Icon for courthouse.

* Update png.
 2019-09-23 08:37:53 +03:00
Yair Morgenstern
a3889a549e Iroquis can now use Forest and Jungles to connect cities 
Persian +1 movement only activaes when in golden age
 2019-09-20 10:26:15 +03:00
Smashfanful
12e3ae1761 Update Diplomacy,Trade,Nations.json 
Corrections
 2019-09-20 10:07:06 +03:00
Smashfanful
03087095f6 Update NewGame,SaveGame,LoadGame,Options.json 
Added missing Italian translation
 2019-09-19 20:54:01 +03:00
Smashfanful
1359c3eab3 Update TileImprovements.json 2019-09-19 20:52:41 +03:00
Smashfanful
1591215f4c Update Buildings.json 
Last Wonder lines translations
 2019-09-19 20:52:10 +03:00
Smashfanful
ee1751a496 Update Techs.json 
Added Medieval and Renaissance Tech quotes
 2019-09-19 15:58:59 +03:00
Duan Tao
45342a7d63 Remove redundant item is Logistics prequisition. 2019-09-18 08:43:17 +03:00
Yair Morgenstern
b86d11b5fa Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-17 22:40:09 +03:00
Yair Morgenstern
04127164bc Added all remaining wonder quotes and more promotion icons 2019-09-17 22:39:08 +03:00
Smashfanful
9271fe22a4 Update Techs.json 
Added quotes for Ancient and Classical Age techs
 2019-09-17 20:41:03 +03:00
Smashfanful
11840de2ce Update Nations.json 
Two more City-States: Zanzibar and Singapore
 2019-09-17 08:15:54 +03:00
Smashfanful
d7d7d9a7e6 Update Nations_Italian.json 2019-09-16 19:50:59 +03:00
Smashfanful
9b9dec952b Update Nations_Italian.json 
Persian and Irochese civs, and two new City-States
 2019-09-16 19:50:59 +03:00
Smashfanful
4cd30d8301 Update Diplomacy,Trade,Nations.json 2019-09-16 19:50:06 +03:00
Smashfanful
2dccc6cf90 Update Buildings.json 
Since the Persian Civilization is on the go, I guess we can work this out.
 2019-09-16 19:49:43 +03:00
Smashfanful
1b4b326cf7 Update Units,Promotions.json 
Italian Translations
 2019-09-16 19:49:11 +03:00
lishaoxia1985
390254b584 instead some font-sizes with the one is often used in game and doesn't need to be created again, adjust the construction table in city screen (#1080) 
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update

* update

* update

* update

* update

* viewport
 2019-09-16 19:48:41 +03:00
Yair Morgenstern
f03dfc10d6 Lakes provide 2 food, as per original Civ 2019-09-16 06:40:35 +03:00
Yair Morgenstern
3084a5bc33 Added Persian civilization 2019-09-15 15:17:56 +03:00
Yair Morgenstern
9665c59782 Changed some border icons to filled icons, which look way better in-game 2019-09-15 14:53:18 +03:00
Yair Morgenstern
d645ae4478 Added Iroquois civilization 2019-09-15 12:13:14 +03:00
Yair Morgenstern
f6323edbc8 Victory screen no longer shows every turn on "one more turn" mode 
Moved Nation jsons
 2019-09-14 23:06:34 +03:00
Smashfanful
3688622d06 Update Buildings.json 
Added translations for Wonder Quotes
 2019-09-14 21:04:39 +03:00
Smashfanful
610795beef Update Buildings.json 2019-09-14 21:04:19 +03:00
pikkolpk
90e9cf056c Update Diplomacy,Trade,Nations.json 2019-09-14 21:03:57 +03:00
Yair Morgenstern
656c94a2a3 Revert "Nubian Pitati Archer and Australian Digger" 
This reverts commit 00f66a785f.
 2019-09-12 19:46:56 +03:00
Yair Morgenstern
fe3cd222ef Revert "Australian Outback Station" 
This reverts commit dbdf2d819f.
 2019-09-12 19:46:22 +03:00
Smashfanful
dbdf2d819f Australian Outback Station 2019-09-12 19:44:04 +03:00
Smashfanful
00f66a785f Nubian Pitati Archer and Australian Digger 2019-09-12 19:43:48 +03:00
lishaoxia1985
5f43c93846 MrUldiggg delete some words which are necessary. please update immediately (#1069) 
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update
 2019-09-12 19:42:29 +03:00
lishaoxia1985
6e34f4743a update translation (#1067) 
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程
 2019-09-12 13:05:58 +03:00
Yair Morgenstern
05a77a9a68 Fixed "units deselect after next turn" problem 
Popup alerts now come before trade request popups
 2019-09-11 21:18:01 +03:00
MrUldiggg
ed807551eb Philipinnes.json 
Philippines Civilization
 2019-09-11 19:42:19 +03:00
Smashfanful
9d9aebc35a Australian Civilization (#1066) 2019-09-11 19:40:54 +03:00
Smashfanful
4bef4719cc Nubian Civilization 2019-09-11 19:39:21 +03:00
Yair Morgenstern
b8c3bd402f Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-11 19:37:09 +03:00
Yair Morgenstern
5cc169a828 Added half the wonder quotes 2019-09-11 19:35:42 +03:00
Smashfanful
7578cf4bbc Update Units,Promotions.json (#1061) 
* Update Units,Promotions.json

Missing Italian Translation, and I think I accidentally deleted the Spanish translation for Turtle Ship

* Update Units,Promotions.json
 2019-09-11 11:22:40 +03:00
lishaoxia1985
99959c9937 delete one english selectlanguage because menu have two choice, enlarge overview's image icon because it's too small to align. (#1058) 
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程
 2019-09-10 17:41:45 +03:00
Yair Morgenstern
1cf049f82f Added popups after construction of wonder is complete 2019-09-10 00:11:25 +03:00
lishaoxia1985
a8663dda91 fix that researched tech can be picked when we pick a free tech (#1049) 
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt
 2019-09-09 22:43:00 +03:00
Smashfanful
6fb2f402f1 Update Nations_Italian.json 2019-09-09 15:51:43 +03:00
Smashfanful
0eed8b04ba Update Notifications.json 2019-09-09 15:51:25 +03:00
Smashfanful
d1f1acf3e0 Update Other.json 2019-09-09 15:51:03 +03:00
Smashfanful
9bf944afad Update NewGame,SaveGame,LoadGame,Options.json 
Italian Translations
 2019-09-09 15:50:45 +03:00
Yair Morgenstern
9e0ba99c0a Invalid trade requests (e.g. giving a city that isn't yours anymore or resources you no longer own) are discarded at the beginning of the civ's turn 2019-09-08 23:33:39 +03:00
Yair Morgenstern
7603d3c839 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-08 19:27:58 +03:00
Yair Morgenstern
462fc6fab7 English translations 2019-09-08 19:27:00 +03:00
lishaoxia1985
c06028b082 update translation (#1041) 
* systemProp

* 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-09-08 19:25:49 +03:00
Smashfanful
fc76052ee5 Update Diplomacy,Trade,Nations.json 
More Italian Translations
 2019-09-08 19:22:21 +03:00
Smashfanful
400ef5d07e Update Notifications.json 
An Italian translation line more
 2019-09-08 19:21:58 +03:00
Smashfanful
4a00ed95f1 Update Units,Promotions.json 
Forgotten Italian translations
 2019-09-08 18:58:54 +03:00
Smashfanful
afd5815d30 Update Nations.json 2019-09-08 16:21:43 +03:00
Smashfanful
e8516e4455 Update Units,Promotions.json 
Italian Translations
 2019-09-08 16:21:02 +03:00
Smashfanful
3ee61c8902 Update Nations_Italian.json 2019-09-08 16:20:46 +03:00
pikkolpk
cc12018428 Russian Translation (#1042) 
* Update NewGame,SaveGame,LoadGame,Options.json

* Update Other.json

* Update Policies.json

* Update Terrains,Resources,Improvements.json

* Update Units,Promotions.json

* Update Other.json
 2019-09-08 13:12:43 +03:00
Yair Morgenstern
c9f6ba958f Can no longer adopt policies after being defeated 2019-09-07 21:24:28 +03:00
lishaoxia1985
53aaceb06b update Chinese translation，Russian translation Lost a word ("), please update it immediately！ (#1028) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-09-07 21:08:36 +03:00
Smashfanful
60b031ada7 Update Policies.json 
Added projects for Patronage branch
 2019-09-07 21:04:34 +03:00
Smashfanful
93130105fd Update Units,Promotions.json 2019-09-07 21:04:02 +03:00
Smashfanful
d56b469e6c Update Diplomacy,Trade,Nations.json 
Another Italian translation
 2019-09-07 21:03:36 +03:00
Smashfanful
27e28ddb81 Update Other.json 
More Italian translations
 2019-09-07 21:03:19 +03:00
Smashfanful
4f9f11805c Update Terrains,Resources,Improvements.json 
Added an Italian translation
 2019-09-07 21:02:46 +03:00
Smashfanful
0613c322bd Update NewGame,SaveGame,LoadGame,Options.json 
More Italian translations
 2019-09-07 21:02:29 +03:00
Smashfanful
76bf219abd Update Nations_Italian.json 
Added Korean civ
 2019-09-07 21:02:10 +03:00
pikkolpk
45b12c7d89 Update Diplomacy,Trade,Nations.json 2019-09-07 21:01:47 +03:00
pikkolpk
c2c01adec8 Update Buildings.json 2019-09-07 21:01:17 +03:00
Smashfanful
b945b49248 Update Units,Promotions.json (#1021) 
* Update Units,Promotions.json

* Update Units,Promotions.json

Correction for Hwacha to Hwach'a
 2019-09-06 15:08:50 +03:00
Yair Morgenstern
17b3069668 Added confirmation popup when deleting maps 2019-09-05 21:50:33 +03:00
Yair Morgenstern
d3a6417996 Can no longer pick policies in multiplayer when it's someone elses turn 2019-09-05 21:45:04 +03:00
lishaoxia1985
faa90dd269 update chinese traslation (#1026) 
* systemProp

* update

* update

* update
 2019-09-05 15:27:22 +03:00
pikkolpk
359ac26f1f Update Diplomacy,Trade,Nations. (Russian translation) 2019-09-04 22:53:44 +03:00
Yair Morgenstern
59cb9f972c You now see your own Diplomacy screen when in multiplayer, and not that of the current player 2019-09-04 20:12:13 +03:00
lishaoxia1985
455de79d28 Update chinese translation (#1024) 
* systemProp

* update

* update
 2019-09-03 21:10:42 +03:00
Smashfanful
225976365e Update Buildings.json 2019-09-03 21:05:11 +03:00
Smashfanful
4b530ebe38 Update Diplomacy,Trade,Nations.json 2019-09-03 21:04:56 +03:00
Yair Morgenstern
eeb1c26ef5 Added Korean civ 2019-09-02 23:44:29 +03:00
pikkolpk
9fa6c4ffce Update Units,Promotions.json (Russian Translation) 2019-09-02 22:44:32 +03:00
pikkolpk
4090f52606 Update Notifications.json (Russian translation) 2019-09-02 22:44:15 +03:00
pikkolpk
f18d1fdaf3 Update Buildings.json 2019-09-01 23:06:00 +03:00
pikkolpk
16a362ac2f Update Techs.json 2019-09-01 23:06:00 +03:00
pikkolpk
a99e7866e6 Update Units translation(Russian) 2019-09-01 23:06:00 +03:00
Yair Morgenstern
675d05d1e4 Minor fixes to multiplayer UI components 2019-09-01 17:18:08 +03:00
Yair Morgenstern
a032269cd9 Resolved #563 - Added American unique B17 and Japanese unique Zero units 2019-09-01 16:35:20 +03:00
Yair Morgenstern
ab26f66e1a Implemented Alexander's unique - #563 2019-09-01 15:26:27 +03:00
Smashfanful
9a3ea36e2d Update Other.json 2019-09-01 15:16:18 +03:00
Smashfanful
743ecf3560 Update NewGame,SaveGame,LoadGame,Options.json 2019-09-01 15:16:10 +03:00
Smashfanful
52aec60fba Update Notifications.json 
Corrections (Italian)
 2019-08-25 21:51:29 +03:00
Kirill-Osmanov
30d8a03e3c Updated translations 
Updated translations (ru)
 2019-08-25 21:50:54 +03:00
Yair Morgenstern
c685e0f528 Resolved #1007 - trades and alerts now work again, which means they'll also work in multiplayer =) 2019-08-21 23:44:28 +03:00
Yair Morgenstern
03228a6546 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-08-20 10:56:20 +03:00
Yair Morgenstern
b9baa654ab Added End Game Messages for varioud victory types 2019-08-20 10:55:27 +03:00
Am-per-Sand
b1162b50fd Polish minor corr. & add. Buildings.json 2019-08-19 20:13:38 +03:00
Kirill-Osmanov
b763a4a051 Updated translations 
The small changes in translations (ru)
 2019-08-18 23:43:44 +03:00
Yair Morgenstern
5f4f6eb206 Fixed Infantry obsolete tech 2019-08-18 22:36:13 +03:00
Kirill-Osmanov
e1cb58bf53 Update NewGame,SaveGame,LoadGame,Options.json 
A small changes in translations (ru)
 2019-08-17 23:43:30 +03:00
Smashfanful
0adc3c9548 Update Diplomacy,Trade,Nations.json (#981) 
* Update Diplomacy,Trade,Nations.json

* Update Diplomacy,Trade,Nations.json

* Update Diplomacy,Trade,Nations.json

Remotion of unecessary (at least for now) translation lines
 2019-08-16 09:40:25 +03:00
Smashfanful
87a5ceb947 Update Nations_Italian.json 
Remotion of these 4 City-States
 2019-08-09 15:59:08 +03:00
Smashfanful
755c488012 Update Nations_Italian.json 2019-08-09 15:59:08 +03:00
Smashfanful
32f257cef6 Update Nations_Italian.json 2019-08-09 15:59:08 +03:00
Smashfanful
734b5f0778 Update Other.json 
New Italian translations
 2019-08-09 15:58:10 +03:00
Yair Morgenstern
d7cd305e1c Added image for Polish language 2019-08-08 20:57:49 +03:00
Yair Morgenstern
375952f935 More polish changes 2019-08-07 22:04:42 +03:00
Yair Morgenstern
9cbd442d5b Polish translation technical fixes 2019-08-07 21:50:55 +03:00
Hades1696
de2dae97a9 Polish translation 
Till denouncing.
 2019-08-07 21:11:31 +03:00
Smashfanful
dc44783ca7 Update Buildings.json 
Correction of a translation line
 2019-08-07 21:11:15 +03:00
Hades1696
e594e7af7a Polish translation of building.json complete 2019-08-07 21:10:56 +03:00
Hades1696
33d3e685f5 Polish translation 
'Till forbidden palace
 2019-08-07 12:09:13 +03:00
Smashfanful
f3ba4b5486 Update NewGame,SaveGame,LoadGame,Options.json 2019-08-04 19:44:37 +03:00
Smashfanful
2a7ba5291b Update NewGame,SaveGame,LoadGame,Options.json 2019-08-04 19:44:37 +03:00
Yair Morgenstern
691d905c9f Resolved #983 - city-state defeat messages were empty 2019-08-01 21:40:16 +03:00
Smashfanful
09032aa7fc Update Notifications.json 2019-08-01 21:26:06 +03:00
Smashfanful
4d341aa083 Update Other.json 2019-08-01 21:25:03 +03:00
Smashfanful
9aa12493e3 Update Techs.json (#968) 
* Update Techs.json

Added Lasers and Mobile Tactics

* Update Techs.json

Correction
 2019-07-30 17:59:07 +03:00
Smashfanful
f5d25c2fd5 Update Notifications.json 2019-07-30 10:18:14 +03:00
Smashfanful
5ed7f6aaa6 Update Buildings.json 2019-07-30 10:17:54 +03:00
Yair Morgenstern
2799205884 Demands now work between human players! 2019-07-29 17:03:24 +03:00
Yair Morgenstern
6dc471850e Trades are no longer instantaneous, but consist of sending a trade request on the requestor's turn and accepting/denying it on the reciever's turn. 
This allows us to FINALLY enable trade between human players, enables PvP in hotseat multiplayer, and paves the way to real multiplayer!
 2019-07-29 16:31:21 +03:00
Yair Morgenstern
98eb4c8cd7 Travis test + minor fixes 2019-07-27 23:21:40 +03:00
Yair Morgenstern
b131372b13 Fixed "units from ruins block activating unit" bug and fixed colors for new city states 2019-07-27 22:34:57 +03:00
Smashfanful
99bce1de30 Update Nations_Italian.json 
Corrections
 2019-07-25 18:37:39 +03:00
Smashfanful
7a9594775f Update Nations_Italian.json 
Added Almaty and Edimurgh
 2019-07-25 18:37:39 +03:00
Smashfanful
4589c52b21 Update Nations.json 
Corrections
 2019-07-25 18:37:20 +03:00
Smashfanful
bd3ebf688c Update Nations.json 
Added Almaty and Edimurgh
 2019-07-25 18:37:20 +03:00
Smashfanful
8f8ab75182 Update Units,Promotions.json 2019-07-25 18:35:49 +03:00
Smashfanful
0db114af0c Update NewGame,SaveGame,LoadGame,Options.json 2019-07-25 18:35:24 +03:00
Smashfanful
5bf7ca0762 Update Tutorials_Italian.json 
Italian Update for Tutorials
 2019-07-25 18:34:56 +03:00
Yair Morgenstern
994e313101 Added Game Speed option - part of #559 2019-07-24 18:35:06 +03:00
Yair Morgenstern
7d38841eb8 Added tutorial for 'Next unit' 2019-07-24 17:58:32 +03:00
Yair Morgenstern
2c10ce2fb5 Memory performance tweaks 
Renamed nation Main and Secondary to Outer and Inner colors, to be more clear what we're laking about
 2019-07-24 11:55:10 +03:00
Smashfanful
d33a553d58 Update Diplomacy,Trade,Nations.json 2019-07-23 18:30:33 +03:00
Yann
db9f776e1f Update French version of Diplomacy,Trade,Nations 2019-07-22 16:27:56 +03:00
Yann
8e404b548e Update French version of Buildings.json 2019-07-22 16:27:41 +03:00
Yann
0000c95693 Update French version of Units.promotions.json 2019-07-22 16:27:27 +03:00
Yann
f4600038fb Update French version of Notifications.json 2019-07-22 15:53:10 +03:00
Yann
08d7c75fa8 Update French version of Other.json 2019-07-22 15:52:20 +03:00
Yair Morgenstern
e73ad76227 Resolved #931 - added Barbarian Brute as a replacement to the Warrior 2019-07-21 22:49:04 +03:00
Yair Morgenstern
e9e0e55b5e Resolved #952 - fixed building requirements for Neuschwanstein, Stone Works, Windmill and Spaceship Factory 2019-07-21 19:54:16 +03:00
Yair Morgenstern
c7042dd5cf Resolved #948 - Seaport requires Harbor 2019-07-21 19:44:20 +03:00
Yair Morgenstern
99274ccda1 Resolved #949 - could construct Ironworks without Workshops 2019-07-21 19:41:17 +03:00
Yair Morgenstern
7d8e3f76c3 Destroyers now have a chance to intercept air attacks 2019-07-19 15:24:44 +03:00
Yair Morgenstern
558bba44cc Added Anti-Aircraft gun unit, and intercept range on non-ranged units 2019-07-19 14:40:29 +03:00
Yair Morgenstern
b565489fd5 Changed "free population" in cities to "unassigned population" to be less confusing 2019-07-19 14:01:16 +03:00
Yair Morgenstern
90318ef93b Tech reorg - added Lasers and Mobile Tactics, tech tree is now almost 100% G&K 2019-07-17 22:21:05 +03:00
Yair Morgenstern
0ba243c5d8 Added Bomber unit 2019-07-17 21:33:33 +03:00
Yair Morgenstern
dd0cdac077 Fixed italian crash 2019-07-17 21:23:37 +03:00
Smashfanful
c406d01de5 Update Units,Promotions.json 2019-07-17 20:10:07 +03:00
Smashfanful
a4f360de3b Update Units,Promotions.json 
Added new lines
 2019-07-17 20:10:07 +03:00
Smashfanful
749771daf4 Update Techs.json 2019-07-17 12:53:58 +03:00
Yair Morgenstern
8f30db74ab Added Radar tech and Fighter unit 2019-07-16 22:52:15 +03:00
Yair Morgenstern
b9a7f7e1d0 Added Great War Bomber 
Air units now require Oil
 2019-07-15 22:45:32 +03:00
Smashfanful
23c221abd3 Update Nations_Italian.json 2019-07-14 17:41:14 +03:00
Smashfanful
b43bd88f07 Update Nations.json 
Changed Oslo in Venice, changed Ur's colours, and added Sidon
 2019-07-14 17:36:20 +03:00
Yair Morgenstern
7bbd006180 Added BFS for arial movement 2019-07-13 22:48:47 +03:00
Smashfanful
367e1d8517 Update Nations.json 
Added Tyre, Ur, Brussels, Kabul, Oslo and Genoa (hopefully)
 2019-07-13 22:39:23 +03:00
Yair Morgenstern
d9942aec7c Added all promotions for air units, and a couple for other units that were previously missed 2019-07-11 22:35:22 +03:00
Yair Morgenstern
e78f408bff Translation fixes 2019-07-11 21:21:45 +03:00
Smashfanful
a8b2a4471e Update Other.json 2019-07-11 21:19:06 +03:00
Smashfanful
2118fde87b Update Notifications.json 2019-07-11 21:17:32 +03:00
Smashfanful
002bec7ba7 Update Units,Promotions.json 2019-07-11 21:15:26 +03:00
Smashfanful
35edf4874f Update Nations_Italian.json 2019-07-11 21:14:53 +03:00
Smashfanful
977ba5f5e9 Update Diplomacy,Trade,Nations.json 2019-07-11 21:14:41 +03:00
Smashfanful
9780be455d Update Diplomacy,Trade,Nations.json 2019-07-11 21:14:41 +03:00
Duan Tao
cae3d49738 Add notification translation. 2019-07-11 10:05:29 +03:00
Duan Tao
a8e248b892 Add Militaristic type city-state. 2019-07-11 10:05:29 +03:00
Yair Morgenstern
214b4880e4 AIR UNITS ARE GO! 
Added interception and basic air unit AI
 2019-07-10 22:41:44 +03:00
Smashfanful
d7cfdf3e83 Update Nations_Italian.json 2019-07-10 19:17:26 +03:00
Smashfanful
f4acd3005d Update Diplomacy,Trade,Nations.json 2019-07-10 19:16:29 +03:00
Yair Morgenstern
ab7ce12a87 Resolved #687 - can now place starting locations for specific civs in the map editor 2019-07-07 23:55:43 +03:00
Yair Morgenstern
070d780e18 Unit table now displays range for ranged units 
Air units are ranged units
Moving air units around now works completely!
 2019-07-05 14:27:39 +03:00
Yair Morgenstern
8d79cca70d Fixed Ottomans naval capture unique 2019-07-05 12:23:58 +03:00
Yair Morgenstern
185ec10f10 Can now see when city contains air units 2019-07-03 23:32:17 +03:00
Smashfanful
273b06aa3a Update Other.json 
Italian corrections.
 2019-07-02 12:15:48 +03:00
Am-per-Sand
275fa5842a Shorten city screen strings of Other.json 
Stopped population growth
...turns to lose/new population
expansion turns to, - stopped
 2019-06-30 22:25:13 +03:00
Yair Morgenstern
0eb28b9ae7 Great General bonus affects naval units (as long as we don't have Great Admirals in the game) 2019-06-30 19:48:47 +03:00
Am-per-Sand
12b9472805 Fixed same name for different units bug 2019-06-29 23:17:46 +03:00
Smashfanful
06d1bd6881 Update Nations_Italian.json 2019-06-27 11:38:33 +03:00
Smashfanful
ac664d97c9 Update Units,Promotions.json 2019-06-27 07:26:05 +03:00
Am-per-Sand
ad2704f6af typo fix in Notifications 2019-06-27 07:25:28 +03:00
Yair Morgenstern
921dd28296 Unified "Bonus vs" translations 2019-06-25 23:09:58 +03:00
Yair Morgenstern
c517dd9d64 Added the Ottomans! #703 2019-06-25 23:00:55 +03:00
Yair Morgenstern
7e50f70bd5 Resolved #899 - Added setting to disable city auto-picking construction 2019-06-24 19:35:45 +03:00
Smashfanful
2f97ed54c0 Update NewGame,SaveGame,LoadGame,Options.json 2019-06-24 14:48:55 +03:00
Smashfanful
469553de14 Update Nations.json 2019-06-24 12:35:04 +03:00
Smashfanful
78ad8a932a Update Nations_Italian.json 2019-06-24 08:11:24 +03:00
Smashfanful
be02ad5839 Update Diplomacy,Trade,Nations.json 
Added other leaders
 2019-06-24 08:11:07 +03:00
Yair Morgenstern
3b9ab43bbe Resolved #898 - added option to disable tutorials 2019-06-24 06:43:51 +03:00
Yair Morgenstern
d9bd0fa6b8 Resolved #897 - split initial tutorial, which was too long, into several parts 2019-06-24 06:37:45 +03:00
Smashfanful
18d7446fab Update Diplomacy,Trade,Nations.json 
Added Leader names
 2019-06-23 08:56:40 +03:00
Smashfanful
bc26edfe81 Update Other.json 
Added new translation lines
 2019-06-23 08:56:17 +03:00
Smashfanful
d0dc3e4bd6 Update Nations_Italian.json 2019-06-22 23:23:42 +03:00
Smashfanful
418bc140e8 Update Units.json 
I f**king messed up Ballista. HOORRAAY!
 2019-06-21 13:47:03 +03:00
Smashfanful
af295f4fab Update Units.json 
Added Composite Bowman
 2019-06-21 13:20:39 +03:00
Smashfanful
beedcc5896 Update Buildings.json 
Corrections and additions
 2019-06-20 20:44:30 +03:00
Smashfanful
d39e57bf46 Update Units,Promotions.json 
Added Landsknecht
 2019-06-19 10:40:07 +03:00
Smashfanful
353d6a6557 Update Notifications.json 2019-06-17 20:41:51 +03:00
Smashfanful
9c0995ad5a Update Nations_Italian.json 2019-06-17 20:41:07 +03:00
Smashfanful
a18616a25b Update Diplomacy,Trade,Nations.json 2019-06-17 20:40:31 +03:00
Yair Morgenstern
853a325876 Added German nation - #703 2019-06-17 11:20:15 +03:00
Smashfanful
eb711b9a79 Update Diplomacy,Trade,Nations.json 
Added new translation lines
 2019-06-16 20:40:34 +03:00
Smashfanful
be7baaa117 Update NewGame,SaveGame,LoadGame.json 2019-06-16 18:42:54 +03:00
Smashfanful
0726e7799d Update Notifications.json 
New Translation lines
 2019-06-16 18:42:32 +03:00
david.enrique
56ff436f94 Add victory type choice on new game screen 2019-06-15 22:38:02 +03:00
Smashfanful
f50e9c186d Update Other.json 2019-06-15 22:28:16 +03:00
Yair Morgenstern
5943d1e12e Apollo Program is now a NATIONAL wonder, so multiple civs can compete for Science Victory 2019-06-13 22:10:52 +03:00
Smashfanful
5ddd4c7d7b Update Nations.json 
Added Siamese (in comments)
 2019-06-13 15:23:56 +03:00
Smashfanful
6d82e42e1c Update Nations_Italian.json (#869) 
* Update Nations_Italian.json

Corrections

* Update Nations_Italian.json

* Update Nations_Italian.json
 2019-06-13 15:23:31 +03:00
Yair Morgenstern
b7be0e7934 Each Civ now has a preferred victory type, and makes construction choices based on said type 2019-06-12 22:01:37 +03:00
Smashfanful
772a825cfa
Update Diplomacy,Trade,Nations.json 2019-06-10 16:02:53 +02:00
Yair Morgenstern
d5a0894f75 Added diplomatic reprecissions for demands that the other civs is unwilling to fulfil 
Removed WeAgreedNotToSettleNearThem flag - was reverse copy of AgreedNotToSettleNearUs
 2019-06-10 16:18:59 +03:00
Smashfanful
477a4c4dc4 Update Other.json 
Added some Italian translations
 2019-06-09 22:37:22 +03:00
denrique88
0803063017 Correction of french translation of the tutorial 2019-06-09 22:29:43 +03:00
Yair Morgenstern
84bcfe2d39 Added "Community" tab in the menu, with links to the Github and Discord 2019-06-07 15:55:48 +03:00
Smashfanful
8e9fc1108e Update Diplomacy,Trade,Nations.json 
New Italian translations
 2019-06-07 14:32:56 +03:00
Smashfanful
5451eb0540 Update Nations_Italian.json 
Corrections. That must be the cause for the crashes in the Italian version.
 2019-06-07 14:32:21 +03:00
Yair Morgenstern
f713d266db Implemented "Don't settle cities near us", which goes both ways - a good basis for further demands (#831) 2019-06-07 13:04:18 +03:00
Yair Morgenstern
e8bdb8a2e4 Added initial logic for promising not to settle cities near other civs - not yet activated 2019-06-05 23:21:17 +03:00
Yair Morgenstern
ab450808b2 Can no longer pass the turn when popups have not been dealt with 2019-06-05 23:18:03 +03:00
Smashfanful
0153added5 Update Nations.json 2019-06-04 18:04:11 +03:00
Smashfanful
a039c6592b Update Nations.json 
Corrections and addition of Greek unique
 2019-06-04 18:04:11 +03:00
Smashfanful
3e22cdf72d Update Nations_Italian.json 2019-06-04 18:03:34 +03:00
Smashfanful
0cedc1a5e8 Update Nations_Italian.json 
Added Greek Unique
 2019-06-04 18:03:34 +03:00
Smashfanful
9bfa71898a Update Units.json 2019-06-04 12:34:28 +03:00
Smashfanful
d8d5274c9e Update Units,Promotions.json 2019-06-04 12:33:52 +03:00
Yann
f0293b5f2a Update French Translation for Diplomacy,Trade,... 2019-06-04 12:33:05 +03:00
Smashfanful
5dcaaab0d1 Update Italian Translation Other 
Added a missing Italian translation
 2019-06-04 12:32:37 +03:00
Yann
e7bd6fb0b3 Update French Translation of NewGame,SaveGame,... 2019-06-04 12:32:04 +03:00
Yann
9b7baa6a9e Update French Translation on Notification 2019-06-04 12:31:37 +03:00
Yann
493d21ff54 Update French Translation of Buildings 2019-06-04 12:31:03 +03:00
Yann
6f0016134d Update French Translation of Units.Promotions 2019-06-04 11:13:32 +03:00
Yann
1b5960477c Update French Translation of Other 2019-06-04 11:13:04 +03:00
Yair Morgenstern
cf37122304 Translation organization 2019-06-02 23:31:16 +03:00