mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-11 07:47:41 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,521 Commits 7 Branches 1,036 Tags 1.1 GiB
a4aa5b7b5a
Commit Graph

8521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Caballero Arepa
a4aa5b7b5a
Improved Minimap colors (#8919) 
* Improved minimap colors

G&Ks change

* Improved minimap colors

Changes for Vanilla
 2023-03-16 14:29:37 +02:00
SomeTroglodyte
9262beb9a5
Show garrison in City overview (#8906) 
* Add a Garrison column to City Overview

* Add a Garrison column to City Overview - clickable
 2023-03-16 11:25:47 +02:00
SomeTroglodyte
461fc4f191
Future tech fix (#8917) 
* Future Tech - fix research progress

* Some minor linting

* Tech - Prefer kotlin libraries
 2023-03-16 11:24:08 +02:00
Yair Morgenstern
9a112728c1 translation fix 2023-03-15 22:28:58 +02:00
Yair Morgenstern
7eb70b412b . 2023-03-15 19:28:19 +02:00
Yair Morgenstern
f89765354a Resolved #8901 - Modding: Units from triggers respect "limited to [amount] per civilization" limits 2023-03-15 19:19:35 +02:00
Yair Morgenstern
6aef2ff3c6 Resolved #8888 - Added trigger condition notification for several unit triggers 2023-03-15 19:08:50 +02:00
Yair Morgenstern
855a818a84 Resolved #8899 - Modding: 'upon being defeated' now applies to destroyed civilians as well 2023-03-15 18:34:13 +02:00
Yair Morgenstern
2e3f131169 Resolved #8897 - Modding: Ruins now contain unit triggerables, changed some ruin uniques to unit triggerables 2023-03-15 18:28:12 +02:00
Yair Morgenstern
0a50f6deec 4.5.8 2023-03-15 10:45:19 +02:00
Yair Morgenstern
445bcf9701
Version rollout (#8908) 
* Bump version and create initial changelog entry

* Update German translation (#8907)

* Update German translation

* Update German translation

* Update Hungarian.properties (#8902)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Polish.properties (#8898)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Simplified_Chinese.properties (#8895)

* Update Ukrainian.properties (#8893)

* Update French.properties (#8890)

* Updated Brazilian_Portuguese.properties (#8887)

* Update Swedish.properties (#8886)

small update

* Update Italian.properties (#8884)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: pdt012 <54163911+pdt012@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Mr-Bajs <93934125+Mr-Bajs@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-03-15 10:42:29 +02:00
SomeTroglodyte
aab975a61b
Key bindings Step 3 - Better UI (#8891) 
* Configurable key bindings - better Widget step 2

* Configurable key bindings - step 2 updated help
 2023-03-15 09:05:50 +02:00
SomeTroglodyte
f1c891252e
Fix SelectBox ScrollPane being transparent (#8889) 
and make Skin.json conform to JSON standard
 2023-03-15 09:04:51 +02:00
Gualdimar
988f404ebc
World wrap scrolling fix (#8903) 2023-03-15 08:37:09 +02:00
Gualdimar
d3a419f8f8
Notifications scroll pane position fix (#8900) 
* Notifications scroll pane position fix

* Removed an unnecessary var
 2023-03-14 22:54:31 +02:00
Gualdimar
3bbb3a016c
Double trades fix + Diplomacy screen layout fix (#8896) 2023-03-14 20:41:42 +02:00
Gualdimar
0a9814e3b8
Minimap hotseat fix (#8894) 2023-03-14 18:28:47 +02:00
Yair Morgenstern
a2da1ff7ee Resolved translation errors at #6131 2023-03-13 23:26:32 +02:00
Yair Morgenstern
2a74be3be2 4.5.7-patch1 
Resolved #8883
 2023-03-13 19:45:39 +02:00
Yair Morgenstern
860d9425ce 4.5.7 2023-03-13 17:19:43 +02:00
Yair Morgenstern
cad179c701
Version rollout (#8882) 
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8881)

* Minor fixes to the translations (#8879)

* Update Swedish.properties (#8878)

Small update swedish translation

* Update French.properties (#8875)

* Update Polish.properties (#8874)

* Update Bulgarian.properties (#8873)

* Update Spanish.properties (#8870)

* Update Czech.properties (#8868)

* Update Czech.properties

* Update Czech.properties

* Update Ukrainian.properties (#8869)

* Update Ukrainian.properties

* Update Ukrainian.properties

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Mr-Bajs <93934125+Mr-Bajs@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: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
 2023-03-13 17:12:54 +02:00
SomeTroglodyte
db08c30363
Make City center minimum tile yields moddable (#8804) 
* Slight cleanup of TileStatFunctions

* Make City center minimum tile yields moddable

* Make City center minimum tile yields moddable - patch1

* Make City center minimum tile yields moddable - patch1
 2023-03-13 17:02:08 +02:00
Yair Morgenstern
9eee47a628 Resolved #8880 - deprecated old barb camp serialzation 2023-03-13 16:59:09 +02:00
Yair Morgenstern
cd8b68253b All units can be automated 
Modders can choose which units get it as a primary action
 2023-03-13 16:55:50 +02:00
SomeTroglodyte
10caf8e93e
Key bindings Step 2 (#8872) 
* Configurable key bindings - Enable via Hidden debug-option

* Configurable key bindings - better Help

* Configurable key bindings - better Widget step 1
 2023-03-12 22:45:06 +02:00
WhoIsJohannes
f4dca2281e
Add Replay feature in VictoryScreen (#8844) 
* Add Replay feature in VictoryScreen.

* Add Replay feature in VictoryScreen.

* Support for i18n

* Extract year to text conversion into common util to be used from VictoryScreen.kt and WorldScreenTopBar.kt

* Remove ReplayMapTile and modify MinimapTile so that it can support both use cases.

* Reuse code for spreading out tiles onto tile layer between Minimap and ReplayMap by factoring it out into a new MinimapTileUtil

* Revert "Reuse code for spreading out tiles onto tile layer between Minimap and ReplayMap by factoring it out into a new MinimapTileUtil"

This reverts commit d4cddb4312.

* Add Replay feature in VictoryScreen.

* Add Replay feature in VictoryScreen.

* Support for i18n

* Extract year to text conversion into common util to be used from VictoryScreen.kt and WorldScreenTopBar.kt

* Remove ReplayMapTile and modify MinimapTile so that it can support both use cases.

* Revert some unintentional indentation changes

* Refactor some common logic of Minimap and ReplayMap into MinimapTileUtil

* Slightly increase ReplayMap size and simplify logic to calculate tile size since input is static.

* Indentation again... :|

* Unify isCityCenter & isCapital into an enum in TileHistory and shorten identifiers

* Use city.getTiles() instead of city.tiles in CityInfoConquestFunctions.kt

* Improve tileSize calculation in ReplayMap.kt

* Remove extra padding in VictoryScreen -> Replay to prevent WorldScreenTopBar from acting up on the next turn.

* Make return value of MinimapTileUtil.spreadOutMinimapTiles more useful to callers

* Cancel Replay timer when VictoryScreen is disposed or when Replay is opened again.

* Cancel replay map timer task whenever tab is switched in VictoryScreen

* Improve serialization for TileHistory by using a custom serializer. This removes the need for holding two copies of the same thing and to use String based keys.

* Add backwards compatibility for replay. The replay will start at the turn where it came into play.

* Remove debugging code :|

* Use gameInfo field rather than going throug the global UncivGame...
 2023-03-12 19:59:48 +02:00
Yair Morgenstern
680da3232f Matrix build and deploy *only* for tags 2023-03-11 21:39:51 +02:00
Yair Morgenstern
bebdc46af9 Fix job dependencies 2023-03-11 21:35:00 +02:00
Yair Morgenstern
25717d6507 Better workflow - Android build parallel to JAR 2023-03-11 21:33:24 +02:00
Yair Morgenstern
2d54c56c7b Resolved #8863 - Deprecated GameSettings.resolution 2023-03-11 21:13:23 +02:00
Yair Morgenstern
7ffc1e4eeb Separate large multiplatform tests to be performed once per release, and regular tests for PRs and pushes 2023-03-11 21:01:26 +02:00
Yair Morgenstern
22da4b29c8 4.5.6 2023-03-11 20:37:35 +02:00
Yair Morgenstern
42778b6d1c
Version rollout (#8867) 
* Bump version and create initial changelog entry

* Update Belarusian.properties (#8858)

* Update Hungarian.properties (#8855)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update German translation (#8853)

* Update German translation

* Update German translation

* Updated Brazilian_Portuguese.properties (#8852)

* Update Polish.properties (#8851)

* Update Italian.properties (#8849)

* Update Ukrainian.properties (#8848)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update french translations. (#8847)

* Complete missing translation.

* Update French.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MonoDx <87523240+monodevx@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: HydrolienF <71718798+HydrolienF@users.noreply.github.com>
 2023-03-11 20:29:00 +02:00
SomeTroglodyte
a547acbf4e
Debug option to paint coords on map tiles (#8818) 
* Debug option to paint coords on map tiles

* Debug option to paint coords on map tiles - rename flag
 2023-03-11 20:12:38 +02:00
SomeTroglodyte
793d3387bf
Custom key bindings (#8802) 
* Configurable key bindings - linting

* Configurable key bindings - move keyboardAvailable

* Configurable key bindings - separate KeyShortcutDispatcher

* Configurable key bindings - framework

* Configurable key bindings - save and load

* Configurable key bindings - activation

* Configurable key bindings - UI

* Configurable key bindings - more linting

* Configurable key bindings - Separate SettingsSelect

* Configurable key bindings - translation tested

* Configurable key bindings - disclaimer

* Configurable key bindings - disclaimer
 2023-03-11 20:12:00 +02:00
SomeTroglodyte
b7a8cd7620
Fix possible crash involving right-click attack (#8859) 2023-03-11 20:05:25 +02:00
SomeTroglodyte
de12f671a5
Improve completeness and consistency of Technology descriptions (#8860) 2023-03-11 20:04:12 +02:00
SomeTroglodyte
2f00aa2af1
Comments only - TileInfo to Tile (#8861) 
(the two in UniqueParameterType are actually useful links during code review)
 2023-03-11 20:03:08 +02:00
letstalkaboutdune
3826a4b7c3
AbsoluteUnits - Great Prophet, Settler (Industrial Era) (#8856) 
Also fixed the shadows on numerous vehicle units.
 2023-03-10 10:09:34 +02:00
SomeTroglodyte
488257387c
Fix city desert tiles with Petra selectable (#8854) 2023-03-09 19:34:33 +02:00
Yair Morgenstern
482aed4fdc "build and deploy" only activates on tag 2023-03-08 16:58:30 +02:00
Crsi
5e88dbd7a1
Extended CI with various extra tests, added Java 17 support in unit tests (fixes #8835) (#8839) 
* Added a pure build stage with various versions

* Added build artifacts from GitHub CI

* Upgrade mocking and testing libraries

* Extended GitHub CI test stages, added Windows tests

* Fixed job name

* Split some jobs for increased speed due to better parallelism
 2023-03-08 16:39:32 +02:00
Yair Morgenstern
a4339ff783 Everyone needs build 2023-03-08 12:29:33 +02:00
Yair Morgenstern
a5f2ffe29b AUR *also* needs build, for the tag and release notes 2023-03-08 12:26:43 +02:00
Yair Morgenstern
d0e4271990 AUR dependant on Github release upload 2023-03-08 12:24:25 +02:00
Yair Morgenstern
8b3e84481c AUR dependant on Github version upload 2023-03-08 12:22:40 +02:00
Yair Morgenstern
030038c585 Even if aab not uploaded, keep going and uploda the APK 2023-03-08 12:16:34 +02:00
Yair Morgenstern
9ebe1370b5 Cleaned up task 'on release' restrictions to be on job level 2023-03-08 12:11:38 +02:00
Yair Morgenstern
cd40aa7653 4.5.5 
Fix AUR workflow
 2023-03-08 12:06:54 +02:00
Yair Morgenstern
3e43e03e43 4.5.5 2023-03-08 11:31:28 +02:00