Commit graph

1663 commits

Author SHA1 Message Date
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
YueR
ac1e5bb417 Minimap can show the whole worldscreen 2020-02-13 00:33:11 +08:00
Prosta4okua
6a1e70f100
Update Nations_Ukrainian.json (#1908)
* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Tutorials_Ukrainian.json

* Update Ukrainian.properties
2020-02-11 21:43:38 +02:00
paontv
890c3aed29
Update Japanese.properties (#1904)
* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties
2020-02-11 15:31:57 +02:00
rayray61
9ee0c94bf5
Update Turkish.properties (#1907)
* 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 Turkish.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
2020-02-11 15:31:25 +02:00
IraqLobster34
b3824983a0
Update Russian.properties (#1899)
* Update Russian.properties

Missing translations

* Update Russian.properties
2020-02-10 18:28:22 +02:00
armandberger
9c3c7360d0
new french translation (#1898) 2020-02-10 18:27:53 +02:00
Prosta4okua
a5c9895ef5
Update Nations_Ukrainian.json (#1897)
* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json
2020-02-10 18:27:31 +02:00
Freshy
c2d29db09f
Completed and corrected translation (#1895) 2020-02-10 18:27:08 +02:00
paontv
7228d735c6
Update Japanese.properties (#1893)
* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties
2020-02-10 18:24:44 +02:00
Smashfanful
214730a71c
Update Italian.properties (#1890)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-02-10 18:24:17 +02:00
Federico Luongo
6d2cf860a7 Reset advanced settings to default (#1894)
* Reset to default

* Translations
2020-02-10 10:25:48 +02:00
Yair Morgenstern
26affe7943
Translation (#1878)
* Update Nations_Italian.json (#1864)

* Update Japanese.properties (#1867)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Thai.properties (#1871)

I'm back!!

* Update German.properties (#1873)

Revised promotions

* Update German.properties (#1874)

added missing unit translations

* Update Italian.properties (#1875)

Typo fix

* Update Nations_Russian.json (#1877)

* rfe

* Update Nations_Russian.json

* Update Nations_Russian.json

* Update Russian.properties (#1876)

* Translation roundup + added Mongolian civ translations

* Update Russian.properties (#1879)

Mongolia update

* Additional translation strings related to the custom map settings (#1881)

* Diplomacy screen: Secondary relationships line is added (#1880)

* Additional translation strings

* Update Japanese.properties (#1883)

* Update Japanese.properties

* Update Japanese.properties

* Update to Ukrainian translations + fix of the translation call (#1888)

* Final touches before version

Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2020-02-09 20:29:34 +02:00
Federico Luongo
edf0294dfd
Mongolia (#1855)
* Mongolia

* Translation & Atlas

* Remove debug option

* Remove erroneous import

* Promotions.addXP

* Khan heals 15 HP

* XP bonus fix

* Added 'Mongol Terror' which is the term used for the mongolian combat bonus

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-02-08 20:51:21 +02:00
Yair Morgenstern
5ee882c20d
Translations (#1863)
* Add japanese translations (#1854)

* Terrains, Resources, Units japanese translate.

* Add some translate.

* Add technology translation.

* Update Japanese.properties (#1860)

* Update Japanese.properties

Second half

* Update Japanese.properties

* Update Japanese.properties

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

* Create Nations_Japanese.json, and add translation a little (#1861)

* Update German.properties (#1862)

Added technology quotes and revised translation

* Autocleanup

Co-authored-by: pekomiya <hongu.yk@gmail.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
2020-02-06 22:35:13 +02:00
Yair Morgenstern
44777b8b30
Translations (#1848)
* added some translations (#1832)

* new french translations (#1833)

* Completed translation (#1834)

* Update Italian.properties (#1840)

Also added a new translation line

* Update Ukrainian.properties (#1845)

Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>

* rewrite

Co-authored-by: LeMoonStar <webmaster@unitcore.de>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
2020-02-04 23:12:31 +02:00
Yair Morgenstern
eb1ce0f6cb Resolved #1457 - no AI trades are 'automatically accepted', they all require an active decision of the proposed side and will only happen on their turn 2020-02-04 16:13:37 +02:00
Yair Morgenstern
a73fe3d9de Tile update by The Bucketeer 2020-02-02 18:31:45 +02:00
Yair Morgenstern
ef19775545 More translation related stuff that I forgot =/ 2020-02-02 18:00:08 +02:00
Yair Morgenstern
352e4e8939
Translation (#1829)
* Update German.properties (#1819)

Added city states, some notifications and revised translations

* Update Czech.properties (#1824)

translated missing strings (carriers, settings, some miscellaneous items)
fixed naming of promotions to correct terminology (military) and synced with descriptions

* Update Italian.properties (#1815)

* Create Japanese.properties (#1803)

* Create Japanese.properties

* Update Japanese

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Added Japanese flag icon

Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
2020-02-02 16:23:20 +02:00
JackRainy
db5cc82ec7
"Sleep until healed" functionality (#1821)
* "Sleep until healed" functionality

* Unit test for actions translations is added

* "Fortify until healed" functionality

* Refactoring
2020-02-02 09:55:10 +02:00
Yair Morgenstern
d7310aa90a typo fix withing -> within 2020-01-31 14:17:38 +02:00
Yair Morgenstern
e69f092d3a 3.5.8 2020-01-30 21:03:03 +02:00
Yair Morgenstern
3214bfbbfa
Translations update (#1809)
* Update Turkish.properties (#1799)

* Update German.properties (#1807)

* Improved translations for Ukrainian and russian languages (#1802)

* Chinese translation update. delete some old code about "Scientific Revolution" because its effort has changed. (#1805)

Co-authored-by: lyrjie <lyrjie@gmail.com>

Co-authored-by: rayray61 <54810477+rayray61@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: lyrjie <lyrjie@gmail.com>
2020-01-30 20:33:19 +02:00
Yair Morgenstern
d22b3acbb3 3.5.7 2020-01-27 22:59:39 +02:00
stoupa007
12780afde4 Update Czech.properties (#1793)
Translated missing texts (production queue, spain, natural wonders, diplomacy, events), some typo fixes and improvements.
2020-01-27 22:55:45 +02:00
Smashfanful
f4727bf02b Update Italian.properties (#1790)
Also preparing for the Mongolian units
2020-01-27 22:08:38 +02:00
rayray61
4861f499b8 Update Turkish.properties (#1791) 2020-01-27 22:08:10 +02:00
Freshy
057e933114 Small corrects (#1792) 2020-01-27 22:07:56 +02:00
Teague Lander
ac8a1f144b Add specialist slot tooltip for buildings that provide them (#1776)
* Add specialist slot tooltip for buildings that provide them
 - #1762

* Remove duplicate translations
2020-01-27 08:33:10 +02:00
stoupa007
7b5e1e3cbf Update Czech.properties (#1783)
Fixed some most glaring typos.
2020-01-26 22:55:49 +02:00
Freshy
24520aa00c Completed translation (#1780) 2020-01-26 21:29:31 +02:00
rayray61
7c441e8e48 Update Turkish.properties (#1777) 2020-01-26 21:29:17 +02:00
The Bucketeer
9dded56813 Trad. Chinese Translation update (#1778)
Added all current missing translations, as well, some edits on some translations. (•ω•)

(by GeneralWadaling/ The Bucketeer)
2020-01-26 21:29:02 +02:00
Smashfanful
84b822aaac Update Nations.json (#1770)
* Update Nations.json

Added Lhasa, Vancouver, M'Banza-Kongo and Mogadishu

* Update Nations.json
2020-01-26 21:26:47 +02:00
Teague Lander
30a50a8c6b Add missing Forge and Seaport production bonus uniques (#1773)
* Add missing Forge and Seaport production bonus uniques
 Parital fix for #1762
 - Forge gets "+15% production of land units"
 - Seaport gets "+15% production of naval units"

* Adds missing translation "+15% production of land units"
2020-01-26 20:17:26 +02:00
Yair Morgenstern
ae8fdb3b7d "Must be within 2 spaces of mountain" for Neuschwanstein and Macchu Pichu - #1762 2020-01-25 20:35:33 +02:00
Yair Morgenstern
ed222a7839 Translation template fixes 2020-01-25 20:31:35 +02:00
Yair Morgenstern
f0372ea9ec 3.5.6 2020-01-25 20:28:30 +02:00
Coruna
0bcd213c3f Update German.properties (#1772) 2020-01-25 19:52:17 +02:00
Smashfanful
cbc92a753c Update Italian.properties (#1769) 2020-01-25 19:52:04 +02:00
rayray61
4bbc8fe08f Update Turkish.properties (#1765) 2020-01-25 19:51:51 +02:00
Marerjh
8469956f91 Update Ukrainian.properties (#1761)
* Update Ukrainian.properties

* Update template.properties

* Update Ukrainian.properties

* Update ConstructionsTable.kt

* Update CityInfoTable.kt

* Update Ukrainian.properties

* Update Ukrainian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-25 19:47:38 +02:00
armandberger
d39b255b54 new french translations (#1760) 2020-01-25 19:46:06 +02:00
tianshidoubi
b3e95cb115 Update Simplified_Chinese.properties (#1756)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-25 19:45:47 +02:00
JackRainy
e0a00eb9a5 Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions (#1754)
* Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions

* Template for the translation strings

* New icons are added

Co-authored-by: ltrcao <ltrcao@users.noreply.github.com>
2020-01-25 19:43:53 +02:00
Yair Morgenstern
e9a6fd86f9 Added 'mountain within 2 tiles' restriction to Machu Picchu as per #1762 2020-01-23 23:44:25 +02:00
Yair Morgenstern
c29ccadc60 Exploring units no longer auto-enter city states 2020-01-23 20:50:53 +02:00
lishaoxia1985
42e16ec80a Now we and AI can sign research agreement. (#1671) 2020-01-23 20:12:24 +02:00
Freshy
e4308f947e Little correction od my mistake (#1748) 2020-01-22 18:34:02 +02:00
lyrjie
66c61541a3 Russian translation update (#1745)
Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
2020-01-22 18:33:42 +02:00
Marerjh
648075c89b Update Ukrainian.properties (#1749) 2020-01-22 18:33:25 +02:00
Smashfanful
9f4eb9eff0 Update Italian.properties (#1750)
* Update Italian.properties

Added new translation lines in game

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

* Feature: map editor menu

* Cleanup

* Added "Empty" map generation type for the map editor
2020-01-22 13:10:39 +02:00
Freshy
45dc3d3587 Completed and corrected translation (#1743)
Some of the Polish words were wrong, so I corrected them and named some stuff the way it's called in Civilization V.
2020-01-21 21:57:56 +02:00
Yair Morgenstern
8508362496 3.5.5
Fixed problem with the Manila translation
2020-01-21 21:17:05 +02:00
JackRainy
78d0c84cc1 Corrections to Ukrainian translations (#1721)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-21 21:03:39 +02:00
Yair Morgenstern
7ea6fc2551 Added 4-way tile images (base,feature,improvement,resource) by The Bucketeer
Fixed some issues with existing tile images
2020-01-21 21:02:11 +02:00
Smashfanful
fb51f89f6d Update Italian.properties (#1737) 2020-01-21 20:03:01 +02:00
Oleg
88ca14fac4 Update Russian.properties (#1730)
* Update Russian.properties

small fix

* Update Russian.properties
2020-01-21 20:02:04 +02:00
Yair Morgenstern
5c42e7f1fb New translations 2020-01-20 23:28:52 +02:00
JackRainy
1441dd49f5 Aircraft carrier is added (#1731)
* Implemented aircraft carrier by @ltrcao in PR #1723

* New icon for the Carrier unit
2020-01-20 22:53:59 +02:00
Marerjh
43e9ee112e Update Ukrainian translation + Missing translations (#1714)
* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Tutorials_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Ukrainian.properties

* Update template.properties

Missing translations
2020-01-19 22:02:09 +02:00
Yair Morgenstern
f154ac1d6d 3.5.4 2020-01-19 21:58:38 +02:00
Smashfanful
f47df6d8b2 Update Italian.properties (#1716) 2020-01-19 21:45:31 +02:00
uvehj
7a0afc5c33 Update Spanish.properties (#1709) 2020-01-19 21:43:51 +02:00
LeMoonStar
f7eb5f5aa4 fixed typo in German sheep translation (#1717)
* added German error message translation

* fixed typo in German sheep translation
2020-01-19 21:43:40 +02:00
armandberger
4a5e15f094 small mistake correction (#1706) 2020-01-19 21:43:09 +02:00
Yair Morgenstern
32ba55b2fe Added many more resource+improvement images 2020-01-18 22:35:18 +02:00
Yair Morgenstern
02def2ffa9 Resource+Improvement is go!
Added resource-specific plantations by The Bucketeer
2020-01-17 15:07:47 +02:00
SheepYang
db5c7234f3 simplified Chinese translations (#1707)
* simplified Chinese translations

* simplified Chinese translations
2020-01-17 14:30:50 +02:00
Marerjh
02f57b4b09 Update Nations_Ukrainian.json (#1698)
* Update Nations_Ukrainian.json

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Ukrainian.properties
2020-01-16 22:08:52 +02:00
rayray61
21e47741fe Patch 1 (#1705)
* Create Turkish.properties

* Update Turkish.properties

* Update completionPercentages.properties

* Update completionPercentages.properties

* Update Turkish.properties
2020-01-16 14:28:11 +02:00
Yair Morgenstern
90abfda3a4 3.5.3 2020-01-15 23:57:52 +02:00
Yair Morgenstern
5af6dd1ad5 More resource images by The Bucketeer 2020-01-15 23:56:02 +02:00
Oleg
7b87ad01ef Update Russian.properties (#1702)
Fixed translation
2020-01-15 23:26:04 +02:00
Smashfanful
dc7b1464d3 Update Italian.properties (#1695) 2020-01-15 23:25:11 +02:00
Timo T
8e12e059ac Fix meaning of work boat capability translation (#1694)
"May create improvements on water resources" was translated as if it was "May create improvements on water tiles". I fixed this so the translation is correct now
2020-01-14 18:46:46 +02:00
Yair Morgenstern
525b67c7c6 3.5.2 2020-01-13 19:21:12 +02:00
armandberger
ce5afae215 new french translation (#1688) 2020-01-13 19:03:13 +02:00
Horațiu Mlendea
4886e2f259 Romanian translations (#1677)
* Update Romanian.properties

* More romanian translations

* Update Romanian.properties

* Update Romanian.properties

* Update Romanian.properties

* Fix
2020-01-13 19:02:58 +02:00
Oheto
32772919d0 Update Russian.properties (#1668)
* Update Russian.properties

* Update Russian.properties
2020-01-13 19:02:25 +02:00
Federico Luongo
f118be5d40 Adopted JSONC standard for assets files (#1674)
* Adopted JSONC standard for assets files

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Normalized Nations_Ukrainian too

Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
2020-01-13 19:01:27 +02:00
NoNZeeZ
4f0435bdc6 Create Tutorials_Thai.json (#1683)
I still waiting for thai language release in someday. So sad man TT
2020-01-13 12:32:58 +02:00
Yair Morgenstern
9a426318ba Proper destruction notification for city states
Added Fur resource image
2020-01-13 00:09:09 +02:00
JackRainy
0d889989c6 Improved Ukrainian translations (#1673)
* Improved Ukrainian translations

* Minor corrections
2020-01-12 23:35:57 +02:00
Horațiu Mlendea
aad18f29c8 Romanian translations (#1659)
* Update Romanian.properties

* More romanian translations
2020-01-12 23:27:28 +02:00
JackRainy
8a327fa7be Fix for the "Back button can't end Unciv (#1513)" (#1661)
* Callback to exit the game by 'Back' button

* Prompt dialog for the game exit

* Additional strings for translations are generated

* Do not show exit prompt dialog twice
2020-01-12 23:05:49 +02:00
Oheto
02ec64f14f Update Ukrainian.properties (#1667)
* Update Ukrainian.properties

«Кіннота» is more ukrainian word then «Кавалерія»

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties
2020-01-12 08:44:09 +02:00
Smashfanful
011368571c Update Italian.properties (#1666)
* Update Italian.properties

* Update Italian.properties
2020-01-12 08:42:20 +02:00
r3versi
a1b03849ec Fix city screen (#1657)
* Last CityScreen fix

* Atlas & Translations
2020-01-11 22:46:17 +02:00
Yair Morgenstern
857763654f Merge branch 'master' of https://github.com/yairm210/Unciv 2020-01-11 21:54:00 +02:00
Yair Morgenstern
2b56cf8a87 3.5.1 2020-01-11 21:49:12 +02:00
Smashfanful
759ab09293 Update Nations_Italian.json (#1660) 2020-01-11 21:41:31 +02:00