mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-09 20:29:50 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,932 Commits 6 Branches 1,057 Tags 1.1 GiB
870659d142
Commit Graph

808 Commits

Author SHA1 Message Date
SomeTroglodyte
870659d142
Translation writer conditionals (#6433) 
* TranslationFileWriter processes Conditionals

* TranslationFileWriter processes Conditionals - wiki and reprocessed language files
 2022-03-28 17:30:16 +03:00
Yair Morgenstern
2ef8581b52 4.0.1 2022-03-25 17:48:12 +03:00
Yair Morgenstern
926d3bcf4c
Version rollout (#6426) 
* Bump version and create initial changelog entry

* Update Japanese.properties (#6417)

* Update Japanese.properties (#6410)

* Update Filipino.properties (#6409)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kobon2015 <63530082+kobon2015@users.noreply.github.com>
Co-authored-by: IDontHaveANam3 <92687952+IDontHaveANam3@users.noreply.github.com>
 2022-03-25 17:45:31 +03:00
SomeTroglodyte
0b50715fb3
Improve TranslationFileWriter (less hardcoding, fixes PolicyBranch) (#6421) 
* Allow TranslationFileWriter to follow several superclass levels (fixes PolicyBranch names)

* Bring German and template up to par as baseline

* Framework to feed TranslationFileWriter from UniqueParameterType, also fixes Fountain of Youth

* TranslationFileWriter legacy guessing now _much_ simpler

* Fix "chance to be destroyed by nukes" case

* Fix tests (allTranslationsHaveCorrectPlaceholders goes cross-language)
 2022-03-25 17:27:25 +03:00
Yair Morgenstern
5fa10348b5 4.0.0 2022-03-21 21:29:55 +02:00
Yair Morgenstern
7a337dea4d
Version rollout (#6399) 
* Bump version and create initial changelog entry

* Update Indonesian.properties (#6386)

* Update French.properties (#6371)

* Update Italian.properties (#6370)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-03-21 21:18:37 +02:00
Tang
c1737b6183
Custom desktop font (#6377) 
* Custom desktop font

* Add `getDesktopAllFonts` to setting custom desktop font.

* Custom font.
`desktopFontFamily` change to `fontFamily`.
Add GameSettings.getSettingsForPlatformLaunchers().

* Add `Custom font` setting UI.

* Add `Custom font` on Android.

* `Default Font` use translations.

* format

* remove open fun.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2022-03-21 21:12:16 +02:00
Yair Morgenstern
2b1251258c
Unciv server (#6384) 
* Background implementation for Unciv server with ktor.

Server ip in settings, able to copy your own ip and copy ip from clipboard for easy sharing, created stub for the client-server data transfer. No actual data storage or server implementation.

* Unciv server round 2 - implementing crud for files and it works!
metadata seems to only be in use for mutex, which is currently unused
That's all for today

* When starting a new multiplayer game the files are correctly saved in the server, and the server can return the files, but the function in the game to retrieve the game info is non-blocking so it doesn't work. Still, progress!

* Changed the Gdx http to basic Java http, as used for Dropbox, and now everything works!!!!

* Documentation for running and using the server

* Better texts, translations, etc

* Trog is right this should be a PUT not POST
 2022-03-21 21:05:02 +02:00
Yair Morgenstern
4b55882019 3.19.18 2022-03-17 23:37:33 +02:00
Yair Morgenstern
635d588711 More untranslated items fixed - #6131 2022-03-17 23:34:39 +02:00
Yair Morgenstern
bf0a44413f
Version rollout (#6365) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6359)

* Update Filipino.properties (#6358)

* Update Spanish.properties (#6356)

* Update French.properties (#6352)

* Update Indonesian.properties (#6351)

* Update Italian.properties (#6350)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: SOULTAKER1011 <90161631+SOULTAKER1011@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@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>
 2022-03-17 22:52:03 +02:00
Yair Morgenstern
f66930ed68 3.19.17 2022-03-13 22:57:55 +02:00
Yair Morgenstern
b8ef6725eb
Version rollout (#6349) 
* Commit from GitHub Actions (UncivBot)

* Update Spanish.properties (#6348)

* Update Simplified_Chinese.properties (#6338)

translation2

* Update French.properties (#6336)

* Update Italian.properties (#6334)

* Update Simplified_Chinese.properties (#6331)

3.19.16 translation1

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-03-13 22:53:45 +02:00
SomeTroglodyte
d8e9563a7c
Religion overview improved (#6303) 
* Improve handling of Religion PickerScreen with long lists

* Fix mouseover graying Labels bug

* Update Pantheon chooser visuals

* Some Color.lerp simplification

* Religion pickers - Merge common stuff of Pantheon and Religion Pickers

* Religion pickers - Linting

* Religion pickers - Move ReligionOverviewTable extra lines capability to Belief, Fix FormattedLine link+center

* Religion pickers - Belief Civilopedia linked description

* Religion overview tweaked

* Religion overview tweaked - patch1
 2022-03-13 22:43:40 +02:00
Yair Morgenstern
f73916ac3b 3.19.16 2022-03-10 19:52:29 +02:00
ArchDuque-Pancake
3ea8e8bd60
Update Spanish.properties (#6308) 
* Update Spanish.properties

* Update Spanish.properties
 2022-03-10 19:49:16 +02:00
Yair Morgenstern
dbca233a45
Version rollout (#6326) 
* Commit from GitHub Actions (UncivBot)

* Update Brazillian_Portuguese.properties (#6325)

* Tradução mais avançada para português

* Update Brazilian_Portuguese.properties

* Add files via upload

* Update Indonesian.properties (#6324)

* Update French.properties (#6322)

* Update Czech.properties (#6321)

* Update German translation (#6311)

* Update Spanish.properties (#6307)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: RivolviOcelot <73536178+Lufims@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
 2022-03-10 19:48:53 +02:00
SomeTroglodyte
e5b36f5b9f
Unique units abilities that should be inherited by upgrades (#6304) 
* Unique units abilities that should be inherited by upgrades

* Unique units abilities that should be inherited by upgrades - xlt

* Unique units abilities that should be inherited by upgrades - wiki
 2022-03-10 19:45:32 +02:00
Yair Morgenstern
83e9aaf1d3
testy (#6312) (#6313) 2022-03-09 14:31:17 +02:00
Yair Morgenstern
eaf5e453ba 3.19.15 2022-03-08 14:32:01 +02:00
ArchDuque-Pancake
05869e8ec7
Translation: Update Spanish.Properties (#6299) 2022-03-08 14:25:02 +02:00
Yair Morgenstern
fef2797341 3.19.14-patch1 2022-03-07 13:06:58 +02:00
Yair Morgenstern
5bae8d37b3
Translations update (#6295) 
* Update French.properties (#6283)

* Update Indonesian.properties (#6280)

* Update Simplified_Chinese.properties (#6278)

* Update Italian.properties (#6276)

* Adding more polish translations (#6250)

* adding more polish translations

* Update Polish.properties

* Update Polish.properties

Fixed typo in line 189

Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: simur407 <szymon.bartczak@op.pl>
 2022-03-07 13:03:08 +02:00
Yair Morgenstern
03aa489dca 3.19.14 2022-03-05 20:26:01 +02:00
Yair Morgenstern
490fb3314c
Translations update (#6275) 
* Update Simplified_Chinese.properties (#6274)

* Update Czech.properties (#6272)

* Update Indonesian.properties (#6269)

* Update German translation (#6258)

* Update Italian.properties (#6257)

* Update Japanese.properties (#6256)

* Update French.properties (#6252)

* Update Spanish.properties (#6251)

* Update Polish.properties - translation (#6268)

* Update Polish.properties

* Update Polish.properties

Previous ones were made bad 'cause of my mistake, but this one should be okay as for first day:)

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Mic <100757255+Mic0217@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: FancyDot <100958790+FancyDot@users.noreply.github.com>
 2022-03-05 20:17:52 +02:00
SomeTroglodyte
2f980abd72
Locate Mod Errors choose base ruleset to do complex check against (#6263) 
* Some Ruleset linting

* Mod-check display remove unnecessary FormattedLine

* Mod-check can run on selectable base ruleset instead of Vanilla only

* Mod-check show final severity on Expander

* Mod-check base selectbox translatable
 2022-03-05 20:03:28 +02:00
Yair Morgenstern
00c5ecb6a6 3.19.13 2022-02-28 22:49:11 +02:00
Yair Morgenstern
c9dfd4062d 3.19.13 2022-02-28 19:49:50 +02:00
Yair Morgenstern
a96934dc7c
Translations update (#6248) 
* Translation: Update Spanish.Properties (#6243)

* Translation: Update Spanish.Properties

Mosaicos? Pero si yá está el estandar de "Casilla"?...

* Update Spanish.properties

* Update Spanish.properties

* Create Spanish.properties

* Update Spanish.properties

* Update German translation (#6242)

* Update Indonesian.properties (#6241)

* Update French.properties (#6236)

* Update Simplified_Chinese.properties (#6233)

* Update Simplified_Chinese.properties

I have translated all I can, but there're still some of them out of my ability. Note: How to translate ID?

* Update Simplified_Chinese.properties

* Update Italian.properties (#6228)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-02-28 19:47:05 +02:00
Yair Morgenstern
db1304ee35 3.19.12 2022-02-25 13:48:47 +02:00
Yair Morgenstern
79699a0ba7
Translations update (#6227) 
* Update Indonesian.properties (#6225)

* Update French.properties (#6218)

* Update Spanish.properties (#6217)

UPDATE

* Update Italian.properties (#6216)

* Update German translation (#6215)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
 2022-02-25 13:43:38 +02:00
Yair Morgenstern
ae2b91dd67 Moved wiki links to new site links 2022-02-23 21:40:20 +02:00
Yair Morgenstern
162ed35255 3.19.11 2022-02-22 11:41:06 +02:00
Yair Morgenstern
d01203fcdc
Translations update (#6214) 
* Update Italian.properties (#6209)

* Update Japanese.properties (#6207)

* translate ConditionalsPlacement

* Update German translation (#6206)

* Translation: Update of Spanish (#6204)

* Translation: Update of Spanish

* Update Spanish.properties

* Update French.properties (#6200)

* Update Indonesian.properties (#6198)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: nukurette <nukurette@gmail.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: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
 2022-02-22 11:38:28 +02:00
Xander Lenstra
e0345bcb52
Reorganized the way city states grant resources & rounded a float to an int (#6210) 
* Reorganized the way city states grant resources & rounded a float to an int

* Reworded a string so it sounds nicer
 2022-02-22 11:30:33 +02:00
Xander Lenstra
90386bd4e7
Made spaceship parts units instead of buildings (#6203) 
* Spaceship parts are units now

* Fixed tests

* Removed commented out lines

* `Spaceship Part` unique can also go on buildings in ods
 2022-02-22 11:30:20 +02:00
Yair Morgenstern
970e535e62 3.19.10 2022-02-19 19:57:23 +02:00
Yair Morgenstern
f7f21d0cbf
Translations update (#6196) 
* Update Russian.properties (#6191)

* Update Korean.properties (#6183)

* Update Korean.properties

* Update Korean.properties

* Update French.properties (#6174)

* Update Spanish.properties (#6173)

TRANSLATION

* Update Italian.properties (#6172)

* Update Italian.properties

* Update Italian.properties

* Update Indonesian.properties (#6171)

* Update German translation (#6170)

* Update Japanese translation (#6169)

* Update Japanese.properties

* fix translation

* Translation: Update Spanish 3.19.10 (#6182)

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

* Update Brazilian_Portuguese.properties (#6190)

Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: nukurette <76560753+nukurette@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Rodolfz147 <100000475+Rodolfz147@users.noreply.github.com>
 2022-02-19 19:40:16 +02:00
Yair Morgenstern
6d48f99206
Trigger uniques by sacrificing units with conditional (#6157) 
* Triggered uniques currently come from researching techs, adopting policies, and building buildings.
This adds a third way of triggering uniques, by attaching them to units with a "by consuming this unit" conditional, which will be added as a possible unit action.
So for example, "[amount] Free Technologies <by consuming this unit>", "Reveals the entire map <by consuming this unit>" etc.

* Added a new uniquetype for triggerable uniques, to make them separate from regular global uniques, so that triggerable uniques can become unit uniques when necessary

* And added translations so the tests will pass
 2022-02-19 19:38:39 +02:00
itanasi
402a9ba825
Show Improvements that are buildable after Removing TerrainFeature (#6149) 
* Initial working version!

* More comments

* Add missing .tr() translation calls

* add brackets

* Fixed

* Optimize checking for removable last feature
More complete tileInfo.clone()

Co-authored-by: itanasi <spellman23@gmail.com>
 2022-02-19 19:34:27 +02:00
Yair Morgenstern
9d0db40bbf 3.19.9 2022-02-15 11:52:56 +02:00
Yair Morgenstern
23585832b5
Translations update (#6166) 
* Update Spanish.properties (#6163)

* Update Spanish.properties

translation

* Update Spanish.properties

* Update Korean.properties (#6158)

* Update Korean.properties

* Update Korean.properties

* Update Traditional_Chinese.properties (#6156)

* Update French.properties (#6155)

* Update German translation (#6154)

* Update German translation

* Update German translation

* Update German translation

* Update and rename Spanish.properties  (#6153)

* Update and rename Spanish.properties to español.properties

Fixed some bugs in translations

* Rename español.properties to Spanish.properties

* Update Spanish.properties

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

Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
 2022-02-15 11:51:00 +02:00
itanasi
9d1f463310
Add Amphibious penalty to Land attacking into Water and vice versa (#6127) 
* Add Amphibious penalty to Land attacking into Water and vice versa

* Replace Landing with Amphibious in all translation files

* Fix trailing whitespace

* Revert translation files

* Change working of Amphibious
Set penalty to Landing and Boarding

* Type-ify Unique and add Depreciated
Add Promotion to Melee Naval
Add exception that Landing penalty is NOT against cities

* Fix Vanilla

* Rename to Landing Party
Icon doesn't work

* Properly regenerated game.atlas/game.png

Co-authored-by: itanasi <spellman23@gmail.com>
 2022-02-14 19:21:53 +01:00
Yair Morgenstern
3fbcf64371 Apparently Android Studio was autoremoving the whitespace because it thought it knows better than me. Disabled by Editor > General > On save > disable Remove trailing whitespace 2022-02-13 11:19:45 +02:00
Yair Morgenstern
4b2bde0365 Resolved untranslated texts as per #6131 
- "Resources" in city-state diplomacy screen
- "When Friends"/"When Allies" in same
- "Enhance religion"
- "Choose a Religion" in religion screen
- Religion name in religion screen
- Translated drilldown items in city screen
- "null for wheat" in improvement Civilopedia entry
- "Type" and others in city-state civilopedia entry
 2022-02-13 10:58:47 +02:00
Yair Morgenstern
0d3a0ef7e3 Resolved untranslated texts as per #6131 
- Added unique targets as lines to translate so they'll appear in BattleTable
 2022-02-13 10:34:50 +02:00
Yair Morgenstern
47dea93775 Resolved untranslated texts as per #6131 
- Requires more population
- Religious
- "Requires" in Policy civilopedia text
- "for" in improvement civilopedia text
- Untranslated conditionals in battle table (listed as "when fighting in [tileFilter] tiles")
 2022-02-13 10:30:31 +02:00
Yair Morgenstern
c498426715 3.19.8 2022-02-12 19:25:12 +02:00
Yair Morgenstern
f03a6bd6b3
Translations update (#6150) 
* Translation: Actualizar Español (#6141)

* Update Russian.properties (#6139)

* Update Italian.properties (#6138)

* Update French.properties (#6135)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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: Ouaz <Ouaz@users.noreply.github.com>
 2022-02-12 19:03:43 +02:00
Yair Morgenstern
09ea1a869d 3.19.7 2022-02-09 12:31:08 +02:00