mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-19 08:47:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,236 Commits 6 Branches 1,039 Tags 1.2 GiB
bb3335aaa8
Commit Graph

9236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SomeTroglodyte
d31a2d83ba
Happiness change from bought buildings can reapply citizen focus (#9395) 
* Happiness change from bought buildings can reapply citizen focus

* Fix compilation error
 2023-05-18 00:37:38 +03:00
SomeTroglodyte
1de866c7ed
Local and/or jpg mod previews (#9394) 
* Allow mod preview image to be a jpg

* Allow preview images from WIP mods lacking github url

* Wiki preview.jpg

* Allow mod preview image to be a jpg - review
 2023-05-16 13:00:44 +03:00
Yair Morgenstern
7f4b7bbd21 Resolved #9391 - clicking locally-added mods no longer crashes 2023-05-15 09:22:21 +03:00
SomeTroglodyte
6d185ea5a5
Fix UnitTable layout (#9392) 2023-05-15 09:09:39 +03:00
Yair Morgenstern
fc222ca4cf 4.6.12-patch1 2023-05-14 23:37:42 +03:00
Yair Morgenstern
5fe8fbf99a Mod preview images: Dispose of Pixmap, cache images for later use 
Based on CR by @SomeTroglodyte
 2023-05-14 23:33:58 +03:00
Yair Morgenstern
4a7f65f281 4.6.12 2023-05-14 22:03:40 +03:00
Yair Morgenstern
3879f18288
Version rollout (#9388) 
* Bump version and create initial changelog entry

* Update Italian.properties (#9381)

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#9378)

* Update Polish.properties (#9377)

* Updated Brazilian_Portuguese.properties (#9376)

* Update German translation (#9373)

---------

Co-authored-by: yairm210 <yairm210@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>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
 2023-05-14 21:55:54 +03:00
alexban011
841a1aa564
ci: improved detekt configuration and ci (#9380) 
* ci: improved detekt configuration

it still needs some work but it's getting there

* detekt: separated errors from warnings

Detekt doesn't currently have a mechanism for failing only on specific issues

workaround suggested by the maintainer of Detekt

* rebased on master

* fix: resolve ExplicitItLambdaParameter

* fix: fix last star import
 2023-05-14 21:55:36 +03:00
SomeTroglodyte
ae13f32f72
Animate battle damage numbers (#9387) 
* Animated battle damage numbers 001

* Animated battle damage numbers 002

* Animated battle damage numbers 003

* Animated battle damage numbers 004
 2023-05-14 21:52:15 +03:00
Yair Morgenstern
e6135fa486 Display map ruleset when picking map, don't show unloadable maps 2023-05-14 21:51:19 +03:00
Yair Morgenstern
5bbd8bce53 Allow mods to contain a "preview.png" file for visual indication 2023-05-14 14:36:46 +03:00
Yair Morgenstern
48bd416347
Multi-server preparations: Save server info in game, save server functionality in specific class (#9379) 
* Save server info in game

* Moved server functionality into server class

* Fix Android multiplayer update
 2023-05-13 21:51:44 +03:00
SomeTroglodyte
97769b89b6
Combat java.util.star-import (#9382) 2023-05-13 21:50:55 +03:00
Yair Morgenstern
d2eaae0922
4.6.11-patch1 (#9375) 
* Convert 'camps' vectorhashmap to 'encampments' arraylist

* Solve camps For Real This Time
Previous solution was only taking the first item of the class, not all of it

* 4.6.11-patch1
 2023-05-11 16:54:37 +03:00
Yair Morgenstern
dde3732383
Convert 'camps' vectorhashmap to 'encampments' arraylist (#9374) 2023-05-11 16:51:29 +03:00
Yair Morgenstern
9a0ba7dcd8 4.6.11 2023-05-11 13:53:12 +03:00
Yair Morgenstern
3f2dd3614f
Version rollout (#9372) 
* Bump version and create initial changelog entry

* Update Indonesian.properties (#9371)

* Update Brazilian_Portuguese.properties (#9352)

* Update Russian.properties (#9351)

There was a letter missing in the word

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: iliademid21 <132929464+iliademid21@users.noreply.github.com>
 2023-05-11 13:50:21 +03:00
SomeTroglodyte
2ef5ed14e1
Fix 4.6.10 no longer loading older games (#9370) 
* Fix 4.6.10 no longer loading older games

* Save games with correct current version info
 2023-05-11 13:01:00 +03:00
Crsi
3e4ba83bcc
Added a fix for #7380 to complete a game turn and set upToDate for last human player (#9366) 2023-05-10 22:18:26 +03:00
SomeTroglodyte
d4af4e1053
Policy images in red text, policy branch icons in pedia (#9365) 2023-05-10 14:36:50 +03:00
alexban011
0d05a658df
ci: added Detekt code analysis (#9322) 
* ci: added Detetk code analysis

* ci: made some configs, removed report generation and renamed yml file
 2023-05-10 11:46:16 +03:00
alexban011
f3e80a4021
Fixed a couple warnings reported by code analysis (#9364) 
* fix: resolve EmptyCatchBlock warnings

* fix: resolve PrintStackTrace warnings

* fix: resolve SwallowedException warnings

* fix: resolve ThrowingExceptionsWithoutMessageOrCause warnings

* fix: resolve ConstructorParameterNaming warnings

* fix: resolve FunctionParameterNaming warnings

* fix: resolve InvalidPackageDeclaration warnings

* fix: resolve ForEachOnRange warnings

* fix: resolve ImplicitDefaultLocale warnings

* fix: resolve MayBeConst warnings

* fix: resolve NewLineAtEndOfFile warnings

* fix: resolve UnusedParameter warnings

* fix: resolve UtilityClassWithPublicConstructor warnings

* fix: resolve WildcardImport warnings
 2023-05-10 11:43:53 +03:00
SomeTroglodyte
1df7ee46ac
Prevent some state changing actions during next-turn (#9327) 
* Prevent some state changing actions during next-turn

* Direct canChangeState
 2023-05-10 11:39:48 +03:00
Yair Morgenstern
a858e45ec4
Update README.md - per-OS installation instructions 2023-05-10 10:54:15 +03:00
Yair Morgenstern
341c290ce4 Resolved #9357 - update UI after founding city when breaking promise 2023-05-10 10:34:44 +03:00
Yair Morgenstern
be20c917cc 4.6.10-patch2 
Resolved #9363 #9356 - solved font crash exception
 2023-05-10 10:28:44 +03:00
Skekdog
a3ef6fa314
Add May not annex cities unique (#9314) 
* Add `May not annex cities` unique, following same behaviour as Civ5 Venice. Hopefully this time I won't need to re-install windows.

* Add `May not annex cities` unique, following same behaviour as Civ5 Venice. Hopefully this time I won't need to re-install windows.

* Fix raze button being unavailable in city screen

* Fixed raze button being available in city screen, as per civ5

* Corrected indentation

* mayAnnex instead of canAnnex, hasUnique rather than getMatchingUniques

* AI will follow rules

* Replaced getMatchingUniques with hasUnique, for real this time
 2023-05-09 23:02:19 +03:00
Yair Morgenstern
203477eca1 4.6.10-patch1 2023-05-08 21:01:23 +03:00
Yair Morgenstern
d00b06bad4 4.6.10 2023-05-08 18:57:30 +03:00
Yair Morgenstern
ed2c294c6f
Version rollout (#9350) 
* Bump version and create initial changelog entry

* Update Italian.properties (#9347)

* Update Italian.properties

* Update Italian.properties

* Update German translation (#9345)

* Update German translation

* Update German translation

* Update Spanish.properties (#9344)

* update Simplified_Chinese (#9339)

* Update French.properties (#9336)

* Update French.properties

* Update French.properties

Better translation for the Kremlin quote.

* Update Polish.properties (#9335)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-05-08 18:45:27 +03:00
Yair Morgenstern
02e6785969 Resolved #9332 - Solved rare concurrency bug for explored tiles 2023-05-08 18:37:44 +03:00
Yair Morgenstern
f8b4b202e7 Automated workers no longer stay on unimprovable tile if another tile is improvable 2023-05-08 18:29:34 +03:00
Yair Morgenstern
e0505d1eb7 Songhai Civilian units no longer gain Amphibious promotion 2023-05-08 18:06:01 +03:00
Yair Morgenstern
ea64f941a6 Resolved #9340 - fixed 'enhance religion' crash 2023-05-08 18:02:11 +03:00
Yair Morgenstern
ade3af7729 4.6.9-patch2 2023-05-07 09:57:19 +03:00
Yair Morgenstern
7b5ed07805 Resolved #9333 - Improperly configured mod conditionals do not cause crash 2023-05-07 09:52:59 +03:00
Yair Morgenstern
32041d5b49 4.6.9-patch1 2023-05-07 09:43:25 +03:00
vermontbail
bd3081f276
Changes to landing page FIXED (#9337) 
* Updated Building-Locally.md

While the underlying steps haven't changed, some of the options now have slightly different names in Android studio.

* Update index.md

* Revert "Updated Building-Locally.md"

This reverts commit e3772dad78.

* Revert "Revert "Updated Building-Locally.md""

This reverts commit e1f5960a2e.

* Update Building-Locally.md
 2023-05-07 08:09:14 +03:00
Yair Morgenstern
5f92b88a08 4.6.9 2023-05-06 21:35:48 +03:00
Yair Morgenstern
cf4419912d 4.6.9 2023-05-06 21:25:13 +03:00
Yair Morgenstern
c895771b3a
Bump version and create initial changelog entry (#9334) 
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
 2023-05-06 21:21:50 +03:00
letstalkaboutdune
52e8623f08
AbsoluteUnits - Hussar, Cossack, Panzer (#9331) 2023-05-06 21:13:33 +03:00
Crsi
299aa06d94
Close the friend selection popup in NewGameScreen by click outside or ESC/BACK key (#9329) 2023-05-06 21:13:19 +03:00
SomeTroglodyte
100f4ede64
Fix memory leak from repeatedly resetting the font (#9326) 
* Fix memory leak from repeatedly resetting the font

* Reduce ruleset recompilation by MainMenuScreen background changes
 2023-05-05 15:20:30 +03:00
SomeTroglodyte
940fa9a551
Slimming a locally built jar (#9321) 2023-05-04 14:21:00 +03:00
Yair Morgenstern
4b9c7171d3 Resolved #9242 - Hide buildings requiring multiple cities in one city challenge 2023-05-04 11:22:03 +03:00
Yair Morgenstern
fab32e8c8a Resolved #9304 - Added Policy icons and solved 'icons from Image' reflection :) 2023-05-04 11:07:54 +03:00
Yair Morgenstern
ec65b7e189 Resolved #9211 - Show Strategic resources you have by trade even if you have not researched tech for it yet 2023-05-04 10:49:40 +03:00
Yair Morgenstern
a370117301 Resolved #9036 - New Kremlin quote 2023-05-04 10:47:00 +03:00