Commit Graph

3419 Commits

Author SHA1 Message Date
0349e0a776 Updated the natural wonders for vanilla (#5943)
* Updated the natural wonders for vanilla

* Might as well remove the faith ruins bonuses
2022-01-10 13:28:05 -08:00
480beb83b3 3.18.16 2022-01-09 22:34:44 +02:00
32ab5f32bd Translations update (#5937)
* Update German.properties (#5936)

* Update German.properties

Some additional translation and corrections

* Update German.properties

* Create German.properties

corrections

* Update Ukrainian.properties (#5935)

Translate Crash screen messages

* Update French.properties (#5934)

* Update French.properties

* Add files via upload

* Add files via upload

* Delete French.properties

* Update French.properties

* Update French.properties

* Update German translation (#5931)

* Update Spanish.properties (#5929)

* Update Spanish.properties

I´m back... kind of.

* Update Spanish.properties

* Crash Screen Translated (#5926)

I have translated the Crash Screen.

Co-authored-by: Sauvegarde13 <47331543+Sauvegarde13@users.noreply.github.com>

Co-authored-by: jacer2010 <96766494+jacer2010@users.noreply.github.com>
Co-authored-by: StepanIvasyn <57094070+StepanIvasyn@users.noreply.github.com>
Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: F. García <47331543+FranMer13@users.noreply.github.com>
Co-authored-by: Sauvegarde13 <47331543+Sauvegarde13@users.noreply.github.com>
2022-01-09 21:46:24 +02:00
24dfad696c New crash handler screen Part 2: Threads, runnables, more informative reports. (#5810)
* Add crashHandlingThread.

* Replace all uses of `thread` with `crashHandlingThread`.

* Add `postCrashHandlingRunnable`.

* Replace all uses of `Gdx.app.postRunnable` with `postCrashHandlingRunnable`.

* Remove CrashController and CrashReport; Strip down CrashReportSender to CrashReportSysInfo; Fold their functionality into CrashScreen.

* Typo in comments, rename `SafeCrashStage` to `CrashHandlingStage`.

* Tweak docs.

* Tweak docs, comments, text. Undo an accidentally recursive Replace All change.

* Remove replaced translations.

* More readable indentation handling in report template.
2022-01-09 11:33:45 +02:00
b2870bc130 Fix missing siege unit resources needs for vanilla (#5925)
* Fix missing siege unit resources needs for vanilla

* Fix unique siege unit who no resources needs
2022-01-07 14:28:08 +02:00
9b431a9bf7 3.18.15 2022-01-07 11:15:19 +02:00
51c3c2a4e2 Update Italian.properties (#5907) 2022-01-07 11:07:53 +02:00
8d2b282cef Revert "Remove periodic saving again (#5880)" (#5883)
This reverts commit 2404749bba.
2022-01-06 23:00:56 +01:00
483dd2e871 Fixed border image alpha (#5912) 2022-01-04 18:57:02 +02:00
e123a699ac Update Nations.json (#5908)
Removed superfluous spaces
2022-01-04 17:43:05 +01:00
e68bd143d9 3.18.14 2022-01-02 21:56:24 +01:00
0f258d5638 Translations update (#5881)
* Update Portuguese.properties

# Language settings

# Equivalent of a space in your language
# If your language doesn't use spaces, just add "" as a translation, otherwise " "
 # Requires translation!
" " = 

# If the first word in a sentence starts with a capital in your language, 
# put the english word 'true' behind the '=', otherwise 'false'.
# Don't translate these words to your language, only put 'true' or 'false'.
 # Requires translation!
StartWithCapitalLetter = 


# Starting from here normal translations start, as written on
# https://github.com/yairm210/Unciv/wiki/Translating

# Tutorial tasks

* Update Simplified_Chinese.properties (#5890)

* Merged some uniques and added a new one for not allowing to build units (#5731)

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882)

* Regenerate atlas. #5884. (#5885)

* Update Simplified_Chinese.properties

* Fixed translation tests failing

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

* Update Simplified_Chinese.properties (#5889)

* Merged some uniques and added a new one for not allowing to build units (#5731)

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882)

* Regenerate atlas. #5884. (#5885)

* Update Simplified_Chinese.properties

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

* Update Brazillian_portuguese.properties (#5887)

* Merged some uniques and added a new one for not allowing to build units (#5731)

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882)

* Regenerate atlas. #5884. (#5885)

* Update Brazillian_portuguese.properties

I translated some sentences.

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

* Update Czech.properties (#5875)

- translated lot of new strings

* Some French translations (#5871)

* Some French translations

* Update French.properties

* Update Italian.properties (#5869)

* Update Dutch.properties (#5858)

* Update Dutch.properties

* Voorgestelde verbeteringen toegevoegd

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

* Actually fixed the atlas generation

* Update Turkish.properties (#5903)

* Delete Ship Of The Line.png

* GH Actions: Check user privileges before running bots. (#5895)

* Revamped nukes again to closer match the original (#5892)

* Update Turkish.properties

I translated again.This time i translated somra error scripts

Co-authored-by: hundun <wwj.hddjj@gmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

Co-authored-by: sidneybr <95696905+sidneybr@users.noreply.github.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>
Co-authored-by: Ustklm <58632848+Ustklm@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Peter Bos <55184696+Peter1306@users.noreply.github.com>
Co-authored-by: HariboSever <96971269+HariboSever@users.noreply.github.com>
Co-authored-by: hundun <wwj.hddjj@gmail.com>
2022-01-02 19:07:09 +01:00
e9afc6402c Delete Ship Of The Line.png 2022-01-02 18:17:15 +08:00
34e5033293 Border images in Default. (#5886) 2022-01-01 15:43:55 +00:00
1f153cc86e Regenerate atlas. #5884. (#5885) 2021-12-31 13:55:41 +00:00
f06242ebe1 Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882) 2021-12-31 13:47:52 +02:00
687ecb83f1 Merged some uniques and added a new one for not allowing to build units (#5731)
* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique
2021-12-31 12:13:09 +02:00
2404749bba Remove periodic saving again (#5880) 2021-12-31 11:08:19 +02:00
ee65adb5e4 Fixed a bug where all global unit discounts would always apply, despite only being for certain units (#5879) 2021-12-31 11:07:59 +02:00
1a8a86cb2c Unify and improve moddability of more tile-based images. (#5873) 2021-12-29 18:21:34 +02:00
7581b7b621 Arrows in Default tileset. (#5872) 2021-12-29 17:37:49 +02:00
0056eba408 Move BorderImages to tileset. Set origin in setHexagonImageSize(). (#5868) 2021-12-29 00:05:56 +02:00
0d78659e49 3.18.13 2021-12-29 00:01:42 +02:00
9ee073fe55 Translations update (#5864)
* Update German.properties (#5863)

* Update Italian.properties (#5851)

* Update Romanian.properties (#5806)

* Update Romanian.properties

I made a contribution to Romanian translation. Up to rougly line 800 should be translated until now. I'd be happy you introduced  these translation to the game!

* Update Romanian.properties

Mostly typos, that hopefully have been fixed.

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: jacer2010 <96766494+jacer2010@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Cosmin Burada <77898829+cosylynx@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2021-12-28 23:42:26 +02:00
005c465ee4 Use tileset fallbacks for missing images. (#5852)
* Use tileset fallbacks for missing images.

* Disable tileset fallback for FantasyHex.

* Tweak docs, remove debug signature.
2021-12-27 21:05:33 +02:00
f03918f610 Fixed a few combat bugs and changed the religions founded label (#5846)
* Fixed a bug where bonusses applying 'in friendly tiles' would not apply

* Reworded something so it actually makes sense

* Fixed capitalization error leading to autocracy complete bonus no longer working

* Fixed save serialization errors and finally correctly implemented the time limit for autocracy bonus

* Made value const and static
2021-12-26 07:31:07 +02:00
c62006cf72 3.18.12 2021-12-25 23:57:42 +02:00
6325b3c3a2 3.18.12 2021-12-25 23:28:07 +02:00
b8b5f79ee0 3.18.12 2021-12-25 22:51:41 +02:00
af941754cd Show arrows on map for unit actions: Asset files. (#5825)
* Show arrows on map for unit actions.

* Don't wrap arrows unless world wrap is actually enabled.

* Fix transported air units always being treated like teleports.

* Simple reviews.

* Separate movement arrow visibility checks from WorldScreen.

* Assets for map arrows overlay.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-12-25 22:29:19 +02:00
2898a64606 Translations update (#5850)
* Update Swedish.properties (#5841)

* Update Indonesian.properties (#5832)

* Update Italian.properties (#5831)

* Update Italian.properties

* Update Italian.properties

* Update Russian.properties (#5849)

Co-authored-by: SimonCeder <63475501+SimonCeder@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: deqtodo <94169613+deqtodo@users.noreply.github.com>
2021-12-25 22:23:33 +02:00
e672bfb6d3 Show arrows on map for unit actions. (#5824)
* Show arrows on map for unit actions.

* Don't wrap arrows unless world wrap is actually enabled.

* Fix transported air units always being treated like teleports.

* Simple reviews.

* Separate movement arrow visibility checks from WorldScreen.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-12-25 22:20:29 +02:00
ecadfb53fa Typed some uniques and fixed a policy not working (#5848)
* Typed some uniques, fixing a policy not working

* Repurposed an unused function to remove .unit in some places

* Fixed compilation errors
2021-12-25 17:55:14 +02:00
759366c912 Added score and time victory (#5842)
* Added a score calculation

* Added the score in multiple places of the UI

* Added time victory and a max turns

* Made time victory functional

* Added translation files
2021-12-24 14:31:36 +02:00
c70ac334bd 3.18.11 2021-12-20 21:25:17 +02:00
1152d8b0f7 Translations update (#5830)
* Update German translation (#5829)

* Update German translation

* Update German translation

* Update Russian.properties (#5813)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#5807)

* typo (#5805)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
2021-12-20 21:17:07 +02:00
723aaf779c Add new universal crash handlers and error reporting screen. (#5804)
* Add new crash handler and error reporting screen.

* Minor cleanup.

* Word choice.

* Rename `SafeCrashStage` to `CrashHandlingStage`.

* Reviews.

* Reference stack traces in comments for thread and postRunnable exceptions.

* Remove excessive line breaks, superfluous .apply{}.
2021-12-20 20:55:58 +02:00
b7804c0bf6 Removed double space in template.properties
This lead to failed tests for new languages, as the second space would be seen as the translated string, which obviously doesn't contain the placeholder tags.
2021-12-20 11:59:54 +01:00
75ef6f6c8d Changed remove heresy sound effect (#5821) 2021-12-18 20:05:11 +02:00
17b382a614 Replaced illegal / questionably legal assets (#5819)
* Replaced illegal / questionably legal assets

* Resized policy icon to correct size
2021-12-18 17:53:21 +02:00
58cc3b517e Fixed an infinite loop where foreign legion upgraded to the unit it replaced (#5808)
* Fixed an infinite loop where foreign legion upgraded to the unit it replaced

* Changed the wrong variable

* Maybe it is useful to also change its unlock tech

* Whoops, should only be for non-null values
2021-12-16 17:50:10 +02:00
a7b880c033 3.18.10 2021-12-15 23:12:28 +02:00
7830eda9a1 Translations update (#5800)
* Update German translation (#5797)

* Update Russian.properties (#5788)

* Update Russian.properties

* Fix translation

* Update indonesian.properties (#5787)

* Update French.properties (#5786)

* Update Swedish.properties (#5783)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: canneling <84187828+canneling@users.noreply.github.com>
Co-authored-by: RONDEAU Felix <79422543+xil-f-dev@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-12-15 23:02:53 +02:00
408bea9fe8 Update Nations.json (#5778)
Took out two unecessary spaces
2021-12-15 23:01:09 +02:00
b1390cd6db Moved Coal discovery back to industrialization (#5799) 2021-12-15 14:30:12 +02:00
28d3c12142 Improvements to TurnChecker data usage (#5789)
* Added necessary utils

Added the FileNotFoundException which is also part of #5593

* Added preview download to MultiplayerScreen

* Added preview download to TurnChecker

* Fixed uncomplete commit

* Removed debug print in MultiplayerScreen
2021-12-13 21:14:30 +02:00
270c26c850 Raise minSdk to 21. (#5792) 2021-12-13 20:12:53 +02:00
0c1509bfe8 Resolved problem in new uniques with multiple parameters of the same name
Relevant to #5783 and #5781
2021-12-11 20:23:31 +02:00
2889d1c24f Merge remote-tracking branch 'origin/master' 2021-12-11 19:49:13 +02:00
72d16dbcd4 3.18.9-patch1 2021-12-11 19:48:34 +02:00