Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,333 Commits 6 Branches 1,054 Tags 1.1 GiB
763de00a7d
Commit Graph

3720 Commits

Author SHA1 Message Date
Yair Morgenstern
c6b888e6ed Fix android build 2023-02-19 16:35:20 +02:00
Yair Morgenstern
0b5ded98c9 chore: diplomatic modifier text auto-translated 2023-02-19 11:20:19 +02:00
Yair Morgenstern
ccec56e2c7 4.4.16 2023-02-18 20:38:37 +02:00
Yair Morgenstern
a244c4f50d
Version rollout (#8694) 
* Bump version and create initial changelog entry

* Update Hungarian.properties (#8692)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Polish.properties (#8691)

* Update Simplified_Chinese.properties (#8690)

* Minor corrections to translations (#8688)

* Minor corrections

* Additional translations

* Original known translation of the quota

* Update Ukrainian.properties (#8685)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update French.properties (#8683)

* Update French.properties

* Update French.properties

* Update Spanish.properties (#8680)

* Update Spanish.properties

* Update Spanish.properties

* #8679

* Updated Brazilian_Portuguese.properties (#8678)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2023-02-18 20:21:07 +02:00
Yair Morgenstern
bfaae54890 Mod sizes larger than 2 MB are displayed in MB 2023-02-18 19:25:07 +02:00
vegeta1k95
01204f5aee
Desktop: world camera autoscroll, selectable window mode (#8679) 
* Desktop: world camera autoscroll, selectable window mode

* Map auto-scroll is optional

* Fix option update, more scroll speed

* Fix translation

---------

Co-authored-by: vegeta1k95 <vfylfhby>
 2023-02-17 02:12:32 +02:00
Gualdimar
7114a67d2c
Pending trades (#8681) 
* Added pending trade offers to the trade overview screen

* Fixed offer trade button state

* Fixed space

* Small fixes
 2023-02-17 00:46:21 +02:00
Yair Morgenstern
6a70026fee 4.4.15 2023-02-14 22:21:26 +02:00
Yair Morgenstern
d1b47199b7
Version rollout (#8677) 
* Bump version and create initial changelog entry

* Update Ukrainian.properties (#8676)

* Update Spanish.properties (#8675)

* Update Polish.properties (#8672)

* Update Hungarian.properties (#8668)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Updated Brazilian_Portuguese.properties (#8667)

* Update Filipino.properties (#8666)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
 2023-02-14 22:16:37 +02:00
vegeta1k95
a8a458ab48
Blockade mechanics (#8654) 
* Fix centering of unit HP bar

* Blockade mechanics: land tiles

* Blockade mechanics: water tiles

* Don't blockade water tile if it has friendly military unit

* Blockade mechanics: cities

* Added tile/city blockade tutorials. Added city blockade status icon.

---------

Co-authored-by: vegeta1k95 <vfylfhby>
 2023-02-14 22:13:25 +02:00
Yair Morgenstern
d9b259c7fc Added Farm-Pillaged image 2023-02-13 23:24:40 +02:00
Yair Morgenstern
8db7f6d720 Resolved #7476 - added option for pillaged improvements 2023-02-13 23:11:05 +02:00
Yair Morgenstern
cc2d1bf6f2 Resolved #8614 - trades evaluated correctly 2023-02-13 20:34:09 +02:00
vegeta1k95
1b22d810c5
Experimental: mitigate texture swapping with TextureArraySpriteBatch (#8604) 
* Performance optimization: less texture swapping

* Added experimental setting to Options-Display

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-13 09:45:05 +02:00
Yair Morgenstern
03bb0b3b79
Version rollout (#8663) 
* Bump version and create initial changelog entry

* Update Polish.properties (#8662)

* Update Filipino.properties (#8659)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Czech.properties (#8657)

* Update Hungarian.properties (#8642)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Weverak <74535809+Weverak@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
 2023-02-12 20:04:50 +02:00
Yair Morgenstern
6bcaed7947 Resolved #8647 - fixed Guruship belief 2023-02-12 19:34:40 +02:00
letstalkaboutdune
47bbd996ae
AbsoluteUnits - Berserker, Samurai, Longswordsman_v2 (#8652) 2023-02-11 21:52:16 +02:00
Yair Morgenstern
312f308060 4.4.13 2023-02-09 19:37:51 +02:00
Yair Morgenstern
5477a62a10
Version rollout (#8638) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#8635)

* Update Filipino.properties

* Update Filipino.properties

* Update Ukrainian.properties (#8632)

* Update Hungarian.properties (#8626)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
 2023-02-09 19:33:36 +02:00
vegeta1k95
ca86e6fde7
Enemy indicator, city culture hex outline + misc (#8629) 
* Rework of UnitGroup, City culture tile hex-outline, tweak enemy indicators

* Rework of UnitGroup, City culture tile hex-outline, tweak enemy indicators

* Better embarked selection sprite

* Small fixes

* Hotfix fog

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-09 18:46:02 +02:00
Yair Morgenstern
c2c03d8202 4.4.12 2023-02-07 22:31:56 +02:00
Yair Morgenstern
fac8fbc6d2
Version rollout (#8617) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#8609)

* Update Ukrainian translation (#8607)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Hungarian.properties (#8606)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#8605)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-02-07 22:25:18 +02:00
Yair Morgenstern
c171376479 4.4.11 2023-02-06 16:40:17 +02:00
Yair Morgenstern
040fcd10d3
Version rollout (#8603) 
* Bump version and create initial changelog entry

* Update German translation (#8597)

* Update French.properties (#8590)

* Update Czech.properties (#8587)

* Update Spanish.properties (#8581)

* Updated Brazilian_Portuguese.properties (#8580)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update Ukrainian.properties (#8577)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
 2023-02-06 16:23:57 +02:00
vegeta1k95
4e15a1581b
City Screen improvements (#8598) 
* City Screen improvements

* Buy icon reverted to Gold icon

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-06 15:22:36 +02:00
lishaoxia1985
4b2d4a3877
Gradle update, offerButton.isEnabled = false in initial (#8600) 2023-02-06 14:21:46 +02:00
Yair Morgenstern
78bd9693a1 4.4.10 2023-02-04 23:31:44 +02:00
Yair Morgenstern
902b08e38f
Version rollout (#8576) 
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#8562)

* Update Ukrainian.properties (#8557)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Spanish.properties (#8555)

* Update French.properties (#8554)

* Update Hungarian.properties (#8553)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: LibertyBell <72909724+iamlibertybell@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
 2023-02-04 23:26:58 +02:00
letstalkaboutdune
8e94998106
AbsoluteUnits - Cataphract, Companion Cavalry, Horseman_v2 (#8567) 2023-02-04 19:35:56 +02:00
Yair Morgenstern
662b3a5e08 Fixed unique buildings and units not replacing originals 2023-02-03 13:12:00 +02:00
alexban011
3180fce94d
Fix UX of random nations pool && keep advanced tab open when updating the screen (#8452) 
* added feature to select specific city states

created MultiNationSelectPopup to reuse for the city states

* keep advanced tab open when update() is called

* Revert "added feature to select specific city states"

This reverts commit 4a1e6964b0.

* improved UX

* translations

* fix checks
 2023-02-03 09:51:18 +02:00
Yair Morgenstern
3600654f00 4.4.9 2023-02-02 17:19:13 +02:00
Yair Morgenstern
ccabc6164c
Version rollout (#8546) 
* Bump version and create initial changelog entry

* Update Korean.properties (#8544)

* Update Ukrainian.properties (#8528)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update German translation (#8527)

* Update German translation

* Fixed manufactory

* Update Hungarian.properties (#8525)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
 2023-02-02 17:15:35 +02:00
Gualdimar
5a267e436c
Add Reset tutorials button (#8536) 
* Add Reset tutorials button

* Fix typo
 2023-02-02 13:33:07 +02:00
Yair Morgenstern
fc4317975f 4.4.8 2023-01-31 23:49:06 +02:00
Yair Morgenstern
087d100887
Version rollout (#8523) 
* Bump version and create initial changelog entry

* Update Hungarian.properties (#8504)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update German translation (#8498)

* Update German translation

* Update German translation

* Update German translation

* Update Ukrainian.properties (#8474)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Fixed test

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
 2023-01-31 23:46:36 +02:00
Yair Morgenstern
3376a71dc7 Resolved #8499 - removed duplicate translation line 2023-01-31 23:18:22 +02:00
Yair Morgenstern
191ea76129 4.4.7 2023-01-30 09:31:31 +02:00
Yair Morgenstern
f00ce4b1f7
Version rollout (#8497) 
* Bump version and create initial changelog entry

* Some simple translates (#8493)

Co-authored-by: GutorovMikhail <mgutorov@phoenixit.ru>

* Update Traditional_Chineses.properties (#8491)

* Update Spanish.properties (#8486)

* Update Korean.properties (#8485)

* Update Korean.properties

* Update Korean.properties

* Update Dutch.properties (#8484)

* Update Filipino.properties (#8481)

* Update Catalan.properties (#8478)

* Update Brazilian_Portuguese.properties (#8475)

* Update Hungarian.properties (#8473)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

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

* fix translation

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Гуторов Михаил <79066966780@yandex.ru>
Co-authored-by: GutorovMikhail <mgutorov@phoenixit.ru>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
 2023-01-30 09:21:00 +02:00
Yair Morgenstern
90f3aee2eb 4.4.6 2023-01-25 22:14:45 +02:00
Yair Morgenstern
b62188169c
Version rollout (#8468) 
* Bump version and create initial changelog entry

* Update Indonesian.properties (#8467)

* Update Korean.properties (#8464)

* Updated Brazilian_Portuguese.properties (#8460)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update French.properties (#8458)

* Update French.properties

* Update French.properties

* Update Hungarian.properties (#8455)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

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

* Update Czech.properties (#8454)

* Update Czech.properties

* Update Czech.properties

* Update Czech.properties

* Update Simplified_Chinese.properties (#8451)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Optimize Simplified Chinese translation

* Update Italian.properties (#8450)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-01-25 21:37:03 +02:00
Yair Morgenstern
ff696a9272 Resolved #8463 - tutorial task mistake 2023-01-25 20:30:08 +02:00
Yair Morgenstern
a4fde1ae3c Resolved #8158 - Fallback images for all major objects 2023-01-24 23:52:34 +02:00
Yair Morgenstern
04cb4bd2a9 Resolved #7177 - Android custom location save 2023-01-23 23:55:21 +02:00
Ouaz
dd9f946de9
Fix missing ' = ' (#8459) 2023-01-23 22:39:46 +02:00
Yair Morgenstern
37c656fcb4 "Extension mods:" -> "Extension mods" 2023-01-23 21:10:16 +02:00
Yair Morgenstern
52c3f14bde 4.4.5 2023-01-23 11:35:17 +02:00
Yair Morgenstern
a3799d9ec7
Version rollout (#8449) 
* Bump version and create initial changelog entry

* Update Czech.properties (#8445)

* Update Portuguese.properties (#8442)

Did translation for half the properties (roughly 4000 lines). Some may need verification from another portuguese person since they are hard to translate directly.
Will try to translate the rest when I have time.

* Update Polish.properties (#8440)

* Update Simplified_Chinese.properties (#8439)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Hungarian translation (#8437)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Spanish.properties (#8436)

* Fixed tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: bernardoamorim7 <106557598+bernardoamorim7@users.noreply.github.com>
Co-authored-by: pyotr_p <pyotr.pietrzak@gmail.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2023-01-23 11:31:57 +02:00
alexban011
c9a4f59566
Added option to allow players to choose randomly selected civs (#8430) 
* Added UI

* random nations are now chosen from the specified random pool

* refactoring

* translations

* compareBy(getCollatorFromLocale) instead of just sorting by english names

* fixed nation popup not remembering the selected nations

* added blacklist feature

fixed bug which made the feature not work if random civilization nr was disabled

* addCheckbox function

* blacklist translation

* added function for textButton

* changed if in gameStarter

* moved button and checkboxes to the GameParameters
 2023-01-23 11:10:14 +02:00
letstalkaboutdune
2167f65c1b
AbsoluteUnits - Mohawk Warrior, Swordsman_v2 (#8447) 2023-01-23 11:05:04 +02:00