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,704 Commits 7 Branches 1,036 Tags 1.1 GiB
4f30d27d0b
Commit Graph

3833 Commits

Author SHA1 Message Date
SomeTroglodyte
4f30d27d0b
Notifications can be "selected" (#9182) 
* Allow "selecting" notifications

* NotificationsScroll remembers position relative to topRight

* NotificationsScroll tries to scroll selection into view

* Fix notification selection and scroll-into-view

* User option to control enlarging selected notifications

* Post-merge missed changes

* Move, flip and reword "Enlarge" option
 2023-04-16 21:20:56 +03:00
Yair Morgenstern
ab1d823477 4.6.2 2023-04-16 15:01:43 +03:00
Yair Morgenstern
4c6c6e91fd
Version rollout (#9199) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9195)

* Update Turkish.properties (#9193)

* Update Spanish.properties (#9192)

* Update French.properties (#9190)

* Update Hungarian.properties (#9187)

* Update Polish.properties (#9180)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Enesb852 <130827350+Enesb852@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: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-04-16 14:52:41 +03:00
SomeTroglodyte
90cac15c7f
Fix more leaks of the actual Player count in random mode (#9196) 2023-04-16 14:20:08 +03:00
Ouaz
d15d8b0bf1
Make new "Charts" button translatable (#9191) 2023-04-15 21:03:35 +03:00
Yair Morgenstern
bc5e486b20 Resolves #9186 
Atilla's Court -> Attila's Court, Guten tag -> Guten Tag
 2023-04-15 21:00:17 +03:00
Yair Morgenstern
2ce145be1e
Version rollout (#9179) 
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9170)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Hungarian.properties (#9161)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#9160)

* update Simplified_Chinese translation (#9159)

Co-authored-by: chr_56 <_>

* Update Ukrainian.properties (#9153)

* Update French.properties (#9152)

* Update Czech.properties (#9151)

translated some of the yet untranslated texts

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@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: brmaku <46785630+brmaku@users.noreply.github.com>
 2023-04-13 16:20:25 +03:00
WhoIsJohannes
193114078b
Show a highlight for the tile that seems most suitable to found a cit… (#9099) 
* Show a highlight for the tile that seems most suitable to found a city (can be turned off in settings)

* Don't allow players to cheat through highlighting suggested map tiles for city founding.

* Don't pass whether cheating is allowed, but just decide based on whether civ is AI or not. That way it will also work correctly for automated settlers (by human players). Also show it in the first round, because why not. If the map generator puts us on a shitty starting tile, why not tell the player?

* Address comments

* Address comments
 2023-04-13 15:43:46 +03:00
Yair Morgenstern
19b243abfe 'Display' options organized into subcatagories - kudos @Ouaz 2023-04-11 11:28:24 +03:00
Ouaz
bc9f75d6e4
Make new "notifications" option translatable (#9154) 2023-04-11 11:07:25 +03:00
letstalkaboutdune
f31d2a9a2a
AbsoluteUnits - Turtle Ship, Ship of the Line, Sea Beggar (#9165) 2023-04-11 07:55:31 +03:00
Yair Morgenstern
a363edaa6a 4.6.0 2023-04-09 18:15:53 +03:00
Vitor Gabriel
974d27667b
Updated Brazilian_Portuguese.properties (#9150) 2023-04-09 18:14:03 +03:00
Yair Morgenstern
52f288be05
Version rollout (#9149) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9145)

* Update Italian.properties (#9143)

* Update Spanish.properties (#9142)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.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-04-09 18:07:03 +03:00
Yair Morgenstern
adb51d9264
Resource stockpiles! (#9147) 
* Resource stockpiles!

* toString extension including sign (+/-)

* Trigger uniques to provide/consume stockpiled resources

* Fixed build

* Display 'per turn' for stockpiled resources that are consumed per turn

* "Costs [amount] [resource]" works!

* Stockpile unique costs are displayed in construction button

* Added unique to prevert certain resources from being traded
 2023-04-09 18:01:26 +03:00
Yair Morgenstern
7748ef42ab 4.5.17 2023-04-08 22:16:35 +03:00
Yair Morgenstern
d339de1929
Version rollout (#9139) 
* Bump version and create initial changelog entry

* Added 112 dutch translations (#9131)

* Update Polish.properties (#9129)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Hungarian.properties (#9107)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#9102)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Abe van der Wielen <abevanderwielen@gmail.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-04-08 22:09:54 +03:00
SomeTroglodyte
6b084f0e6b
Victory screen score charts (#9121) 
* VictoryScreen with Charts by WhoIsJohannes

* VictoryScreen with Charts by WhoIsJohannes - atlas

* VictoryScreen with Charts by WhoIsJohannes - lost icon attribution
 2023-04-08 21:38:27 +03:00
letstalkaboutdune
735a0f6f40
AbsoluteUnits - Mandekalu Cavalry, Conquistador, Inquisitor (Post-Industrial) (#9115) 2023-04-04 22:06:39 +03:00
AdityaMH
ad080b4dc6
Fix missing desert (again) in wheat farm in flood plains in hexarealm (#9113) 
* Fix missing desert for flood plains in hexarealm tileset

* fix typo

* Fix missing desert (again) in wheat farm in flood plains
 2023-04-04 16:42:32 +03:00
SomeTroglodyte
4c88fbb996
Change map resource controls presentation (#9104) 2023-04-04 10:52:42 +03:00
SomeTroglodyte
cd4e25a4f1
Victory screen reorg/cleanup (#9111) 
* VictoryScreen reorg

* VictoryScreen reorg - use TabbedPager

* VictoryScreen reorg - make helpers reusable

* VictoryScreen reorg - fixed headers

* VictoryScreen reorg - debug access to Replay

* Victories reorg - more cleanup

* VictoryScreen reorg - icons and keys

* VictoryScreen reorg - RankingType

* VictoryScreen reorg - RecreateOnResize

* VictoryScreen reorg - Avoid floating text overlapping buttons

* VictoryScreen reorg - remove obsolete todo
 2023-04-04 10:49:58 +03:00
Yair Morgenstern
3c595c8952 4.5.16 2023-04-03 14:56:28 +03:00
Yair Morgenstern
35d5b8c43c
Version rollout (#9100) 
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9094)

* Update Ukrainian.properties (#9093)

* Update Catalan.properties (#9090)

* Update Spanish.properties (#9088)

All tutorial page text

* Update Hungarian.properties (#9084)

* 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

* Update Simplified_Chinese.properties (#9083)

- add more translation

* Update French.properties (#9082)

* Update Turkish.properties (#9081)

Add and revise translations

* Update Bulgarian.properties (#9080)

---------

Co-authored-by: yairm210 <yairm210@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: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Tim <2884320+tim-hub@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
 2023-04-03 14:53:35 +03:00
SomeTroglodyte
a4c4c5f93e
Music player controls (#9087) 
* Music controls cleanup

* Music controls cleanup - assets

* Music controls cleanup - fix incorrect attribution
 2023-04-01 22:06:46 +03:00
Yair Morgenstern
36b90075da 4.5.15 2023-03-31 16:17:52 +03:00
Yair Morgenstern
9f521895aa
Version rollout (#9079) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9078)

- for screen orientation part translation
- and a few due-to missed translation
- and borderless

* Update Ukrainian.properties (#9076)

* Update Hungarian.properties (#9074)

* Update Indonesian.properties (#9071)

* Update Indonesian.properties

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Tim <2884320+tim-hub@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: kensvin <kensvin28@gmail.com>
 2023-03-31 15:52:29 +03:00
SomeTroglodyte
45d66f0580
Civilopedia Welcome, moddable (#8940) 2023-03-31 14:58:07 +03:00
Yair Morgenstern
6a153f61dd 4.5.14 2023-03-29 12:21:57 +03:00
Yair Morgenstern
223494fa52
Version rollout (#9069) 
* Bump version and create initial changelog entry

* Update for Russian localization (#9068)

Translation for most of lines of text. There are some left as it's impossible to translate those correctly without context, which is not provided in a nice way, so only way to understand their meaning is finding them in-game (Which I couldn't do, unfortunately.)

* Update Spanish.properties (#9066)

* Update Filipino.properties (#9062)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#9061)

* Update Brazilian_Portuguese.properties (#9060)

* Update Bulgarian.properties (#9053)

* Update German translation (#9049)

* Update French.properties (#9046)

* Fixed russian translation errors

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Alex <64156241+Alex-1000@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.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: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2023-03-29 12:19:57 +03:00
letstalkaboutdune
f32bf4a7a4
AbsoluteUnits - Hwach'a, Camel Archer (#9063) 2023-03-29 07:39:12 +03:00
Yair Morgenstern
837833e450 4.5.13 2023-03-26 21:55:23 +03:00
Yair Morgenstern
3047335db1
Version rollout (#9041) 
* Bump version and create initial changelog entry

* Update Hungarian.properties (#9028)

* Update Hungarian.properties

* Update Hungarian.properties

* Update French.properties (#9024)

* Updated Brazilian_Portuguese.properties (#9022)

* Update Spanish.properties (#9021)

* Update Spanish.properties

Mini update

* Update Spanish.properties

* Update German translation (#9019)

* Update Polish.properties (#9017)

* Update Filipino.properties (#9015)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#9012)

* Update Dutch.properties (#9010)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: dutchwolfgirl <110766475+dutchwolfgirl@users.noreply.github.com>
 2023-03-26 21:50:15 +03:00
Yair Morgenstern
7bc28c4588 Returned Perlin map type 2023-03-25 21:58:10 +03:00
SomeTroglodyte
90c295dc1c
Map scroll speed (#8958) 
* Allow mouse panning in map editor too

* User control over map panning speed

* User control over map panning speed - german
 2023-03-23 23:58:18 +02:00
Yair Morgenstern
df879b1c02 4.5.12 2023-03-23 22:05:00 +02:00
Yair Morgenstern
4d573b627c
Version rollout (#9009) 
* Bump version and create initial changelog entry

* Update Dutch.properties (#9006)

* Update Hungarian.properties (#9000)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Spanish.properties (#8999)

* Update French.properties (#8997)

* Update Italian.properties (#8988)

* Update Polish.properties (#8987)

* Updated Brazilian_Portuguese.properties (#8984)

* Update German translation (#8983)

* Update Ukrainian.properties (#8982)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: dutchwolfgirl <110766475+dutchwolfgirl@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
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: 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>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
 2023-03-23 21:58:56 +02:00
Gualdimar
51f37af1a2
Improvements in science display (#8990) 
* Displaying science overflow

* The amount of science from research agreement notification

* Check tech progress at the start of a turn

* Fixed exception

* Better remainingScienceToTech calculation

* Multiple technologies can be researched in one turn

* Small improvements
 2023-03-22 21:59:35 +02:00
letstalkaboutdune
d24d8b3d84
AbsoluteUnits - Landsknecht, Knight_v2, Missionary (post-Industrial) (#8993) 2023-03-22 10:20:24 +02:00
Yair Morgenstern
4c694be94b 4.5.11 2023-03-21 14:51:53 +02:00
Yair Morgenstern
af333b214a
Version rollout (#8981) 
* Bump version and create initial changelog entry

* Minor swedish update (#8978)

* Minor swedish update

* Update Swedish.properties

* Update Ukrainian.properties (#8975)

* Update Belarusian.properties (#8972)

Edited by MonoDx

* Update Spanish.properties (#8969)

* Update Hungarian.properties (#8965)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Mr-Bajs <93934125+Mr-Bajs@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: MonoDx <87523240+monodevx@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
 2023-03-21 14:47:03 +02:00
SomeTroglodyte
ba15c9c91f
Key binding simpler widget (#8946) 
* Keyboard Bindings: Simpler Widget

* Keyboard Bindings: Reset binding

* Keyboard Bindings: Reset binding - patch

* Keyboard Bindings: Simpler Widget - revert opening feature

* Keyboard Bindings: Simpler Widget - improved
 2023-03-21 14:08:03 +02:00
Yair Morgenstern
f66076c2a4 4.5.10 2023-03-19 19:00:26 +02:00
Yair Morgenstern
3768932b93
Version rollout (#8963) 
* Bump version and create initial changelog entry

* Update Bulgarian.properties (#8955)

* Update Japanese translation (#8950)

* tutorial

* small addition

* Update Filipino.properties (#8949)

* Update Filipino.properties

* Update Filipino.properties

* Update Hungarian.properties (#8943)

* 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 French.properties (#8942)

* Update Polish.properties (#8941)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Italian.properties (#8939)

* Update German translation (#8937)

* Update Ukrainian.properties (#8936)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Updated Brazilian_Portuguese.properties (#8934)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Ouaz <Ouaz@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: mape6 <mape6@posteo.de>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2023-03-19 18:55:54 +02:00
Yair Morgenstern
c3b8eaa6d2 4.5.9 2023-03-16 22:59:52 +02:00
Yair Morgenstern
26e292ab11
Version rollout (#8930) 
* Bump version and create initial changelog entry

* Update Polish.properties (#8922)

* Update Spanish.properties (#8918)

* Update French.properties (#8916)

* Update Hungarian.properties (#8915)

* Update Ukrainian.properties (#8914)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Italian.properties (#8913)

* Updated Brazilian_Portuguese.properties (#8911)

* Update Filipino.properties (#8910)

* Update German translation (#8909)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@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: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Gualdimar <Gualdimar@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: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: mape6 <mape6@posteo.de>
 2023-03-16 22:53:35 +02:00
SomeTroglodyte
5a58d8c39c
Harden and improve "Download Mod from Url" parser (#8924) 2023-03-16 22:43:16 +02:00
Gualdimar
ba63f9a62b
Fixed the positioning of popups after changing the screen orientation on Android (#8927) 2023-03-16 20:48:24 +02:00
Gualdimar
5ee3df96c8
Trade ending notification (#8925) 
* Notification of the end of a trade in 3 and 1 turns

* Notification about the loss of an alliance is not shown if the city state is captured.

* Shortened
 2023-03-16 14:30:12 +02:00
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