mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-20 09:17:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,236 Commits 6 Branches 1,039 Tags 1.2 GiB
c73891cbe7
Commit Graph

5236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
09de08764e Revert "Option Screen choices visible on minimap toggle buttons immediately -… (#3858)" 
This reverts commit ba9a90c680.
 2021-05-05 22:02:31 +03:00
Yair Morgenstern
ec33c43c3f Show tech progress for next turn in tech button 2021-05-05 21:49:52 +03:00
Yair Morgenstern
a6d0973324 3.14.6 2021-05-05 20:46:40 +03:00
Yair Morgenstern
c1908d0526
Translations update (#3878) 
* Update German.properties (#3877)

* Update Spanish.properties (#3873)

* Changed a few minor fixes, added a lot of promotion translations (#3843)

* Update Malay.properties (#3595)

Yayay

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

* Should remove test fail

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: madbada99 <79025962+madbada99@users.noreply.github.com>
 2021-05-05 18:59:40 +03:00
Yair Morgenstern
738bc6caac Fixed tests 2021-05-05 18:45:48 +03:00
Yair Morgenstern
fb93e3f7ee Hills are converted to terrains that surround them 2021-05-05 18:00:07 +03:00
GGGuenni
b35d5d3121
changed hill to terrain Feature (#3707) 
* changed hill to terrain Feature

* Update Terrains.json

* Update Terrains.json

* Snow with capital S

* Fixed tests failing

* Added check for ruleset supports hill as terrain feature
 2021-05-05 17:48:47 +03:00
Yair Morgenstern
d864ed719f Added decay to diplomatic denunciation - kudos @Chek 2021-05-05 16:23:15 +03:00
Yair Morgenstern
1b801e0bba Fixed denouncement effects on third-party civs, and trade evaluation for enemy trades - kudos @Chek 2021-05-05 14:32:04 +03:00
SomeTroglodyte
d679632523
Bug: turnsLabel accumulates touchFocuses endlessly (#3874) 
* Bug: turnsLabel accumulates touchFocuses endlessly

* May resolve #3862: Resource revealed notification can point to all reveals - better
 2021-05-04 22:14:16 +03:00
SomeTroglodyte
a25777f380
Overview screen category decoration + key hint (#3872) 
* OverviewScreen: Category buttons decorated / key indicator

* OverviewScreen: Category buttons decorated / key indicator: Images
 2021-05-04 12:10:34 +03:00
SomeTroglodyte
f2a08719e2
ImprovementPicker: R key 'moves' from Road to Railroad patch (#3871) 2021-05-04 11:59:08 +03:00
SomeTroglodyte
ba9a90c680
Option Screen choices visible on minimap toggle buttons immediately -… (#3858) 
* Option Screen choices visible on minimap toggle buttons immediately - using lambdas

* Option Screen choices visible on minimap toggle buttons immediately - patch1
 2021-05-03 16:26:08 +03:00
SomeTroglodyte
79c6ff0e3e
Fix cancel improvement order (#3866) 2021-05-03 15:58:38 +03:00
Yair Morgenstern
d38692fad3 resolved #3869 but no one really cares 2021-05-02 22:14:56 +03:00
Yair Morgenstern
8160d76f97 Resolved #3865 - Kudos @SomeTroglodyte 2021-05-02 21:38:38 +03:00
Yair Morgenstern
f2a25b26ab Tilegroup accepts tile config also for *only the terrain part*, making all the extra "hill = grassland+hill" in the tileconfig json unnecessary! 
@ravignir
 2021-05-02 21:07:32 +03:00
Yair Morgenstern
204791c4b8 Great general unique no longer restricted to civilian units 2021-05-02 09:33:08 +03:00
Yair Morgenstern
ba1f647a8e Changed loading of tile set configs to work also on PC, from within a JAR file 2021-05-01 23:59:29 +03:00
Yair Morgenstern
94c0995b23 3.14.5 2021-05-01 23:05:30 +03:00
Yair Morgenstern
73d35b28b7
Translations update (#3860) 
* Update german translation (#3834)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Spanish.properties (#3830)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
 2021-05-01 22:45:22 +03:00
SomeTroglodyte
7eb4250335
City expansion notification points to acquired tile (#3859) 2021-05-01 22:30:23 +03:00
Yair Morgenstern
eed26a5097 deprecated old uniques 2021-04-30 15:37:12 +03:00
Yair Morgenstern
8c098a7fd4 New layering is in da house! 
FantasyHex-New is now FantasyHex!
 2021-04-30 15:23:24 +03:00
Yair Morgenstern
d4b63950ac The new tileset is ready for rollout! 2021-04-30 15:00:37 +03:00
Yair Morgenstern
9900795e02 Specify original owner when showing option to liberate city 2021-04-30 12:44:51 +03:00
Yair Morgenstern
9847d089b3 Fixed mod management screen to the new 'wrapped scrollpanne' style of PickerScreen 2021-04-30 12:34:24 +03:00
Yair Morgenstern
e9d450eb60 Tile options in map editor screen no longer 'click' on tiles behind them 
Fixed new map screen
 2021-04-30 12:29:56 +03:00
Yair Morgenstern
81c1e34f0f Added "Self-destructs when attacking" unique 2021-04-30 12:11:49 +03:00
SomeTroglodyte
222e322230
A new KeyPressDispatcher supporting function keys with F1 demo (#3853) 2021-04-30 10:54:38 +03:00
SomeTroglodyte
8fc3e5bd98
Some visual improvements for the City Overview (#3844) 
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-04-29 20:16:13 +03:00
Yair Morgenstern
350f0c48d3 Code cleanup for construction text - moved to city constructions file and simplified 2021-04-29 17:53:44 +03:00
Yair Morgenstern
4db97dcd1a Added construction production info to city screen 2021-04-29 14:02:27 +03:00
lishaoxia1985
464d89298a
Fix screen bugs when you don't use splitpane in pickscreen (#3760) 2021-04-29 12:44:37 +03:00
Yair Morgenstern
72bf5f198d 3.14.4 2021-04-28 22:38:49 +03:00
Yair Morgenstern
14ca67ca61
Translations update (#3845) 
* Update german translation (#3834)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Spanish.properties (#3830)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
 2021-04-28 21:40:33 +03:00
SomeTroglodyte
66f07347e0
Keyboard navigation to switch panes within overview screen (#3822) 2021-04-28 21:40:15 +03:00
Yair Morgenstern
5b7170bf9f Unified stat summing in city overview table 2021-04-27 19:02:14 +03:00
SomeTroglodyte
3da02b18b6
Some visual improvements for the Mod Manager Screen (#3841) 2021-04-27 12:06:05 +03:00
Yair Morgenstern
8dc748f919 Resolved #3524 - Happiness in city overview now calculated correctly 
(also simplified sorting etc. and added option for Faith)
 2021-04-27 00:55:39 +03:00
Yair Morgenstern
4f802e813a Added Happiness (and Faith for Religion mods) to stats list - #3524 2021-04-27 00:37:51 +03:00
Yair Morgenstern
6afc5560f2 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-27 00:16:01 +03:00
Yair Morgenstern
bb34659d9c Resolved #3837 - Harad -> Harald in Denmark greeting 2021-04-27 00:15:47 +03:00
SomeTroglodyte
089a415da9
For issue 3838: Bigger target on "next city" button (#3840) 2021-04-27 00:05:59 +03:00
GGGuenni
29dfa338ba
Added fogOfWarColor and unexploredTileColor (#3833) 
* Added fogOfWarColor and unexploredTileColor

* update updateConfig function
 2021-04-26 21:16:18 +03:00
Yair Morgenstern
86fafd59db 3.14.1-patch1 2021-04-24 22:10:36 +03:00
Yair Morgenstern
7ddbac1f07 Made datetime in modscreen parsable for Java 7 phones 
And now date display is localized too which is nice
 2021-04-23 15:57:39 +03:00
Yair Morgenstern
fb4a091635 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-23 15:29:01 +03:00
lishaoxia1985
adf32dcfe2
getResearchAgreementCost() don't need variable, make some method private (#3832) 2021-04-22 16:59:15 +03:00
GGGuenni
cb9507c76d
Fixed internal TileSetConfigs not getting loaded on android (#3831) 2021-04-22 11:00:35 +03:00