1439 commits

Author	SHA1	Message	Date
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
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	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
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
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
Prosta4okua	d537eca46e	Update Tutorials_Ukrainian.json (#1343)	2019-12-08 21:14:12 +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
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	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
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