Commit graph

1758 commits

Author SHA1 Message Date
Yair Morgenstern
6e03910097 Fixed crashing error when loading mods
Load game now shows user ShowableUncivExceptions
2020-04-27 19:23:59 +03:00
uncivbot[bot]
cee8b58e5a
Translations update (#2527)
* Update Indonesian.properties (#2519)

Minor updates

* Update Simplified_Chinese.properties (#2526)

* Update Russian.properties (#2521)

Lines from Tutorials are translated.
Entered Pericles quote for Mausoleum of Halicarnassus.

* Update Russian.properties (#2523)

* German translations 2020 04 24 (#2511)

* Still more german readability improvements and nation text

* More german translations

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

* Update German.properties (#2515)

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
Co-authored-by: BadaTheBada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
2020-04-27 10:53:17 +03:00
SomeTroglodyte
5e5a175f06
Terrace Farms: Bonus resource restriction (#2522) 2020-04-26 19:39:48 +03:00
Yair Morgenstern
e50e2ad5d2 3.8.2
Translations writer updated to handle new older structure
2020-04-26 00:26:14 +03:00
uncivbot[bot]
28aae7b9e8
Translations update (#2516)
* Update Portuguese.properties (#2501)

* Update Italian.properties (#2506)

* Added translations for Danish/Scandinavian towns (#2509)

* Update Portuguese.properties (#2512)

* Update Indonesian.properties (#2505)

Co-authored-by: guilherme-peev <guilherme.peev@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Elizabeth Sherrock <lizzyd710@gmail.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-04-25 23:56:50 +03:00
Yair Morgenstern
c2fdcb7849 Prepping for multiple rulesets - current ruleset is now is Vanilla folder 2020-04-24 14:03:41 +03:00
Yair Morgenstern
f318df68ce Resolved #2491 - Terrace farms are not precluded by resources 2020-04-24 11:15:56 +03:00
SomeTroglodyte
289bf62e99
Typos in json and translations: Suzdal, Edinburgh defeat (#2504) 2020-04-24 00:40:56 +03:00
Yair Morgenstern
6c5eed4dd9 3.8.1 2020-04-23 20:17:58 +03:00
uncivbot[bot]
c890895f39
Translations update (#2500)
* French translation fixes (#2484)

* Replace tile improvement term in FR to match Civ terminology

* FR fixes for tutorial

* FR fixes for buildings and diplomacy

* FR fixes for Trade, Nation and City-State

* FR fixes for Menus and notifications

* FR - Removed particles in front of civ names

* FR - fix non translated string (419 -> 335)

Most of the fixes here are city or place names.
These were extracted from Wikipedia French articles matching the
corresponding english article.

Thanks goes to https://wikipedia.org

* FR - fix space before "!", typo, translate falsely translated tutorial lines

* Translations (#2490)

* Translations are added and corrected

* Translations for the main screen

* Update Indonesian.properties (#2487)

* Update Indonesian.properties

Finished all required translations
Some tweaks and corrections
Enjoy, Indonesians

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Luke Marlin <luke.marlin@viacesi.fr>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-04-23 20:09:31 +03:00
Yair Morgenstern
c73df02d76 Unified City States and City-States -> City-States #2497 2020-04-23 19:39:16 +03:00
Yair Morgenstern
688b780b14 Added a repeating baclground to the menu screen 2020-04-21 23:53:33 +03:00
Yair Morgenstern
700b1afb34 3.8.0 2020-04-21 20:28:41 +03:00
uncivbot[bot]
a84131d550
Translations update (#2483)
* A lot of cities are translated (#2472)

* Update Indonesian.properties (#2475)

* Update Indonesian.properties

Added most of the Lines from Nations.json

* Update Indonesian.properties

Added all if not most of the quotes translations (phew it's exhausting to translate it all)
Finished the cities and policies translation
Plus some other corrections
This should be it (99%)
Thanks for all your support, especially yairm210 for keeping this game updated with my translation work <3

* Update Italian.properties (#2477)

* Update Italian.properties

* Update Italian.properties

* Some more german translations (#2480)

Co-authored-by: proteus-anguinus <16001896+rh-github-2015@users.noreply.github.com>

* fixed a spelling mistake (#2476)

* fixe a spelling mistake

* Update German.properties

* Update Czech.properties (#2473)

- new texts (tutorials mostly)

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

Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: proteus-anguinus <16001896+rh-github-2015@users.noreply.github.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-04-21 20:19:01 +03:00
Yair Morgenstern
5aae57d848 Added icons to the main menu, looks much better! 2020-04-21 14:18:38 +03:00
Yair Morgenstern
227f7327c5 Fixed the build 2020-04-21 00:24:36 +03:00
Yair Morgenstern
b6fc37aad8 Resolved #1936 - can sign Declarations of Friendship in Multiplayer 2020-04-20 18:29:16 +03:00
Yair Morgenstern
6af3cc6d54 Tutorial fixes 2020-04-20 12:25:14 +03:00
Yair Morgenstern
3f97daf1da 3.7.6 2020-04-19 23:55:11 +03:00
uncivbot[bot]
1a8f6448f9
Translations update (#2470)
* Update Italian.properties (#2451)

* Spanish.properties (#2464)

* Update Indonesian.properties (#2457)

* Update Indonesian.properties

I've done a lot of translations and correction to some things in this Indonesian translation. May this helps. I will continue updating this in the upcoming days ASAP.

* Second update of Indonesian properties

Added: Tutorials.json translation
and some correction

* Translations (#2454)

* Translations

* Translations of era are already included from Tech.json

* More tutorial translations

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: WillianBlack <63936035+WillianBlack@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-04-19 22:53:29 +03:00
Jack Rainy
77a63ce365
Citadel improvements + improved AI for the forts (#2453)
* Allow building the citadels either next to or within friendly tiles only

* Citadel acquire the tiles around it

* AI uses the citadels to get the tiles back + improved AI for the forts
2020-04-18 21:25:48 +03:00
Yair Morgenstern
a3843450bf Starting techs no longer hardcoded - this means that mods can have their own tech trees starting wherever 2020-04-17 17:52:45 +03:00
Yair Morgenstern
eba7dc8c8c All era names changed to "... era" to fit in with what is actually translated and displayed
Removed Era enum - too restrictive to tech tree variations (atomic era, anyone?)
As a side bonus, mods can now add their own eras, that'll be interesting?
2020-04-17 15:11:45 +03:00
Yair Morgenstern
4c48cfe4f3 Can now specify a mod as a 'base ruleset', and the regular base ruleset will not be added
This means that you can 'start from scratch' and build whatever you want - example "Scenario" in unciv-mod-example repo
Obviously we'll have to change around a lot of things or this to work well, but it's a start
2020-04-17 14:42:15 +03:00
Yair Morgenstern
ffe8691df9 Disabled city-state notifications when the city state is defeated 2020-04-17 14:13:18 +03:00
Yair Morgenstern
f9e7411569 3.7.5 2020-04-17 11:58:42 +03:00
uncivbot[bot]
8ae78b9446
Translations update (#2446)
* Update Italian.properties (#2429)

You also forgot Denmark's ability

* Update Spanish.properties (#2432)

Small contribution to translation. I could finish it but I'm sleepy and I want to save the progress. It will be 100% in a couple of days.

* Update German.properties (#2440)

* Update German.properties

Meint Zeile 3434 wirklich besetzte Stadt?
bei Nations etwas weitergemacht, genderung der Sprache entfernt (versucht).
siehe git diff

* Update German.properties

added translation to a part of the tutorials

* simplified Chinese translations (#2443)

* simplified Chinese translations

* simplified Chinese translations

* simplified Chinese translations

Co-authored-by: SheepYang <332594623@qq..com>

* Update Dutch.properties (#2447)

I added some new translations, fixed some typo's and turned Tevredenheid in to Blijheid which I think is more fitting. Also n.Chr. (the Dutch version of AD) is rarely used, so it may be more fitting to just remove it after you pass v.Chr. (BC).

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CodeBlizzard <62041843+CodeBlizzard@users.noreply.github.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
Co-authored-by: SheepYang <332594623@qq.com>
Co-authored-by: SheepYang <332594623@qq..com>
Co-authored-by: SrirachaGamer87 <58479947+SrirachaGamer87@users.noreply.github.com>
2020-04-17 11:55:57 +03:00
SomeTroglodyte
cb87ae94a8
Effect of rationalism was not visible in city UI: Translations patch (#2442)
* Effect of rationalism was not visible in city UI

* Effect of rationalism was not visible in city UI - translations patch
2020-04-17 10:21:11 +03:00
SomeTroglodyte
64ec6bd26e
Bring Legion Unit closer to wiki? (#2439) 2020-04-17 10:15:41 +03:00
GGGuenni
4fc5c5de64
New screen for "Add Game" [MultiplayerScreen] (#2431)
* Adding AddGame Screen

Old button was confusing for new players

* Adding translation file entry
2020-04-16 14:44:52 +03:00
Yair Morgenstern
d031b2855b Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-16 11:06:58 +03:00
Yair Morgenstern
c1f0084fb0 Added a check to see if a policy effect was active - this is an important step towards "different effects for the same policy name", as happens between Vanilla and G&K/BNW 2020-04-16 11:05:49 +03:00
SomeTroglodyte
048ce0d3c3
Remove "Camp" hardcoding and allow mods to do similar things (#2417) 2020-04-16 10:41:29 +03:00
Yair Morgenstern
68af30acf0 3.7.4 2020-04-15 23:58:14 +03:00
uncivbot[bot]
7cac703a83
Translations update (#2426)
* Update Italian.properties (#2402)

* Update Czech.properties (#2416)

new texts, terminology improved and synced

* Update Traditional_Chinese.properties (#2420)

Updates part of the untranslated items

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
2020-04-15 23:51:33 +03:00
Giuseppe D'Addio
71f339eb26
Update Nations.json (#2409)
Changed colors for Mogadishu
2020-04-15 23:33:45 +03:00
Yair Morgenstern
3174767634 Added description for continuous rendering - #2213 2020-04-14 10:46:23 +03:00
Yair Morgenstern
f5a8211574 Resolved #2322 - added city expansion tutorial 2020-04-13 23:51:27 +03:00
Yair Morgenstern
cefd92e7ce Tutorial cleanup 2020-04-13 22:15:15 +03:00
Yair Morgenstern
f64b598d1b 3.7.3 2020-04-13 21:40:28 +03:00
uncivbot[bot]
9e24276b5d
Translations update (#2399)
* Update Italian.properties (#2387)

* Translations (#2386)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-04-13 21:36:32 +03:00
Yair Morgenstern
c5582257c9 Denmark's icon better centered
Generated translations for Denmark
2020-04-13 12:07:59 +03:00
Jack Rainy
0624542fd8
New civilization: Denmark (#2370)
* Enable the Denmark civilization

* Nation unique ability is implemented

* Units unique abilities are implemented

* Unit icons

* Misprint in the tech name is corrected
2020-04-11 22:31:53 +03:00
Yair Morgenstern
2b120f0b2a 3.7.2 2020-04-11 22:28:27 +03:00
proteus-anguinus
7511fc52df
Cancel improvement (#2359)
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* For @JoshDM - Improvement Picker offers "Cancel improvement order"

* Improvement Picker offers "Cancel improvement order" - cleanup

* Improvement Picker offers "Cancel improvement order" - cleanup 2

* Improvement Picker offers "Cancel improvement order" - cleanup 3

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-04-11 22:02:00 +03:00
uncivbot[bot]
86de66eeba
Translations update (#2385)
* Update Italian.properties (#2363)

* Update Spanish.properties (#2384)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: 71walceli <antonini2903@hotmail.com>
2020-04-11 22:01:34 +03:00
Jack Rainy
bf823f5883
Display the "Natural Wonders" tutorial (#2371)
* Update Tutorials.json

Added tutorial for Natural Wonders

* Enable displaying the Natural Wonders tutorial

* Display the tutorial when the wonder is found automatically

* Minor performance optimization

* Removing debug leftovers

See also 33da0e3a7f

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2020-04-11 21:44:34 +03:00
Yair Morgenstern
c3f038ee36 3.7.1 2020-04-08 15:36:17 +03:00
uncivbot[bot]
28f69acc1c
Translations update (#2362)
* Update Italian.properties (#2338)

* Update German.properties until line 2433 (#2351)

* Update German.properties until line 2433

line 2306, i add in german like carefully consider this proposalt "and agree" , if you dont want that, delete "und ihn anzunehmen."
line 2310, context is probably need, so I added in brackets the english version

i think there is another line in which I added the english version in brackets.

ends in line 2433

* Done most of the requested Changes.

* \n for newline, source for poem, requested changes

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
2020-04-08 15:26:03 +03:00
Jack Rainy
bd5daee9a8
Better colors for Katmandu and Almaty (#2355) 2020-04-08 15:06:25 +03:00
Yair Morgenstern
8aeb2ede78 Resolved #2305 - Added city-states and influence tutorial 2020-04-05 18:53:02 +03:00
Yair Morgenstern
e8e58bdb54 Translation updates 2020-04-05 11:21:02 +03:00
uncivbot[bot]
a4f4191956
Translations update (#2337)
* Update Czech.properties (#2321)

inca diplomacy, germany cities, few fixes and other minor translations

* Update Simplified_Chinese.properties (#2315)

Translated known entries

* Update French.properties (#2324)

* Update Korean.properties (#2336)

**Note: it isn't my native language. Proposal by 동민 on Discord**

* Translations (#2330)

* Update Italian.properties (#2327)

* Update Russian.properties (#2334)

* Перевод Вересаева! (#2335)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: woone8 <63055987+woone8@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: u-ndefine <41176671+u-ndefine@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SandrBAS <63113020+SandrBAS@users.noreply.github.com>
Co-authored-by: piggiz <63164001+piggiz@users.noreply.github.com>
2020-04-05 11:18:44 +03:00
Yair Morgenstern
c8c2bbb00a Policy screen does not auto-open when you have a free policy, instead coming from clicking the 'next turn' button - should help us solve the "screen unresponsive when I have a free policy" problem, if not eliminate it entirely 2020-04-05 10:54:16 +03:00
Jack Rainy
29a077a803
Forts and citadels (with AI) (#2325)
* Enabled Forts & Citadels

* Friendly territory checks

* Citadel damage & notifications

* Sprites, Icons, Translation & Atlas

* Obsolete tests are removed

* NullReferenceException code is fixed

* Refactoring: using the static object

* AI for the forts and citadels

* Display defence stats

* Exclude enemies tiles as candidates

Co-authored-by: r3versi <fluo392@gmail.com>
2020-04-03 11:22:27 +03:00
Yair Morgenstern
b94d624319 3.6.15 2020-04-02 14:52:25 +03:00
Yair Morgenstern
2a23d1db6c Uncivbot moved to its own repo, for future hosting reasons 2020-04-02 14:50:56 +03:00
uncivbot[bot]
d5695fdbd3
Translations update (#2312)
* Update Indonesian.properties

Not Completed.

* Update French.properties

* Update Romanian.properties

* Czech translation (#2308)

* no message

* no message

* no message

Co-authored-by: Tomáš Tříska <tomas.triska@icloud.com>

Co-authored-by: Bima-Kentang <62836197+Bima-Kentang@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: DarkerBogg <57591431+DarkerBogg@users.noreply.github.com>
Co-authored-by: uncivbot[bot] <63019250+uncivbot[bot]@users.noreply.github.com>
Co-authored-by: Iver88 <tomas.iver.triska@gmail.com>
Co-authored-by: Tomáš Tříska <tomas.triska@icloud.com>
2020-04-02 12:25:14 +03:00
Yair Morgenstern
5c32e6f2cb Tutorial typo fix 2020-04-01 20:22:39 +03:00
Jack Rainy
dde01738de
New wonders: Mausoleum of Halicarnassus, Statue of Zeus (#2301)
* New wonder: Mausoleum of Halicarnassus

* New wonder: Statue of Zeus

* Obsolete tests are removed
2020-04-01 20:12:25 +03:00
Yair Morgenstern
8965074cc3 Resolved #2135 - added tutorials for Research Agreements, Combat and Experience
The Pillaging tutorial is now available in Civilopedia
Updated translations to reflect new tutorials
2020-04-01 16:40:07 +03:00
Yair Morgenstern
235143751c Railroad is now just a black line - much clearer than the old, "nicer" image 2020-03-31 20:50:21 +03:00
Yair Morgenstern
a05dc1806b
Translations (#2292)
* Update Polish.properties (#2275)

* Update Italian.properties (#2276)

* Update French.properties (#2279)

* Traditional Chinese Update (#2283)

Update for the traditional Chinese translations.

* Update translations + notification about generated translation files (#2280)

* Translations

* Notify about successful creation of the files

* A few more translations

* Misprint is corrected

* Translations for Inca

* Translation updates

* Update Italian.properties (#2290)

* Translations (#2288)

* Update Polish.properties (#2275)

* Update Italian.properties (#2276)

* Update French.properties (#2279)

* Traditional Chinese Update (#2283)

Update for the traditional Chinese translations.

* Update translations + notification about generated translation files (#2280)

* Translations

* Notify about successful creation of the files

* A few more translations

* Misprint is corrected

* Translations for Inca

* Translation updates

Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>

* Update Italian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>

* Update Ukrainian.properties (#2291)

* Translations (#2288)

* Update Polish.properties (#2275)

* Update Italian.properties (#2276)

* Update French.properties (#2279)

* Traditional Chinese Update (#2283)

Update for the traditional Chinese translations.

* Update translations + notification about generated translation files (#2280)

* Translations

* Notify about successful creation of the files

* A few more translations

* Misprint is corrected

* Translations for Inca

* Translation updates

Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>

* Update Ukrainian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>

* Translation updates

Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-03-30 22:46:38 +03:00
Yair Morgenstern
c04b450a70
Translations (#2288)
* Update Polish.properties (#2275)

* Update Italian.properties (#2276)

* Update French.properties (#2279)

* Traditional Chinese Update (#2283)

Update for the traditional Chinese translations.

* Update translations + notification about generated translation files (#2280)

* Translations

* Notify about successful creation of the files

* A few more translations

* Misprint is corrected

* Translations for Inca

* Translation updates

Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-03-30 22:14:49 +03:00
Yair Morgenstern
f6da5342ee More contrast between Inca colors, for readability 2020-03-29 17:58:28 +03:00
Yair Morgenstern
b0a74dfa86 Resolved #1964 - Construction resource consumption is explicitly stated in construction picking and queue 2020-03-29 14:50:40 +03:00
Yair Morgenstern
806a0e2269 Resources in Civilopedia state unit and buildings that consume the resource - #1964 2020-03-29 14:29:19 +03:00
Yair Morgenstern
378f56207c Resolved #1779 - Can now lock worked tiles to prevent them from being unassigned 2020-03-29 12:42:58 +03:00
Yair Morgenstern
cf79ac0db1 Inca fixes - added icon, fixed colors 2020-03-28 22:41:55 +03:00
Yair Morgenstern
0387ce4ff6
Translations (#2273)
* Translations for unit ability withdraw before melee (#2255)

* update Chinese translation. (#2263)

* Update Czech.properties (#2262)

* Update Czech.properties

fixed typo, used better Iver88's translations lost due to conflict

* Update Czech.properties

correct "achaemenid" form

* Portuguese translations (#2271)

* Updated Portuguese translations

* Fixed typos and missing letters.

* Update Polish.properties (#2258)

* Update Polish.properties

* fix "x"

* hotfix v2

* Cities Translations

* Update Polish.properties

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

* Update Italian.properties (#2259)

* Translations (#2268)

* Translations

* Withdraw translations

* Translation file generation moved to game options,, so game modders can generate files in-game and not need to build Unciv from scratch

* Translation updates

Co-authored-by: proteus-anguinus <github2015@rheinig.de>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: W Gomes <42829628+w-gomes@users.noreply.github.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-03-28 22:32:32 +03:00
Jack Rainy
c749fe6188
Carrier must be a water ranged unit (#2267) 2020-03-28 21:31:33 +03:00
proteus-anguinus
a76147dc9e
Bring Incas into the main game (#2257)
(also changes slinger withdraw ability to inheritable)
2020-03-26 16:46:24 +02:00
Yair Morgenstern
136dac3582 Fixed Polish translations
Removed unnecessary (and breaking) unit unique translation tests
2020-03-26 11:09:00 +02:00
Jack Rainy
2d33273c8d
Translation of the mod's name (#2260) 2020-03-26 10:21:00 +02:00
proteus-anguinus
7591d7f2c6
Add unit ability 'withdraw before melee' to Caravel and Destroyer (#2256) 2020-03-25 22:25:30 +02:00
proteus-anguinus
144d53b6df
Civilopedia: Improvement: show bonus for improvingTech (#2261)
* Civilopedia improvement techupgrade

* Fixed overzealous cleanup

* 3 Languages for the new line
2020-03-25 22:24:41 +02:00
Yair Morgenstern
476632e57a
Translations (#2254)
* Update French.properties (#2235)

* Update French.properties

* Germany

* Ottomans

* Korea

* Some more

* Some more about City-states

* Update Italian.properties (#2245)

* Update Polish.properties (#2247)

* Update Czech.properties (#2248)

typos, syncing terminology, new translations

* Czech translation (#2249)

* Civ uniques

* New mod system improvement texts

* Unification of "options"

* Options

* "nuclear" unification

* Options

* World screen UI

* "adjacent" unification

* Resources

* Unit types

* Buildings

* Nations

* "sousední" is better then "sousedící"

* "Zlatá věk" typo fix

Co-authored-by: Tomáš Tříska <tomas.triska@icloud.com>

* Translation updates

Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Iver88 <tomas.iver.triska@gmail.com>
Co-authored-by: Tomáš Tříska <tomas.triska@icloud.com>
2020-03-25 16:20:40 +02:00
Yair Morgenstern
fa7097d7c3 Republic description deambiguated 2020-03-25 11:50:46 +02:00
Yair Morgenstern
acca46b40e
Translations (#2243)
* Update 2 (#2223)

A major fix on some things

* Update Italian.properties (#2226)

* Update Polish.properties (#2234)

* Update Polish.properties

* Update Polish.properties

* German translations added (#2239)

* Added german translations

* Added german translations (stopped @England)

* Update Nations_German.json

Fixed unique-enums

* Updated German.properties

* Update German.properties

Co-authored-by: Fabian Wrobel <fabian.wrobel@freenet,de>

* Translation updates

Co-authored-by: Yusyf <62476990+Yusyf@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: CarpeLuxNoctem <61473456+CarpeLuxNoctem@users.noreply.github.com>
Co-authored-by: Fabian Wrobel <fabian.wrobel@freenet,de>
2020-03-23 23:54:11 +02:00
Yair Morgenstern
d3165b80f1 More translation cleanup, when will it eeeeeeend 2020-03-23 10:17:04 +02:00
rh-github-2015
8aab5bb80b
Inca abilities: Great Andean Road, Terrace farm (#2218)
* Inca abilities for Terrace farm and Great Andean Road

* Language files re-done by manual pull and merge

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-23 10:13:40 +02:00
Yair Morgenstern
063486ab09 Impassible > Impassable change - #2225 2020-03-23 10:07:05 +02:00
rh-github-2015
4fb7e11354
Mod loader resilience (#2211)
* For #2200: Avoid MacOS tripping us

* Second hidden test in packImages

* Clearer message for a specific mod error, UI message for savegames missing mods

* Fixed obsolete imports from rejected experiments

* Tiny lint issue

* Irrelevant change to test push after rebase
2020-03-22 22:43:39 +02:00
Yair Morgenstern
3734f39101 Changed "Requires [resource]" to "Consumes 1 [resource]" to make it obvious that resource is consumed - #1964 2020-03-22 22:40:07 +02:00
rh-github-2015
c647261a18
More civilopedia info for nation and improvement (#2190)
* A little more information in civilopedia for improvements and nations

* Differentiate civilopedia and picker use

* Missing lines in translations template

* allTranslationsEndWithASpace test

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-22 21:00:18 +02:00
Yair Morgenstern
110f89e309 More translation fixes, this is becoming extremely tedious 2020-03-21 21:51:07 +02:00
Yusyf
5e5625a4a5
Update Turkish.properties (#2220)
A translation on many parts of the thing, going to continue tomorrow maybe

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 21:46:13 +02:00
Jack Rainy
9fe9a61396
Corrections to the Wonders stats (#2215)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:56:16 +02:00
Yair Morgenstern
2490943e2e All translations normalized - all new translation changes will be made to new format =) 2020-03-21 20:52:42 +02:00
armandberger
cc34576b0a
Some french translations (#2209) 2020-03-21 20:50:43 +02:00
DenysDanov
80d2bc7bed
Update Ukrainian.properties (#2208)
* Update Ukrainian.properties

Some cities was translated
Updated some tech names
Another minor fix

* Update Ukrainian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:50:29 +02:00
rh-github-2015
dbdd96848e
Update German.properties (#2204)
Changes to existing translations are I hope well thought out: I tried to limit myself to clear inconsistencies (e.g. marsh appears exactly twice and had two different translations before), stuff where I looked up the game context to best match what a native german would understand comfortably in the UI, and so on. There are still several inconsitencies - if I noticed one and couldn't bother to guarantee matching them all I left them.

Note I 'fixed' some spanish city names where the _english_ side is clearly wrong. Particularly Elche (https://goo.gl/maps/jtqPqGG2mkVbFxCe6). Actual translations are only about three where we krauts have fixed expectations deviating from the proper name. Mail me if I should fix those properly in jsons and template?

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:48:10 +02:00
rh-github-2015
627ca0ca43
New translation line for 2180 (#2201)
* Another line for translations template and its german

* Francais y espanol tambien

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:45:23 +02:00
EdinCitaku
e06d537688
Feature#2081 (#2100)
* Unit can now only be purchased if no other unit of same type is stationed in city center #2081

* #2081
Added unique to landsknecht and changed condition for movement panelty

* Refactored when statement to if
#2081

* Only one plane at a time can be purchased to a maximum of 6 that are NOT transported in a single city
#2081

* removed duplicate code
#2081

* refactor canPurchase() and now track bought units in a city in a mutableList
#2081

* refactor canPurchase() it basicly just tracks if the unit can be placed on the center tile! if it cant then we dont allow the purchase!
#2081

* Changed wording of unique and added translations
#2081

* Changed wording of unique
#2081

* removed unneeded imports
#2081

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:35:30 +02:00
Jack Rainy
d7ac7f9173
Translation refactoring - part 3 (all JSONs) (#2205)
* Refactoring: Split reading and writing of translation files

* New generator of translation strings from JSONs

* Switch to the new strings generation approach

* Using the regex for similar strings + bugfix for Submarines

* Transfer of the existing translations

* Clean up of the template file and translated files based on it

* Unit tests are updated

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:32:04 +02:00
rh-github-2015
27c0aedbbd
Clearer free promotions, nicer Maori Warrior, missing new UnitType translations (#2210) 2020-03-21 20:19:50 +02:00
Yair Morgenstern
958d1d016d
Translations (#2198)
* Update Italian.properties (#2169)

* Update Romanian.properties (#2183)

* Update Turkish.properties (#2172)

Co-authored-by: rayray61 <54810477+rayray61@users.noreply.github.com>

* Romanian Tutorial tasks translated (#2174)

Hello, I have translated the Romanian Tutorial tasks and probably the right way this time.

* some french translations (#2185)

* Update Indonesian.properties (#2186)

Kinda lazy this time cuz i'm tired, probably gonna continue later

* Update Czech.properties (#2189)

synced translation terms
some new translations - nations, uniques, babylon, grece

* Update Simplified_Chinese.properties (#2194)

Completed the diplomatic languages of India, Germany, Iloko, Persia, etc

* Update Simplified_Chinese.properties (#2195)

Translated the city states and their diplomatic languages, as well as the diplomatic languages of Sanghai, Siam, Spain and Mongolia.

* Translation updates

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: rayray61 <54810477+rayray61@users.noreply.github.com>
Co-authored-by: Vasile Stefan <62265162+FierulMare@users.noreply.github.com>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: F4R3LB3ST <superfarel2ymail.com@gmail.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: tianshidoubi <48427744+tianshidoubi@users.noreply.github.com>
2020-03-19 10:24:57 +02:00
Ivan961
f1968af3e8
Update Russian.properties (#2184) 2020-03-19 09:38:15 +02:00
Freshy
bc8198d21a
Update Polish.properties (#2173)
Some more cities translated.
2020-03-19 09:37:53 +02:00
Yair Morgenstern
7faa890bf2
Translations (#2166)
* Update Polish.properties (#2140)

Not all cities have been translated. Too much work :)

* Update Italian.properties (#2142)

* Update Japanese.properties (#2159)

* Update Russian.properties (#2165)

* Translations update (#2153)

* Updates

Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Ivan961 <59473988+Ivan961@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-03-16 23:41:00 +02:00
Jack Rainy
c7d020e32d
Filter for the custom maps (#2163) 2020-03-15 21:10:59 +02:00
Jack Rainy
2cbc0e93e0
Ice is impassible for all except submarines (#2158)
* Ice is impassible for all except submarines

* Using "unique" property + simplified call of functions
2020-03-15 18:24:52 +02:00
Jack Rainy
834e3e578c
Fix for the Knight's movement (#2151)
Resolves #2143
2020-03-14 20:15:58 +02:00
Jack Rainy
dd438f16c8
Translation refactoring - part 2 (Tutorials) (#2114)
* Make TranslationFileReader as object class

* Generate strings from Tutorials.json

* Simplified storage and loading of the tutorials

* Transfer existing translations
2020-03-12 16:38:57 +02:00
Jack Rainy
97a9a0f08c
Display an amount of gold when buying the tile (#2127) 2020-03-12 08:32:29 +02:00
Yair Morgenstern
c64b359fb5 3.6.7 2020-03-11 17:26:26 +02:00
Jack Rainy
a54189c7ba
Updated German.properties and Italian.properties (#2115)
* Update for German.properties

* Update for Italian.properties
2020-03-11 17:12:39 +02:00
Federico Luongo
2a67294554
Snow, Ice, Atoll & Map Generation (#1909)
* Snow, Atoll & Ice

* Fix White Hexagon + Small NW refactor

* More Land in Continents #1886

* Atoll can spawn only on Coast

* Added new constants and turned Constant into an object

* Latitude and Longitude utility methods

* New MapGenerator steps

* New MapParameters & MapGenerator cleanup

* Added New Map option to MapEditor menu

* New parameters default values and limits

* archipelagos map type

* Translations & Atlas

* removing unneeded octave displacement

* Fix Archipelago

* Perlin noise parameters & no-elvis in TileMap

* Rebuilt Atlas

Co-authored-by: Eddh <remi.dufour@protonmail.com>
2020-03-11 11:39:37 +02:00
Jack Rainy
15098d877c
Translations refactoring (#2096)
* Rename "translationsByLanguage" folder

* Minor refactoring

* Generate Nations strings

* Use the nations strings while creating the translation files

* Clean up of Nations files

* Transfer existing translations

* Get rid of the nation's translated name

* Transfer just few nations' translations for languages without Nations_Language.json

* Clean up of not used greetings

* Correct marking of not translated strings
2020-03-10 10:17:05 +02:00
Jack Rainy
13def8739e
Corrections according to #2101 (#2105)
* College requires Phylosophy

* "Police State" influences the courthouses, not culture borders

* "Autocracy complete" has +20 attack effect

* Translations updates
2020-03-09 00:00:32 +02:00
Federico Luongo
0cf27789e9
Borders made of oriented triangles rather than circles (#2104) 2020-03-08 20:36:50 +02:00
Nico
58f7e06b72
Moving unique abilities to an Enum (#2095)
* Unique abilities moved to enums

* remove diplomatic victory type WIP

* Address review comments. Translations for unique abilities names aren't used anywhere as far as I can tell, but added them to relevant translation files just in case.

Co-authored-by: nmeze <nicolas.mezeret@gmail.com>
2020-03-07 22:22:20 +02:00
Yair Morgenstern
54a29e28bc
Translations (#2091)
* 2 new french translations (#2078)

* Update German.properties (#2079)

Refined a few translations I stumbled upon in-game

* Update Japanese.properties (#2082)

* Added german translations (#2084)

Co-authored-by: Fabian Wrobel <fabian.wrobel@freenet,de>

* Updates

Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: Marmo <5788516+Marmo@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: CarpeLuxNoctem <61473456+CarpeLuxNoctem@users.noreply.github.com>
Co-authored-by: Fabian Wrobel <fabian.wrobel@freenet,de>
2020-03-06 16:14:09 +02:00
JackRainy
73e8b718ab
Keshiks are ranged units (#2087) 2020-03-06 10:33:08 +02:00
JackRainy
0df1907383
Distinct color for Korea (#2085) 2020-03-06 10:31:48 +02:00
Yair Morgenstern
14853547dc
Translations (#2073)
* Update Italian.properties (#2050)

* Update Polish.properties (#2058)

* Update Russian.properties (#2061)

* Update Czech.properties (#2068)

* Updates

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: l3sy <61739053+l3sy@users.noreply.github.com>
2020-03-03 22:02:05 +02:00
Yair Morgenstern
10b95c6c1c
Translations (#2049)
* Holy crswd (#2031)

HAHAA

* Update Japanese.properties (#2034)

* Translation updates

Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
2020-03-01 23:30:54 +02:00
JackRainy
eb9d2b1178
Translations update (#2047) 2020-03-01 23:17:24 +02:00
lishaoxia1985
47065e0384
modify Eiffel Tower effect. translation update. (#1955) 2020-03-01 22:25:59 +02:00
JackRainy
24e4d77453
Civilization rankings (Richest, Strongest, Most Fertile, Largest, etc.) (#2036)
* Initial preparations

* Moving to the separate package

* Calculation and visualization

* Translations

* Using a local function instead of additional class

* Using a local function instead of additional class (part 2)

* Rankings French.properties

* Fixup of the leftover

Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
2020-02-29 20:48:55 +02:00
Giuseppe D'Addio
b9682b0c80
Update Nations.json (#2028) 2020-02-29 20:11:55 +02:00
JackRainy
241ce8b4f6
Make the test actually works (#2043)
* Make the test actually works

* Fix of Nations_German.json file
2020-02-29 20:10:55 +02:00
Yair Morgenstern
f081f02006 3.6.3 (+patch1) 2020-02-27 21:57:52 +02:00
Yair Morgenstern
fa61bdfd04
Translations (#2020)
* Update Polish.properties (#1997)

* Update Polish.properties

* Update Polish.properties

This should solve the problem (and correct a small translation error)

* Update Polish.properties

Next corrections, thanks @rprzystasz

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

* New french translation (#2014)

* Update Italian.properties (#2016)

* Update German.properties (#2017)

* Update German.properties

* Create Nations_German.json

Start new file for nations translation in german

* Update Nations_German.json

* Extensive correction of French translation (#2022)

* Resolved #1986 - research agreement cost consistency

* Tile stats are shown on a row, rather than on a column (#1946)

* Feature/refactor actions (#2008)

* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips

* Major refactor to use Sequences instead of List to try to improve logic whenever getting a list of tiles at a distance.

* Get rid of extraneous parameter

* get rid of extra exception. slight refactor placeUnitNearTile for readability

* Fix bug of doing intersection instead of union

* Add an extra method to get tiles in distance range

* Refactor the UnitActions to use more sequences and also to grab the actions needed by Automation directly.

* Update based on comments

* Redo to be more easily compared

* use elvis operator for assignment

* resolve merge conflicts

* Fix typo

* Fix one more typo

* Get rid of one more search for great person actions

* Get rid of one more search for pillage action

* Try to realign methods names for better diff

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

* Resolved #2012 - manually place starting locations are no longer visible in-game

* Extensive correction of French translation

Many, many several little corrections to the French translation. A few mistakes marred gameplay a little bit, but most of them were simple grammar mistakes. But the details are always important.

* Modifications to resolve conflict

* Modifications to resolve conflict (bus)

* Modifications to resolve conflict MK3

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
Co-authored-by: Kentalot <Kentalot@users.noreply.github.com>

* Updates

Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CarpeLuxNoctem <61473456+CarpeLuxNoctem@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
Co-authored-by: Kentalot <Kentalot@users.noreply.github.com>
2020-02-27 19:57:55 +02:00
GoldenBronze
3598b51cb3
Update Nations.json (#2027) 2020-02-27 19:38:33 +02:00
wrov
9188c7790f
Multiplayer Notification Fix for random Termination (#2024)
* Reworked Notification service to remove Nullpointer crashes due to non-final static variables being null. Instead moved all state to Worker specific architecture. Also switched to Android based localization because core-based one can be unavailable to worker.

* Added missing blanks

* Added more internationalization
Added missing androidX declaration (neccessary for newer Gradle versions)
Updated Gradle for new Android Studio Version

* Optimization

* Removed missing translations error
2020-02-27 19:35:40 +02:00
JackRainy
f621ed5192
Fix for the wrong placement of purchased and upgraded units (#2006)
* Place the unit at the current position firstly

* More simple solution

* Try to place unit with traceability taken into account

* Return money and notify about the problem

* Popup dialog instead of notification

* Refactoring: Split UI and logic
2020-02-27 09:22:24 +02:00
Yair Morgenstern
41524418f4
Translations (#2010)
* Update Italian.properties (#1994)

* Update Traditional_Chinese.properties (#1998)

Another translation update, hopefully nothing goes worng?
Features the recent multiplayer patch!

* Update Nations_Italian.json (#2001)

* Update Nations.json (#2002)

* Update Czech.properties (#2004)

new strings translated - mongolia, tutorial, few miscelanenous.
few strings improved

* Translation update

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2020-02-24 20:24:14 +02:00
wrov
31d9bb0c5d
Removed pebble symbol from Unciv icon when showing persistent notification (#2003)
Optimized Notification service texts
https://github.com/yairm210/Unciv/issues/1680
2020-02-23 20:45:25 +02:00
JackRainy
6009c1b5d3
Continuous rendering is not experimental anymore (#1996)
* Continuous rendering is not experimental anymore

* Better select boxes alignment
2020-02-23 20:22:31 +02:00
JackRainy
9f0e74be1f
Display the current amount of gold in the prompt dialog (#1995) 2020-02-23 11:25:11 +02:00
Yair Morgenstern
e22eca2c10 Welp, forgot to push changes for 3.6.1 before merging other PRs
Embarrasing
2020-02-22 22:35:03 +02:00
Yair Morgenstern
e873c4ba64
Translations (#1976)
* Update Italian.properties (#1958)

* Update Polish.properties (#1960)

* Update Nations_Italian.json (#1961)

* Update Nations_Italian.json

* Update Nations_Italian.json

* Update Nations_Ukrainian.json (#1966)

* Update Japanese.properties (#1969)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* new french translations (#1972)

* add missing translations (#1973)

* Update Ukrainian.properties (#1974)

* Improved translations (#1978)

* Update German.properties (#1988)

* Resolved #1975 - Museum and Factory now give 2 specialist slots as per Civ V

* Sort the cities by food, production, etc. (#1979)

* Update German.properties

Added translations

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: Krayeu Uladzislau <kraevroot@gmail.com>
Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: CodeAssemblingChicken <53775955+CodeAssemblingChicken@users.noreply.github.com>
2020-02-22 21:58:08 +02:00
Yair Morgenstern
d36a1a8140 Resolved #1975 - Museum and Factory now give 2 specialist slots as per Civ V 2020-02-20 21:57:44 +02:00
Yair Morgenstern
4004c6ff76
Translation (#1951)
* Update Polish.properties (#1931)

* Update Russian.properties (#1932)

* Update Italian.properties (#1933)

Also added Research Agreement

* Update Japanese.properties (#1942)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Translations update (#1943)

* Translations update

* Render some missing characters in the Ukrainian translations

* More translations

* Fixed typo: Otto von Bismark -> Otto von Bismarck (#1954)

* Translation updates, added test to assure that translations in template file end with a space

* Disabled Maven - hopefully Travis check will not take 10 minutes and will pass

Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: schnippl0r <58435847+schnippl0r@users.noreply.github.com>
2020-02-17 19:38:14 +02:00
GGGuenni
80997d157b
Reworked Multiplayer Screen (#1952)
* Added MultiplayerScreen

Added MultiplayerScreen Class to replace openMultiplayerPopup()
Added Sessionbrowser UI elements

* Added Session Browser functionality

* Added ResponsePopup

is used for "copy UserID" among others to be more responsive

* Added "Edit Session" and Help Button

Changed saving Multiplayer Session to seperate Folder
-TODO? Help Button chould be in every pickerscreen

* removed function for Turn Check

heard tobo is working on a Turn checker so no need for the function

* Added delete to editScreen + Cleanup and Comments

delete should be a "give up" instead

* creating new game as multiplayer now saves to multiplayer folder

 + gameId gets copied to clipboard

* Delete unintended save file

delete a save file which got falsely commited

* Added helpPopup Text and refresh Button

* Cleanup + Translation

* More Cleanup

Refresh List doesn't flicker anymore
Response PopUp time for new Game reduced

* Fixed Game crashing on reload

* Added Add Current Game

Games you don't know the gameID of can now be saved when running

* Added Translations entry

* adding requested changes

+ added addCurrentGameButton() for readability and to reduce indentation
- removed unnecessary returns
+ sequentialised try catch for better readability
+ added comments to responsePopup for better unstanding

* Adding requested indent changes

- removed all unnecessary indents
2020-02-17 18:37:15 +02:00
wrov
bc15d97de7
Added Multiplayer Turn Notification Service (#1947)
* Added Multiplayer Turn Notification Service
https://github.com/yairm210/Unciv/issues/1680

* Minor update on Credits.md (#1949)

# Nations
- Fix typo on word "crescent"
- Fix link that flew off on word "sword"

* 3.5.14-patch1

* Edit startgame screen. (#1950)

Co-authored-by: u-ndefine <41176671+u-ndefine@users.noreply.github.com>

* Small improvements suggested in pull request review
https://github.com/yairm210/Unciv/pull/1947

* Removed potential concurrency hazzards caused by access to non-final variables. Added option to turn off persistent notification (may be necessary on pre-Oreo phones.)
Added suggested comments. https://github.com/yairm210/Unciv/pull/1947

* Fixed miscommited debug code. https://github.com/yairm210/Unciv/pull/1947

Co-authored-by: u-ndefine <41176671+u-ndefine@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
2020-02-17 18:34:46 +02:00
Yair Morgenstern
7d72a0a789 3.5.14-patch1 2020-02-16 21:53:38 +02:00
Yair Morgenstern
996010d662
Translations (#1929)
* Trad. Chinese translation update! (#1910)

Adds all missing translation of v3.5.12 !

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

* Update Japanese.properties (#1920)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Polish.properties (#1921)

* update translation. (#1923)

* new french translation (#1928)

* Translation updates

Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: armandberger <hoel@free.fr>
2020-02-14 13:48:31 +02:00
Yair Morgenstern
fa31704217 Resolved #1918 - added missing translations 2020-02-14 13:38:05 +02:00
Yair Morgenstern
99111df5c6 Resolved #1818 - Marble bonus now displayed in Civilopedia 2020-02-14 13:23:10 +02:00
Yair Morgenstern
3bfb2a29b7
Merge pull request #1903 from JackRainy/ForgeAndSpacePart
Forge increases production of the space parts (#1902)
2020-02-12 23:17:39 +02:00
JackRainy
4ab084feeb
Forge increases production of spaceparts 2020-02-12 23:11:28 +02:00
Yair Morgenstern
9d70a85ecc
Merge pull request #1917 from yairm210/translations
Translations
2020-02-12 21:03:54 +02:00
Yair Morgenstern
b898311032 Translation updates 2020-02-12 20:43:27 +02:00
Yair Morgenstern
d9d6f4eeb8
Minimap can show the whole worldscreen (#1872)
Saw the images you sent by email =)
2020-02-12 20:22:19 +02:00
Prosta4okua
d02b2214be
Update Nations_Ukrainian.json (#1915)
* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json
2020-02-12 20:21:04 +02:00
TheLegend27
b09ad65dce
Update German.properties (#1914) 2020-02-12 20:20:52 +02:00
TheLegend27
32506f9b23
Update German.properties (#1913)
* Cleaned up Unit Actions

* Resolved #1902 - buildings requiring worked resources can be built in cities that are built on that resource

* Legalism grants enqueued buildings (#1906)

* Update German.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
2020-02-12 20:20:34 +02:00
Smashfanful
e0d1109e77
Update Italian.properties (#1882)
* Update Italian.properties

* Update Italian.properties
2020-02-12 20:16:55 +02:00