Commit graph

234 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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