Commit Graph

5765 Commits

Author SHA1 Message Date
Yair Morgenstern
b9051e00bb
Reverted split of build
gradle build is a SUPERset of check, so will actually do extra things that are not needed.
2021-08-20 14:22:32 +03:00
yairm210
4e72cafc27 Removed manual kotlin-stdlib dependency
Kotlin 1.4+ auto-adds kotlin-stdlib dependency per https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default so we don't need it added manually.
Tested locally with ./gradlew desktop:dist and the jar worked.
2021-08-20 13:37:35 +03:00
Yair Morgenstern
2d7e675f95
Split build and check to different steps
For better understanding of where things fail or take time
2021-08-20 13:28:11 +03:00
yairm210
6b0714ad43 Merge remote-tracking branch 'origin/master' 2021-08-20 13:19:04 +03:00
yairm210
7da4056392 Kotlin 1.4+ auto-adds kotlin-stdlib dependency per https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default so we don't need it added manually.
Tested locally with ./gradlew desktop:dist and the jar worked.
2021-08-20 13:18:50 +03:00
Yair Morgenstern
3ebb1c86c7
Back to safe haven
We'll try this out slowly
2021-08-20 12:45:10 +03:00
Yair Morgenstern
a8084d7bbf
Removed cache to solve metaspace error
Got a "java.lang.OutOfMemoryError: Metaspace" error from https://github.com/yairm210/Unciv/runs/3380139617, and 10 upvotes at https://stackoverflow.com/questions/55210139/gradle-java-lang-outofmemoryerror-metaspace/55210866 say this is a gradle cache problem. So much for that.
2021-08-20 11:52:10 +03:00
Yair Morgenstern
871f6a8101
Java version update, 8->11 2021-08-20 11:36:08 +03:00
yairm210
305cde86ce Merge remote-tracking branch 'origin/master' 2021-08-20 11:17:18 +03:00
yairm210
e13377d34e Enabled parallel gradle build by default - let's see if this affects build times 2021-08-20 11:17:06 +03:00
AdityaMH
b117681ee6
Add Inquisitor for FantasyHex from BUCKETEER (#4919) 2021-08-20 11:14:17 +03:00
AdityaMH
a0a208fc91
Improve Polder & City center (Atomic Era) from BUCKETEER (#4917) 2021-08-20 11:14:01 +03:00
AdityaMH
78b8b4b177
Modified Armored Unit into 2.5D from BUCKETEER (#4918) 2021-08-20 11:13:36 +03:00
AdityaMH
b790c40bd9
Add Natural Wonders for FantasyHex by BUCKETEER (#4916) 2021-08-20 11:12:27 +03:00
Yair Morgenstern
d0f2363dfc
Added gradle caching to improve actions runtime 2021-08-20 11:06:37 +03:00
yairm210
4c0d33e2c2 3.16.5-googlePlayPushTest 2021-08-20 09:35:28 +03:00
Xander Lenstra
b2e6612c0e
Added a UI for viewing the religions inside a city (#4904)
* Added a UI for viewing the religions inside a city

* Rewrote large parts of the UI, implementing @SomeTroglodyte's great advice
2021-08-20 08:59:13 +03:00
SomeTroglodyte
970259a0ea
WorkerAutomation cached per Civ - BFS cached (#4868)
* WorkerAutomation cached per Civ - BFS cached

* WorkerAutomation cached per Civ - more linting
2021-08-20 01:25:41 +03:00
Xander Lenstra
d856efac06
Implemented almost all missing founder & follower beliefs (#4890)
* Implemented almost all missing founder & follower beliefs

* Added missing negator

* Implemented requested changes
2021-08-20 01:24:28 +03:00
Yair Morgenstern
cd1a25aeb3
Added push to Google Play as a release step (#4912)
* t1

* Only run on tag

* Added Google Play service account

* t3 - now with correct signing location

* whatsNewDirectory

* This is just to test if the automatic upload to Google Play is working

* Removed Android SDK

not sure it's needed for android build and signing

* Returned branch to master

Should be final!
2021-08-20 01:11:41 +03:00
yairm210
cb1c70f73b Resolved #4769 - City-states grant copies of their resources, even if they're in use 2021-08-19 23:43:32 +03:00
yairm210
eb8e76ba08 3.16.5 2021-08-19 20:49:08 +03:00
Xander Lenstra
a4e61d65c2
Fixes crashes from loading mods without an eras.json file (#4910) 2021-08-19 20:44:11 +03:00
yairm210
c7265c79b6 Reverted 6a32d6 2021-08-19 20:43:47 +03:00
yairm210
5223caf390 Resolved crash for mods with no eras defined 2021-08-19 20:41:26 +03:00
Yair Morgenstern
1f2ea971e5
Translations update (#4908)
* korean translation update (#4906)

* Update Russian.properties (#4898)

* Update French.properties (#4897)

Some traductions

* Update Hungarian.properties (#4896)

just your basic translating

* Update German translation (#4895)

* Update German translation

* Update German translation

* Update German translation

* Update Lithuanian.properties (#4833)

* Update Lithuanian.properties

Added translate in the start and a bit in the middle closer to the bottom, changed some lithuanian translate found bad translate :/

* Fixed broken tag

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

* Update Spanish.properties (#4887)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: Huichan Lee <74085452+kasterra@users.noreply.github.com>
Co-authored-by: Grom1halo <78541732+Grom1halo@users.noreply.github.com>
Co-authored-by: Marjolain <florentin.services@protonmail.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Pirdachu <88770992+Pirdachu@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-08-19 20:40:49 +03:00
SomeTroglodyte
af92fdc1d2
Expander tab persist (#4905)
* ExpanderTabs remember state

* ExpanderTabs remember state - city constructions dynamic

* ExpanderTabs remember state - city screen portrait
2021-08-19 10:06:52 +03:00
SomeTroglodyte
0f5f3366ed
Small changes to city screen (#4902) 2021-08-19 09:51:26 +03:00
Arthur van der Staaij
ef5483e9d5
Removed the civ introduction trade option (#4888)
* Removed the civ introduction trade option

Left in the minimum amount of code to ensure that saves with a pending
introduction trade do not break (any such pending trades are cancelled).
The left-in introduction trade code can be fully removed in a later
version.

* Added back civ introduction trades as a mod option

Also made the gold value of introducation trades moddable.

* Made civ introduction trade invalid if receiver already knows the civ

This prevents players from sending two AI civs introduction trades for
each other in the same turn and profiting from both. This therefore
fixes #4272.

* Applied requested changes

* Removed a spurious space
2021-08-19 09:45:03 +03:00
Arthur van der Staaij
4114296cbe
Made water oil wells require the Refrigeration tech (#4889)
* Made water oil wells require the Refrigeration tech

Oil wells can now only be created on water with the refrigeration
technology.

This is not the ideal solution: it would be preferable to support
multiple improvements for a single resource, to add offshore platforms
as a separate improvement for coastal oil that requires refrigeration
and to disable building oil wells on coast. Allowing multiple
improvements for a resource would however be a much more significant
refactor.

* Added back "terrainsCanBeBuiltOn": ["Coast"]
2021-08-18 12:19:08 +03:00
SomeTroglodyte
b60c2c71dd
Unit action constants and worker unique cleanup (#4815)
* Unit action constants and worker unique cleanup

* Replace unit action constants with enum properties - patch1

* Replace unit action constants with enum properties - patch2
2021-08-18 12:18:02 +03:00
SomeTroglodyte
03981c6242
CityScreen Buy button rework (#4843)
* CityScreen Buy button rework
- e.g. "Buy" for Missionary
- Info pane staying even when building no longer offered
- Purchase Prompt a little prettier

* Urgent Fix - noMods switch default

* CityScreen Buy button rework - patch1
2021-08-18 12:17:40 +03:00
yairm210
ab69f75256 Merge branch 'temp' 2021-08-17 23:29:34 +03:00
yairm210
5773afb6e1 3.16.4-patch2 2021-08-17 23:29:17 +03:00
SomeTroglodyte
9cde914af5 updateNumberOfFollowers _is_ called one last time after a city has been raZed to the grOund (#4892)
(cherry picked from commit dcc6ad8562)
2021-08-17 23:27:22 +03:00
SomeTroglodyte
dcc6ad8562
updateNumberOfFollowers _is_ called one last time after a city has been raZed to the grOund (#4892) 2021-08-17 23:24:24 +03:00
SomeTroglodyte
8cc25a74a7
Urgent Fix - noMods switch default (#4893) 2021-08-17 23:23:31 +03:00
SomeTroglodyte
ecd6cd92a4
City screen purchasable constructions prettier (#4822)
* City screen purchasable constructions prettier

* City screen purchasable constructions prettier - patch1

* City screen purchasable constructions prettier - mad modder edition
2021-08-17 14:00:01 +03:00
Xander Lenstra
607e40a712
Fixed some bugs with spreading of religion (#4851)
* Fixed some bugs with spreading of religion

* Implemented requested changes
2021-08-17 13:58:19 +03:00
SimonCeder
74a1da8e17
CS bonuses graded according to relationship level (#4664)
* city-state bonuses graded depending on friend or ally

* siam militaristic UP, cleaned up presentation

* fix strings

* move city state modifiers to json

* city-state bonuses graded depending on friend or ally

* siam militaristic UP, cleaned up presentation

* fix strings

* move city state modifiers to json

* Restructure eras.json

* reduce indentation in DiplomacyManager.kt

* Add fallback values in cas of missing json definitions

* review edits

* fix conflicts???

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-17 13:55:02 +03:00
SomeTroglodyte
076128a37e
Unit test catching un-annotated lazies (#4886) 2021-08-17 13:52:41 +03:00
AdityaMH
8c97e2c6fc
Improve horse sound (#4849)
* Improve horse and construction sound

* Update Credits.md

* Convert to mp3

* Delete construction.ogg

* Improve horse sound

By https://freesound.org/people/Kubuzz/sounds/347036/

* Update Credits.md

* Bring back to old "construction" sound

* Update Credits.md
2021-08-17 13:51:58 +03:00
Arthur van der Staaij
6ad90c31ba
Removed the sight bonus from hills (#4883) 2021-08-17 09:14:49 +03:00
Arthur van der Staaij
84a62c7926
Gave anti-air units a bonus vs helicopters (#4884)
Helicopters are implemented as land units, so the anti-air units (land
anti-air and fighters) did not yet have this bonus.

Also corrected the damage bonus of triplanes and removed a redundant
"6 tiles in every direction always visible" unique.
2021-08-17 09:11:03 +03:00
Arthur van der Staaij
0ce033b3a9
Disabled pillaging your own tiles (#4882) 2021-08-17 09:10:21 +03:00
yairm210
0436e67342 3.16.4-patch1 2021-08-16 19:31:12 +03:00
Yair Morgenstern
38d50d04b3
Translations update (#4881)
* Update Indonesian.properties (#4875)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Swedish.properties (#4874)

Translated the newly added lines.

* Update Japanese.properties (#4872)

* Update Italian.properties (#4871)

* Update German translation (#4866)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@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>
2021-08-16 19:24:01 +03:00
Xander Lenstra
8d49a84f78
Fixed crash from conquering cities (#4877) 2021-08-16 16:58:53 +03:00
SomeTroglodyte
df31fb2f05
Fix DOS attack perpetrated by CityInfoReligionManager on Json Serializer (#4870)
Fixes #4867
2021-08-16 11:26:06 +03:00
yairm210
c1acda6c6b 3.16.4 2021-08-15 22:04:12 +03:00