mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-10 15:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
NaN Commits 5 Branches 1,094 Tags
cd8b68253b847f42d818f5d42f75bfbda45e96f9
Commit Graph

3054 Commits

Author SHA1 Message Date
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
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
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
Yair Morgenstern
3e43e03e43 4.5.5 2023-03-08 11:31:28 +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
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
d3c084f89f Added 'additional times' to limited actions 2023-03-05 20:03:54 +02:00
Yair Morgenstern
2526a7f835 4.5.4 2023-03-05 19:07:19 +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
Ouaz
2175eefcb2 Make "Borderless" display option translatable (#8814) 2023-03-05 09:29:10 +02:00
Yair Morgenstern
911c9ef3c2 4.5.3 2023-03-04 21:08:02 +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
MonoDx
8b61e33cf2 I would to maintain bel lang. (#8801) 
Created by monodx.
 2023-03-04 20:50:27 +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
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
608e0dfb71 Added limited usage for actions! 2023-03-03 14:47:50 +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
Yair Morgenstern
a1453a8b37 chore: Added explicit unit consumption to Settlers' Found City unique 2023-03-02 22:07:34 +02:00
Yair Morgenstern
3e4edaff8a 4.5.2 2023-03-01 21:30:53 +02:00
Yair Morgenstern
0a4066f9c4 Version rollout (#8780) 
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8775)

* Update French.properties (#8774)

* Update Polish.properties (#8772)

* Update Bulgarian.properties (#8771)

* Added some Bulgarian translations

* Removed unnecessary comments

When adding the translations, I forgot to remove some "# Requires translation!" comments

* Update Bulgarian.properties

* Update Ukrainian.properties (#8768)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update German translation (#8767)

* Update German translation

* Update German translation

* Update Italian.properties (#8765)

---------

Co-authored-by: yairm210 <yairm210@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: 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: mape6 <mape6@posteo.de>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-03-01 21:21:42 +02:00
Leonard Günther
50da1ee90a Fixed wrong implementation of Basic auth (#8779) 
* Fixed wrong implementation of Basic auth

+ added min length for passwords

* Fixed basic auth being compressed

+ added function to get auth header from settings
 2023-03-01 21:12:12 +02:00
Yair Morgenstern
5e85c3ca72 "by consuming this unit" is better 2023-03-01 16:35:06 +02:00
Yair Morgenstern
ae501c3750 'create improvement' action, <consuming this unit> and <as an action> modifiers 2023-03-01 16:09:44 +02:00
AdityaMH
81c4057488 Fix missing desert for flood plains in hexarealm tileset (#8776) 
* Fix missing desert for flood plains in hexarealm tileset

* fix typo
 2023-02-28 18:56:44 +02:00
Yair Morgenstern
51ef8c3ccf 4.5.1 2023-02-27 11:26:48 +02:00
Yair Morgenstern
36ea383c2f Version rollout (#8764) 
* Bump version and create initial changelog entry

* Update French.properties (#8761)

* Update Italian.properties (#8757)

* Added some bulgarian translations (#8756)

* Added some Bulgarian translations

* Removed unnecessary comments

When adding the translations, I forgot to remove some "# Requires translation!" comments

* Update Catalan.properties (#8754)

* Update Polish.properties (#8752)

* Update Polish.properties

* Update Polish.properties

* Update Brazilian_Portuguese.properties (#8750)

* Update Spanish.properties (#8749)

---------

Co-authored-by: yairm210 <yairm210@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: vynaaa <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.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: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2023-02-27 11:24:31 +02:00
Yair Morgenstern
44399e770c Added triggered uniques to grant specific tech / policy 2023-02-27 10:58:08 +02:00
Yair Morgenstern
ad9942c532 4.5.0 2023-02-25 21:03:52 +02:00
Yair Morgenstern
b6942abbd9 Version rollout (#8746) 
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8745)

* Update French.properties (#8743)

* Update Catalan.properties (#8742)

* Update Italian.properties (#8740)

* Update Spanish.properties (#8735)

---------

Co-authored-by: yairm210 <yairm210@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: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2023-02-25 20:54:41 +02:00
Leonard Günther
a3f511efd2 Added password authentication as server feature (#8716) 
* Added authenticate and setPassword

* Added AuthPopup

* Added auth endpoint to UncivServer

* Fixed merge confict

* Added close button to AuthPopup

+ Fixed crash if no server is available

* Added entries to template properties

* Fixed setting password does not work

if authentication is required

+ Added server check on game startup in case the server has changed its feature set

* Added support for different passwords

on different servers

+ Cleanup for MultiplayerTab

* Added current password as hint

+ removed character hiding in auth popup
+ added popup to indicate auth success on connection check
 2023-02-25 20:42:36 +02:00
SomeTroglodyte
5d80f50d93 Show UnitTypes in Civilopedia (#8729) 
* Show UnitTypes in Civilopedia

* Show UnitTypes in Civilopedia - polish
 2023-02-25 20:40:59 +02:00
Yair Morgenstern
3278cbc904 4.4.19 2023-02-23 23:11:30 +02:00
Yair Morgenstern
1eba9bb4d9 Version rollout (#8732) 
* Bump version and create initial changelog entry

* Update French.properties (#8726)

* Update Italian.properties (#8722)

* Updated Brazilian_Portuguese.properties (#8720)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update Spanish.properties (#8719)

---------

Co-authored-by: yairm210 <yairm210@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>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2023-02-23 23:05:16 +02:00
Yair Morgenstern
980dc6b6c8 4.4.18 2023-02-21 23:55:12 +02:00
Yair Morgenstern
cb8d75d23b Version rollout (#8718) 
* Bump version and create initial changelog entry

* Update French.properties (#8714)

* Update Ukrainian.properties (#8712)

* Update Italian.properties (#8710)

* Update German translation (#8709)

* Update German translation

* Update German translation

* Update German translation

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
 2023-02-21 23:24:03 +02:00
Yair Morgenstern
2530039c80 Civilopedia entry for policy links to units and buildings that it enables/disables 2023-02-20 13:34:59 +02:00
Yair Morgenstern
985867ed95 4.4.17 2023-02-20 09:01:17 +02:00
Yair Morgenstern
a4ab0f7f16 Version rollout (#8708) 
* Bump version and create initial changelog entry

* Update French.properties (#8703)

* Update Spanish.properties (#8698)

* Updated Brazilian_Portuguese.properties (#8697)

* Update Ukrainian.properties (#8696)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Hungarian.properties (#8695)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
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: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
 2023-02-20 08:44:49 +02:00
Yair Morgenstern
0b5ded98c9 chore: diplomatic modifier text auto-translated 2023-02-19 11:20:19 +02:00
Yair Morgenstern
ccec56e2c7 4.4.16 2023-02-18 20:38:37 +02:00
Yair Morgenstern
a244c4f50d Version rollout (#8694) 
* Bump version and create initial changelog entry

* Update Hungarian.properties (#8692)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Polish.properties (#8691)

* Update Simplified_Chinese.properties (#8690)

* Minor corrections to translations (#8688)

* Minor corrections

* Additional translations

* Original known translation of the quota

* Update Ukrainian.properties (#8685)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update French.properties (#8683)

* Update French.properties

* Update French.properties

* Update Spanish.properties (#8680)

* Update Spanish.properties

* Update Spanish.properties

* #8679

* Updated Brazilian_Portuguese.properties (#8678)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@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: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2023-02-18 20:21:07 +02:00
Yair Morgenstern
bfaae54890 Mod sizes larger than 2 MB are displayed in MB 2023-02-18 19:25:07 +02:00
vegeta1k95
01204f5aee Desktop: world camera autoscroll, selectable window mode (#8679) 
* Desktop: world camera autoscroll, selectable window mode

* Map auto-scroll is optional

* Fix option update, more scroll speed

* Fix translation

---------

Co-authored-by: vegeta1k95 <vfylfhby>
 2023-02-17 02:12:32 +02:00
Gualdimar
7114a67d2c Pending trades (#8681) 
* Added pending trade offers to the trade overview screen

* Fixed offer trade button state

* Fixed space

* Small fixes
 2023-02-17 00:46:21 +02:00
Yair Morgenstern
6a70026fee 4.4.15 2023-02-14 22:21:26 +02:00