mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-07 05:51:12 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,949 Commits 6 Branches 1,034 Tags 1.1 GiB
fb62ddb711
Commit Graph

7949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
fb62ddb711 4.3.14 2022-12-29 15:51:13 +02:00
Yair Morgenstern
deef19b5bb
Version rollout (#8265) 
* Bump version and create initial changelog entry

* Update Catalan.properties (#8264)

* Update French.properties (#8259)

* Update Korean.properties (#8254)

* Update Italian.properties (#8253)

* Update Italian.properties

* Update Italian.properties

* Update Simplified_Chinese.properties (#8245)

* Update Spanish.properties (#8244)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2022-12-29 15:46:53 +02:00
vegeta1k95
d4ec1852d5
Fix PolicyScreen branches positioning (#8238) (#8258) 
* Fix PolicyScreen branches positioning (#8238)

* Fix PolicyScreen branches positioning (#8238)

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-29 13:54:13 +02:00
vegeta1k95
a751c8e3dc
Fixed TechButton progress-bar padding, less rounded corners for buttons. (#8260) 
* Fixed TechButton progress-bar padding, less rounded corners for buttons.

* Removed extra padding on the right

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-29 13:52:52 +02:00
vegeta1k95
8fd561de50
Added WLTKD status icon (#8257) 
* Added WTLKD status icon

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-29 13:52:35 +02:00
CrispyXYZ
68c6c60f77
Show CrashScreen instead of quit when crash on Android (#8263) 2022-12-29 13:51:53 +02:00
Yair Morgenstern
fe655b6b7e AI considers capital city strength when deciding whether to attack - to avoid civs declaring war on a single city they can't possibly take 2022-12-29 12:31:13 +02:00
Yair Morgenstern
44d7ef78ed AI moves other civilians off the capital to make way for spaceship parts 2022-12-29 12:27:27 +02:00
vegeta1k95
be573f2b76
Big rework of City plates (#8239) 
* Big rework of City plates

* New city plates design, new status icons

* A little bit of padding for construction icon

* Better border for defence counter

* Better border for defence counter

* Solid colored icons

* Solid colored icons

* Credits

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-28 17:32:26 +02:00
nacro711072
301cd899b2
Some tile still has owner after city has been razed. (#8252) 
* resolve: the tile still has owner after city has been razed.

* working city null check.

* avoid concurrent modification.
 2022-12-28 14:55:44 +02:00
CrispyXYZ
0519b92671
Check non-null when removing road (fix #8249) (#8250) 2022-12-28 11:23:55 +02:00
itanasi
84fe92fab3
Negative stats UI Updates (#8240) 
* Fix UI for negative Science, Culture, and Faith

* Fix more UI issues
Support Happiness Transportation Upkeep
Create Culture->Happiness deficit

* Remove deficit
Functionalize Rate + addition
 2022-12-28 08:19:01 +02:00
CrispyXYZ
41db6e079a
Fix translation of policy branch name (#8247) 2022-12-28 08:18:03 +02:00
Philip Keiter
37250cc65d
Add checkbox to Settings AdvancedTab to enable or disable easter eggs. (#8248) 2022-12-28 08:17:27 +02:00
Yair Morgenstern
f45d23d8d5 Revert "Demographics removed - resolves #8215" 
This reverts commit c7f5a34c04.
 2022-12-28 08:10:27 +02:00
Yair Morgenstern
e06b2be623 4.3.13 2022-12-27 22:58:24 +02:00
Yair Morgenstern
c784e13112
Version rollout (#8242) 
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#8241)

* Update French.properties (#8233)

* Create Afrikaans.properties (#8231)

* Update Simplified_Chinese.properties (#8228)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Updated Brazilian_Portuguese.properties (#8225)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update Korean.properties (#8220)

* Update Korean.properties

* Update Korean.properties

* Fix afrikaans and add icon

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: LifeCanvasDev <93025509+LifeCanvasDev@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
 2022-12-27 22:52:25 +02:00
Yair Morgenstern
c7f5a34c04 Demographics removed - resolves #8215 2022-12-27 22:33:07 +02:00
Yair Morgenstern
d1cb47054c World wrap available by default for all players 2022-12-27 22:30:27 +02:00
Yair Morgenstern
c0f0673e2d Units are no longer double-added to construction when clicking the 'add unit' button 2022-12-27 22:27:05 +02:00
Yair Morgenstern
fc5b8bc73d Units passed with 'next unit' are not returned to 2022-12-27 09:26:15 +02:00
alexban011
859cc829f2
fixed screens displaying yourself as an unknown civilization (#8232) 
* fixed diplomacy screen

* fixed diplomacy screen and GP screen

* forgot to change a variable

* reviews
 2022-12-26 20:15:02 +02:00
Yattong the Mackerel
e4264213c7
Update template.properties (#8236) 2022-12-26 17:05:25 +02:00
CrispyXYZ
ef55b9b5dc
fix a translation problem in policy screen (#8229) 2022-12-25 11:20:50 +02:00
vegeta1k95
42a17aab5b
Corrected Civilizations colors (#8224) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-25 10:01:40 +02:00
Yair Morgenstern
07dfc695d2 4.3.12-patch3 2022-12-25 08:37:40 +02:00
vegeta1k95
a6f6565112
Fix unit selection cycling (#8226) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-25 08:36:37 +02:00
Yair Morgenstern
a347b05292 4.3.12-patch2 2022-12-25 00:35:52 +02:00
vegeta1k95
d3b6100047
Fix perpetual constructions info (#8207) (#8222) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-25 00:07:26 +02:00
Yair Morgenstern
b7b6bbd3f3 4.3.12-patch1 2022-12-25 00:03:10 +02:00
vegeta1k95
f4c91126bc
Civ 5: unit selection and cycling behaviour, "Wait" action (#8202) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-24 23:12:31 +02:00
Yair Morgenstern
9dce968ce0 PolicyScreen screenshot 2022-12-24 20:06:51 +02:00
Yair Morgenstern
0c58488e42 4.3.12 2022-12-24 20:02:11 +02:00
Yair Morgenstern
d612286d81
Version rollout (#8219) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#8217)

* Update traditional_chinese.properties (#8213)

* Update German translation (#8205)

* Update French.properties (#8204)

* Updated Brazilian_Portuguese.properties (#8201)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Italian.properties (#8199)

* Update Indonesian.properties (#8196)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
 2022-12-24 19:52:05 +02:00
itanasi
bc483e8984
G&K Neutral Tile Road Maintenance (#8138) 
* Redo

* New parameterized and actually used Road Unique

* Remove unneeded

* Update CURRENT_COMPATIBILITY_NUMBER since adding new serialization data

* Make neutralRoads for CivilizationInfo.kt Transient
 2022-12-24 19:43:37 +02:00
letstalkaboutdune
8d0acd0647
Added keyboard shortcut to toggle World Screen UI elements (#8211) 
* AbsoluteUnits - Mongolian Uniques

* Added keyboard shortcut to toggle World Screen UI elements

Ctrl+U to toggle

* Update WorldScreen.kt

* Added a pesky space

* Remove "Experimental" warning text

* Revert "Remove "Experimental" warning text"

This reverts commit 3c8456db95.
 2022-12-24 19:41:35 +02:00
alexban011
994169944a
showed unknown civs as Unknown civilization in GP and Diplomacy screens (#8184) 
* added mod topics to wiki

* fixed stats from revealing unknown civs and cityStates

* Revert "added mod topics to wiki"

This reverts commit 5528950a96.

* used knows() instead of getKnownCivs().contains()

* showed politics when you don't know the civ in GlobalPoliticsOverviewTable

* Replaced unknown civs name with `Unknown civilization` in DiplomacyScreen

* forgot to remove a couple lines

* translated the strings for the protectors

* reviews

* made function and tested translations
 2022-12-24 19:40:36 +02:00
Yair Morgenstern
fd0279c187 Fixed "cannot upgrade to last unit" 2022-12-24 19:22:39 +02:00
vegeta1k95
78c4f6de68
Big rework of Policy Picker UI, added new ninepatch RoundedEdgeRectangleSmall (#8218) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-24 19:17:00 +02:00
letstalkaboutdune
1fdbea0a45
Trim Nuke SFX (#8216) 2022-12-24 18:55:21 +02:00
vegeta1k95
0aa7c0e79b
Added gradle task of Atlas texture packing for Android build (#8208) 
* Added gradle task of Atlas texture packing for Android build

* ImagePackers check also for creation date

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-23 14:49:08 +02:00
Yair Morgenstern
dd5a242743 - Translation fix for great people - #6131 2022-12-22 23:44:04 +02:00
Yair Morgenstern
ccb5bb205f City stats fixes 
- Translation fixes - #6131
- Stats button never hidden by "we love the king day"
 2022-12-22 23:14:19 +02:00
Yair Morgenstern
20b63da334 Resolved #8206 - tech screen zooms to current tech when opened 2022-12-22 23:05:53 +02:00
Yair Morgenstern
8d98062a76 Resolved #8200 - get correct civ-wide stats from City-States with the correct unique 2022-12-22 22:54:02 +02:00
Philip Keiter
9f6aa4b90f
Add new game option: No City Razing. (#8203) 2022-12-22 07:41:08 +02:00
Yair Morgenstern
7427932985 Upgrade path redone 2022-12-21 20:50:25 +02:00
Yair Morgenstern
bfbabcb97e 4.3.11-patch1 2022-12-21 13:12:25 +02:00
Yair Morgenstern
01309be510 4.3.11 2022-12-21 12:02:05 +02:00
Yair Morgenstern
3a91a99143
Version rollout (#8195) 
* Bump version and create initial changelog entry

* Update Japanese.properties (#8194)

* 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 Spanish.properties (#8190)

* Update Catalan.properties (#8183)

* Update German translation (#8181)

* Provide Ukrainian translations for the lately introduced original strings (#8177)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Korean.properties (#8176)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Updated Brazilian_Portuguese.properties (#8175)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: K0baU <63403741+K0baU@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2022-12-21 11:51:45 +02:00