mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-13 00:04:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,876 Commits 6 Branches 1,037 Tags 1.2 GiB
9739374e17
Commit Graph

8876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SomeTroglodyte
9739374e17
Update civ resources when a researched tech reveals a resource (#9467) 2023-05-28 08:39:36 +03:00
SomeTroglodyte
ef193babee
Map editor update - concurrency, resource amounts, file double-click (#9461) 2023-05-27 21:44:23 +03:00
SomeTroglodyte
1c124c9ddf
Fix UniqueType.RoadMaintenance being ignored (#9456) 2023-05-27 21:44:03 +03:00
SomeTroglodyte
c73d5d74d0
Fix mouse wheel on NotificationsScroll (#9451) 
* Fix mouse wheel on NotificationsScroll

* Explain why getMouseWheelX is overridden to zero
 2023-05-27 21:32:51 +03:00
SomeTroglodyte
268d27d1ed
Unit overview remembers scroll position after promoting (#9454) 2023-05-27 21:32:23 +03:00
Yair Morgenstern
8be9cd6a76 Modding: units can transform without limit on destination unit 2023-05-24 11:46:31 +03:00
Yair Morgenstern
6f830a33a9 Merge branch 'temp' 2023-05-24 11:46:05 +03:00
Yair Morgenstern
d9b62fbf3e 4.6.14-patch1 2023-05-24 11:45:55 +03:00
Yair Morgenstern
133704282c Merge branch 'temp' 2023-05-24 11:43:39 +03:00
Yair Morgenstern
4ef33b84e5 4.6.14-patch1 
Fix AI automation preventing settlers from moving
 2023-05-24 11:42:42 +03:00
Yair Morgenstern
4cde648ebb Resolve #9403 - update dockerfile 2023-05-24 10:30:01 +03:00
Yair Morgenstern
00b52851f3 Unpurchaseable units are properly unpurchaseable 2023-05-24 00:16:49 +03:00
Yair Morgenstern
206adb954d Migrated Linux JRE to latest Adoptium Temurin 2023-05-23 23:36:36 +03:00
alexban011
0d76ae1e3c
feat: allow loading of games if there are no saved games (#9441) 2023-05-23 23:15:37 +03:00
alexban011
0b51fcdb92
docs: added documentation for running detekt (#9443) 
* docs: added documentation for running detekt

* docs: added note for windows users
 2023-05-23 23:15:24 +03:00
Yair Morgenstern
5fcfa6ac2d Resolved #9444 - Crop yield chart no longer displays score data 2023-05-23 23:12:04 +03:00
Yair Morgenstern
e75742d3d6 Fixed policy branch finishers overriding branches - oops! 2023-05-23 22:37:10 +03:00
Yair Morgenstern
35718c00e7 Fixed softlock for mod policies overriding existing policy locations 2023-05-23 22:15:31 +03:00
Yair Morgenstern
b94321f535 4.6.14 2023-05-23 20:37:51 +03:00
Yair Morgenstern
5857301732
Version rollout (#9440) 
* Bump version and create initial changelog entry

* Update German translation (#9437)

* Update Spanish.properties (#9434)

* Update Brazilian_Portuguese.properties (#9433)

* Update French.properties (#9426)

* Update Italian.properties (#9422)

* Update Japanese.properties (#9346)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

*Add translations
*Add city names

* Update Japanese.properties

*Add new translations
*Fixed some translations regarding tile improvements that I have translated previously

* Update Japanese.properties

*Add translation for City-Nations messages, ruin-regarding messages, and more.

* Update Japanese.properties

Add translations for 
*Sweden, Austria, and some city-states
*Multiplayer Game notifications
*Tile Improvements
*Civilopedia explanations

* Update Japanese.properties

Add translations for
*Religion beliefs
*Civilopedia descriptions
*Victory status
*and more

* Update Japanese.properties

* Edit details

* Update Japanese.properties

*add new branches

* Update Japanese.properties

Fix wrong placeholders

---------

Co-authored-by: yairm210 <yairm210@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: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: namazulake <130637228+namazulake@users.noreply.github.com>
 2023-05-23 20:33:10 +03:00
Yair Morgenstern
7aea703fcc Resolve #9432 - city-state-owned great merchants can no longer 'conduct trade mission' on their own tiles 2023-05-23 19:41:41 +03:00
Yair Morgenstern
472bb55b40 Resolve #9435 - don't crash for ByteBuffer byte errors 2023-05-23 19:29:06 +03:00
SomeTroglodyte
b3166c4922
Fix ConcurrentModificationException when puppeting a city (#9430) 2023-05-22 20:12:31 +03:00
SomeTroglodyte
5f60c887f7
Next-Turn Progressbar (#9409) 
* Next-Turn Progressbar

* Next-Turn Progressbar - doc

* NextTurnProgress: Rethink max on first turn
 2023-05-22 17:59:28 +03:00
Yair Morgenstern
575983578a
Game saves are regular json, not minimalized json (#9427) 2023-05-22 17:57:56 +03:00
Yair Morgenstern
edd09910a1 AI civilian improvement: Don't freeze when enemy is near, keep working in tiles where he can't reach 2023-05-22 14:31:49 +03:00
Yair Morgenstern
fc81d7dda3 Units that can enter foreign lands without open borders are not expelled on open borders end 2023-05-22 14:31:43 +03:00
SomeTroglodyte
ae8d69b5b3
Resolve To-do in Unit upgrade resource requirements (#9420) 
* Update Counter get() nullability

* Counter upgrade

* Use Counter for unit resource requirements

* Linting
 2023-05-22 14:28:36 +03:00
Yair Morgenstern
e2b3432d84
Population icon gets locked with doubleclick, clicks cycle between assigned and unassigned (#9428) 2023-05-22 14:27:00 +03:00
Yair Morgenstern
95ffbd6a6e 4.6.13 2023-05-21 14:16:50 +03:00
Yair Morgenstern
9c2a9975a6
Version rollout (#9418) 
* Bump version and create initial changelog entry

* Update Greek.properties (#9407)

* Update Spanish.properties (#9397)

* Update Indonesian.properties (#9393)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: marek06072 <133993044+marek06072@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
 2023-05-21 14:08:49 +03:00
Yair Morgenstern
280025fa10 Resolved #9416 - failure to get preview image no longer causes crash 2023-05-21 12:35:57 +03:00
SomeTroglodyte
a91dca0930
Fix off-by-one error in autoAssignPopulation (#9411) 
* Fix off-by-one error in autoAssignPopulation

* Fix more off-by-one errors from for-repeat conversions

* Linting: Use Actions.forever shortcut where appropriate
 2023-05-21 12:08:03 +03:00
SomeTroglodyte
ec4586af6c
Fix Ensure Minimum Stats (#9408) 2023-05-21 00:13:50 +03:00
Yair Morgenstern
728afab1db Modding: Added 'upon adopting [belief]' trigger, allowed belief adoption to trigger uniques 2023-05-19 00:22:34 +03:00
Yair Morgenstern
6841a7f214 Added turn number to victory replay 2023-05-19 00:06:03 +03:00
alexban011
6603c6cfd0
refactor: break large functions into smaller ones (#9406) 2023-05-18 22:02:26 +03:00
alexban011
54f651c2fb
fix: fixed translation text (#9404) 
* fix: fixed translation text

* fix: fixed Romanian.properties
 2023-05-18 18:30:17 +03:00
alexban011
91116f8df3
Fixed more warnings (#9401) 
* fix: fix FunctionParameterNaming warnings

* fix: fix InvalidPackageDeclaration warnings

* fix: fix MatchingDeclarationName warnings

* fix: fix WrongEqualsTypeParameter warnings

* fix: fix UnusedPrivateProperty warnings

* fix: fix UseCheckOrError warningsU

* fix: fix UseRequire warningsU

* detekt: disabled SpreadOperator rule

* fix: resolve MemberNameEqualsClassName rule

* detekt: disabled ForbiddenComment rule

* fix: resolved SwallowedException warning

* fix: resolved ThrowingExceptionsWithoutMessageOrCause warning

* fix: resolved EmptyFunctionBlock warning

* fix: resolved EmptyFunctionBlock warning

* fix: resolved InstanceOfCheckForError warning

* detekt: disable TooGenericExceptionCaught warning

* detekt: disable TooGenericExceptionThrown warning

* fix: resolve part of NestedBlockDepth warnings
 2023-05-18 10:12:33 +03:00
alexban011
e9fbefedac
deps: bump kotlin version (#9402) 2023-05-18 09:59:40 +03:00
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