mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-28 08:30:31 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,796 Commits 6 Branches 1,043 Tags 1.2 GiB
213e648517
Commit Graph

5796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AdityaMH
213e648517
Improve Unit into 2.5D from BUCKETEER (#4967) 
* Improve Unit into 2.5D from BUCKETEER

* Ballista

* Galley & Carrier

* Landship
 2021-08-23 20:19:07 +03:00
SomeTroglodyte
7afffe3a89
getLastTerrain simple patch (#4971) 2021-08-23 20:18:54 +03:00
SomeTroglodyte
b4ad34988c
StartingLocation-Improvements-be-gone phase 1 (#4951) 2021-08-23 11:58:42 +03:00
Xander Lenstra
55f2bca9c7
Fix typo in changelog (wrong version number) (#4940) 2021-08-22 23:58:42 +03:00
Xander Lenstra
0868e31adb
Scouts still ignore terrain costs after upgrades (#4954) 
* Scouts still ignore terrain costs after upgrades

* Added an icon for the new promotion
 2021-08-22 23:27:33 +03:00
yairm210
8ef0dc99e9 MacOS release! 
With the xmargs it needs to run ;)
 2021-08-22 22:59:10 +03:00
yairm210
fffedf9a70 MacOS release! 2021-08-22 22:49:49 +03:00
yairm210
949f45497e Gradle upgrade! 2021-08-22 22:00:34 +03:00
yairm210
d2a94e9bad So NOW are you ready for java 11? 2021-08-22 21:33:00 +03:00
yairm210
eaa6ae5469 Wrong order of commands... download THEN gradle. 2021-08-22 21:17:06 +03:00
yairm210
79f3aae803 Linux64 is now built with packr JAR file, thus removing the need for JAVA_HOME! 2021-08-22 21:08:26 +03:00
Xander Lenstra
40e35b2167
Fixed interpunction & typos in the tutorial (#4941) 
* Fixed interpunction & typos in the tutorial

* Fixed old translations not being removed (unless words were changed)
 2021-08-22 14:08:42 +03:00
Xander Lenstra
22be1c92e6
Fixes bug where upgrading units would no longer provide their default upgrades (#4948) 2021-08-22 14:07:50 +03:00
SimonCeder
33cba2eea9
can now raze non-original capitals at capture (#4903) 
* can now raze non-original capitals at capture

* clearer code, equal for AI, get gold and reduce pop when liberating

* fix conflict??

* fix conflict????

* restore whitespace

* restore whitespace

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-08-22 09:12:29 +03:00
yairm210
f6a3808fe0 Better names for deploy 2021-08-22 00:09:38 +03:00
yairm210
5e7843c963 Cutting our losses and returning to java 8 - we won't solve this today, at least let's release. 2021-08-21 23:56:38 +03:00
yairm210
7228b2d4ae 3.16.6 2021-08-21 21:22:24 +03:00
Yair Morgenstern
0118eb6425
Translations update (#4936) 
* Update Swedish.properties (#4932)

Translated the newly added lines.

* Update Portuguese.properties (#4926)

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Indonesian.properties (#4915)

* Update Spanish.properties (#4914)

* Update Spanish.properties

* Update Spanish.properties

* Update German translation (#4911)

Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
 2021-08-21 21:06:00 +03:00
SomeTroglodyte
5c51e3d38e
Fix crash at conquest, empty religion icon (#4927) 2021-08-21 21:00:59 +03:00
SomeTroglodyte
13365e5ad6
Ancient Ruins, Civilopedia and Translations (#4907) 
* Ancient Ruins, Civilopedia and Translations
- TranslationFileWriter can process Ruins.json
- Hide Religion / Civilopedia uniques hardcoded String moved to Constants
- Civilopedia display of Ruins pulls actual json rewards in code
- Manually curated rewards description removed

* Ancient Ruins, Civilopedia and Translations
- Old rewards descriptions moved to names, color
- Code now recreates old output closely
- civilopediaText allowed additionally
- TranslationFileWriter tweaked accordingly

* Ancient Ruins, Civilopedia and Translations - fix stargazers
 2021-08-21 20:57:39 +03:00
SomeTroglodyte
1aea1d53b9
Fix-Workers-Second-Turn (#4929) 
* Fix-Workers-Second-Turn

* Fix-Workers-Second-Turn
 2021-08-21 20:56:54 +03:00
SomeTroglodyte
0c2cdcfcff
Fix crash after upgrading a unit (uninitialized lateinit) (#4928) 2021-08-21 20:56:08 +03:00
Miraç
3b980a24bd
Made great people and boats uncapturable (#4930) 
* Made great people and boats uncapturable

minus Great Prophet obviously.
Marks up one element in #4697

* included in khans as well
 2021-08-21 20:55:16 +03:00
Yair Morgenstern
854132fc3d
Build test java11 (#4924) 
* Test move to java 11

* Expanded metaspace size as per suggestion in https://github.com/gradle/gradle/issues/8354 to solve android list out of metaspace fail

* Master back to normal
 2021-08-20 16:38:25 +03:00
yairm210
e26cae8738 Force kotlin reflect 1.4.30 
Since the mockito upgrade didn't help
 2021-08-20 16:02:44 +03:00
yairm210
5779bdaa4f Upgraded mockito versions. 
Instead of forcing reflection to depend on latest kotlin version, I have a feeling the dependency is due to older mockito depending on older reflection.
 2021-08-20 15:45:46 +03:00
yairm210
85ed8a27d3 Bumped sourceCompatibility to Java 7 
Released in 2011 and by now technically out of support for 2 years.
Gotta roll with the times, but roll slowly.
 2021-08-20 15:24:02 +03:00
yairm210
510507bf9c Bumped compile and target Android SDK to 31 2021-08-20 15:06:23 +03:00
Yair Morgenstern
07ab5fa125
Added class compile beore check 2021-08-20 14:47:05 +03:00
yairm210
7b1d655957 Merge remote-tracking branch 'origin/master' 2021-08-20 14:31:34 +03:00
yairm210
58a45a5a4d Added caching to the gradle properties 
Also added android:exported tags so that android:processDebugMainManifest doesn't fail the gradle check.
I think this is only failing locally because I bumped the compileSdkVersion to 31, but that means it'll need to go in soon anyway.
 2021-08-20 14:30:45 +03:00
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