mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-01 02:14:51 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,721 Commits 6 Branches 1,045 Tags 1.2 GiB
4da4d35a28
Commit Graph

5838 Commits

Author SHA1 Message Date
Yair Morgenstern
4da4d35a28 Resolved #9194 - Clear frameBuffer before we use it to draw images 2023-04-18 23:09:33 +03:00
Yair Morgenstern
35fbb5f9f3 Resolved #9221 - removed icons from selectboxes 2023-04-18 23:00:16 +03:00
WhoIsJohannes
9ba5497ce4
Show replay after 5 rounds and don't reveal where player is on the map. (#9216) 2023-04-18 01:11:31 +03:00
SomeTroglodyte
92ad0495f2
I'm pretty sure annexed cities in resistance shouldn't be allowed to buy tiles (#9213) 2023-04-17 21:42:37 +03:00
Yair Morgenstern
dbc9b0d0bd 4.6.3-patch1 2023-04-17 21:04:20 +03:00
Yair Morgenstern
958318e53b Patch fix for crash, from Discord - @WhoIsJohannes 2023-04-17 21:04:20 +03:00
WhoIsJohannes
4eea7984f7
LineChart improvements (Highlight & DP) (#9210) 
* LineChart improvements (Highlight & DP)

* Fix civ icon at end of line not showing.
 2023-04-17 18:56:22 +03:00
Yair Morgenstern
0eda518bf9 Whoops a movement change got in when it shouldn't have 2023-04-17 13:50:44 +03:00
Yair Morgenstern
844b0a15d1 4.6.3 2023-04-17 09:36:45 +03:00
Yair Morgenstern
699a6bf12a Removed double icons 2023-04-17 09:33:31 +03:00
Yair Morgenstern
0bf5cae401 Solved RAM crashes hopefully :) 2023-04-17 09:33:31 +03:00
Yair Morgenstern
e313f00f6d
Version rollout (#9208) 
* Bump version and create initial changelog entry

* Update French.properties (#9201)

* Translate Simplified_Chinese.properties (#9200)

4.6.2 Basic Translate

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: YaoSiQian <2229561981@qq.com>
 2023-04-17 09:33:26 +03:00
Yair Morgenstern
eabb91b0d8 Aircraft attack/move range colors entire tile 2023-04-17 08:37:02 +03:00
WhoIsJohannes
ccf37af468
Show garrison in city screen, so that it's easier to decide whether one should produce a military unit. (#9202) 2023-04-17 08:20:18 +03:00
WhoIsJohannes
d25804ffb5
Great people automation (#9125) 
* Add automation for great scientist & merchant

* Automate great people (great merchant, great engineer & great scientist).

* Address comments

* Rename method for consistency

* Resolve comments
 2023-04-17 08:19:55 +03:00
WhoIsJohannes
b9a7925285
Order defeated civs after alive civs even if the alive civs score is negative (e.g. for happiness) (#9203) 2023-04-17 07:38:43 +03:00
WhoIsJohannes
dbb46545f5
Fix golden age length action text (#9204) 
Thanks SomeTroglodyte (https://github.com/yairm210/Unciv/issues/9166#issuecomment-1503593954)
 2023-04-17 07:37:56 +03:00
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
Yair Morgenstern
2586e59638 Hide icons in game file names - see #9194 2023-04-16 14:48:58 +03:00
Yair Morgenstern
eb79e77a26 Removed icons from city names, removed icons from notifications for performance reasons 2023-04-16 14:43:34 +03:00
Yair Morgenstern
a81dd03fcf Added "in this city", "in other cities" conditionals for city-based uniques 2023-04-16 14:43:34 +03:00
SomeTroglodyte
dea3256c93
Unhappiness effects (#9188) 
* Block growth if Unique says so - even with full stores

* Display unhappiness rejection reason for Settlers

* Display unhappiness effects in Overview Stats

* Display unhappiness effects in Overview Stats - simplify
 2023-04-16 14:21:58 +03:00
SomeTroglodyte
90cac15c7f
Fix more leaks of the actual Player count in random mode (#9196) 2023-04-16 14:20:08 +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
SomeTroglodyte
3b3db71fd8
Allow city- or tile- related conditionals on PerpetualStatConversion enabling unique (#9183) 2023-04-14 08:28:07 +03:00
Yair Morgenstern
26d16fc1cc 4.6.1-patch2 
Fixed multiplayer games not starting because player ID was being lost on the way @SomeTroglodyte
 2023-04-13 23:58:41 +03:00
Yair Morgenstern
fd9284f8a3 4.6.1-patch1 2023-04-13 23:21:42 +03:00
Yair Morgenstern
5232984bd9 More UI cleanup 2023-04-13 23:19:57 +03:00
Yair Morgenstern
d542fbc0af Removed more double icons 2023-04-13 23:01:48 +03:00
Yair Morgenstern
0d6aa82540 Resolved #9169 - Return error when cannot upload game to Dropbox 2023-04-13 18:17:21 +03:00
Yair Morgenstern
e7653bd53d Resolved #9163 - Can again spectate games where not an original participant 2023-04-13 17:51:11 +03:00
Yair Morgenstern
2fbd24231f Resolved #9177 - Tileset no longer reverts to default on Android after restarting game 2023-04-13 17:41:59 +03:00
Yair Morgenstern
f98f4e8c9b Retreat chance is savescum-safe - #9178 2023-04-13 16:55:16 +03:00
Yair Morgenstern
ebfda6ffc0 Resolved #9178 - 'unit gain from defeating unit' takes attacking/defending units into account for randomness 2023-04-13 16:50:24 +03:00
Yair Morgenstern
28f5043fcb 4.6.1 2023-04-13 16:26:43 +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
Yair Morgenstern
e05c561f68 Added parameter type for stockpiled resources specifically 2023-04-13 16:07:11 +03:00
Yair Morgenstern
4d3b2845fd Fix "Instantly consumes [amount] [resource]" 2023-04-13 16:02:46 +03:00
Yair Morgenstern
36a8b368c8
Arbitrary images in font!!! (#9167) 
* Arbitrary images in font!!!

* Added unit, promotion, and improvement icons to text

* Fixed icons in notifications

* Removed icons from formatted lines to avoid double-icons

* Removed nation icon from next to menu to not have double-icons

* Removed nation icon from next to menu to not have double-icons

* Icons do not appear in Civilopedia twice

* Better Nation texts
 2023-04-13 16:00:50 +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
WhoIsJohannes
b0f4e42e99
Show replay after 50 turns, but only the discovered part of it. (#9172) 2023-04-13 15:39:26 +03:00
SomeTroglodyte
e0533e994f
Fix startBias regional assignments (#9171) 2023-04-13 15:38:19 +03:00
WhoIsJohannes
9ea135fba8
Charts improvements (#9168) 
* Let spectator see civ groups in VictoryScreen

* Display defeated players normally for charts. Otherwise it's difficult to see which line belongs to them.

* Don't show a 0 for defeated civs.

* Delete dead code.

* Show the civ icon on the last data point within the chart, not next to it and simplify some computations with now obsolete paddings.

* Support negative values in the chart

* Remove TODO for negative values
 2023-04-13 11:55:59 +03:00
WhoIsJohannes
e72591e470
Highlight non-available wonders in tech picker (#9173) 
* Show wonders in tech tree with a blue color and also show which wonders have already been built for technologies not yet researched with a red circle around them.

* Only show red circle.
 2023-04-13 11:54:35 +03:00
SomeTroglodyte
0500f73770
Victory screen and victory detection use VictoryData (#9175) 
* VictoryScreen uses VictoryData

* Victory detection no longer circumvents VictoryData
 2023-04-13 11:54:11 +03:00
SomeTroglodyte
2e61023248
Close immediate win loophole (playing alone) (#9176) 2023-04-13 11:52:16 +03:00
Yair Morgenstern
19b243abfe 'Display' options organized into subcatagories - kudos @Ouaz 2023-04-11 11:28:24 +03:00
SomeTroglodyte
46a9a7251e
Fix incorrect relationship level comparison (#9156) 2023-04-11 11:04:31 +03:00