mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 01:08:25 +07:00
Code Issues Packages Projects Releases Wiki Activity
NaN Commits 5 Branches 1,095 Tags
aab975a61bb505a9a0ebd8596b7ac23bfc53792a
Commit Graph

5656 Commits

Author SHA1 Message Date
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
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
2d54c56c7b Resolved #8863 - Deprecated GameSettings.resolution 2023-03-11 21:13:23 +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
SomeTroglodyte
488257387c Fix city desert tiles with Petra selectable (#8854) 2023-03-09 19:34:33 +02:00
Yair Morgenstern
67bfd6c4e5 Version rollout (#8846) 
* Bump version and create initial changelog entry

* update Belarusian.properties (#8843)

* Update Brazilian_Portuguese.properties (#8842)

* Update Spanish.properties (#8838)

* Update Polish.properties (#8837)

* Update Ukrainian.properties (#8833)

* Update French.properties (#8832)

* Update Bulgarian.properties (#8831)

* Update Italian.properties (#8829)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MonoDx <87523240+monodevx@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@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: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-03-08 11:28:17 +02:00
Gualdimar
6d72c7b85f Dynamic minimap (#8794) 
* Dynamic minimap

* Fixed minimap size

* Fix for rectangular maps

* Fix minimap for spectator

* Proper fix for spectator

* Resizing the game window no longer breaks the minimap

* Implemented the camera rectangle + Explored region more accurate positioning

* ExploredRectangle is calculated only after expanding the region
 2023-03-08 11:25:13 +02:00
vegeta1k95
b57232c992 Android: selectable orientation (#8822) 
* Android: selectable orientation

* Fix visible rectangle bug, fix auto-rotate behaviour, add translations

* Fix translation

---------

Co-authored-by: vegeta1k95 <vfylfhby>
 2023-03-06 10:35:14 +02:00
Yair Morgenstern
41ee20efc5 Better AI evaluation of which improvement to build on a tile 2023-03-05 22:47:49 +02:00
Yair Morgenstern
7025bbb94a chore: convert 'provides resources' to separate function 2023-03-05 22:29:45 +02:00
Yair Morgenstern
d3c084f89f Added 'additional times' to limited actions 2023-03-05 20:03:54 +02:00
Yair Morgenstern
35f33cd373 Version rollout (#8827) 
* Bump version and create initial changelog entry

* Update Polish.properties (#8825)

* update Simplified_Chinese translation (#8821)

Co-authored-by: chr_56 <_>

* Update Filipino.properties (#8820)

* Update Filipino.properties

* Update Filipino.properties

* Update Brazilian_Portuguese.properties (#8819)

* Update French.properties (#8813)

* Update Hungarian.properties (#8812)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Ukrainian.properties (#8810)

* Update Ukrainian.properties

* Update Ukrainian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
 2023-03-05 19:03:58 +02:00
Gualdimar
38839d2c9c Fix ExploredRegion rectangular maps support + Zoomout flicker prevention reworked (#8826) 
* Fix ExploredRegion rectangular maps support + Increased zoom padding

* Flicker prevention reworked
 2023-03-05 18:58:33 +02:00
Yair Morgenstern
ce2f128260 Fixed endless loop for mod checker 2023-03-05 14:19:20 +02:00
Yair Morgenstern
8c24926476 Modding: global alert available as triggerable for all objects 2023-03-05 12:53:02 +02:00
Yair Morgenstern
c049721531 Better order of unit actions 2023-03-05 11:03:58 +02:00
Yair Morgenstern
cc8bfa605f Resolves #8630 - can only purchase units when not disabled by setting or otherwise 2023-03-05 10:59:36 +02:00
Yair Morgenstern
e15167d92e Resolved #8815 - action texts properly translated. 2023-03-05 09:50:49 +02:00
SomeTroglodyte
5d87f82a6e Belarusian Locale for better sorting (#8816) 2023-03-05 09:28:48 +02:00
Yair Morgenstern
146ad7481e Fixed flanking bonus calculation when attacking unit is not adjacent to enemy 2023-03-05 08:53:27 +02:00
Yair Morgenstern
006bcac7fd Resolve #8733 - don't remove Forest tiles for Camp improvements 2023-03-04 23:10:58 +02:00
Yair Morgenstern
b921898217 Version rollout (#8809) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8805)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Catalan.properties (#8803)

* Update Catalan.properties

* Update Catalan.properties

* Update Japanese translation (#8799)

* Update Japanese translation

* fix

* Update German translation (#8798)

* Update Filipino.properties (#8797)

* Update Polish.properties (#8792)

* Update Polish.properties

* Update Polish.properties

* Update Bulgarian.properties (#8791)

* Update Ukrainian.properties (#8788)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Spanish.properties (#8784)

* Update French.properties (#8783)

* Update Italian.properties (#8782)

* Updated Brazilian_Portuguese.properties (#8781)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.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: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@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: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2023-03-04 21:02:02 +02:00
Yair Morgenstern
ae4d226027 Solved 'cannot start game' errors - 'always true' conditionals do not affect 'getMatchingUniques' 2023-03-04 20:46:05 +02:00
vegeta1k95
f55e010451 Android: "Screen Mode" option (#8785) 
* Android: "Screen Mode" option

* Fix broken tests, code cleanup

* Fix broken tests, code cleanup

* Fix broken tests, code cleanup

---------

Co-authored-by: vegeta1k95 <vfylfhby>
 2023-03-04 19:22:09 +02:00
SomeTroglodyte
c40b6159df Better Religion info and some moddability (#8807) 
* Make maximum number of religions moddable

* Explain remaining religion count in Empire Overview
 2023-03-04 19:20:23 +02:00
SomeTroglodyte
5e61b0d313 Diplomacy trade layout fix (#8808) 
* Diplomacy and Trade - Linting

* Diplomacy and Trade - Fix gradual layout deterioration
 2023-03-04 19:19:24 +02:00
Yair Morgenstern
253c669ba9 Added 'after which this unit is consumed' for units whose only purpose is limited actions 2023-03-03 16:37:11 +02:00
SomeTroglodyte
29982eba9e Show terrain overriding yields in Civilopedia (#8796) 2023-03-03 16:07:42 +02:00
Yair Morgenstern
458d35026c Added 'once' unit action modifier, effectively equal to '[1] times' 2023-03-03 15:29:14 +02:00
Yair Morgenstern
608e0dfb71 Added limited usage for actions! 2023-03-03 14:47:50 +02:00
Yair Morgenstern
fc22f0900b chore: renames 2023-03-03 14:21:43 +02:00
Yair Morgenstern
c3a4a18bba Replace unit action for timed golden ages with a generic triggered unique 
Triggered uniques display side effects
 2023-03-03 14:13:00 +02:00