AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,301 Commits 6 Branches 1,117 Tags
Commit Graph

5301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
502a2d57a3 Filtered out some building uniques that were activating for every city when they should have been only for the city the building was built in 2021-05-21 13:34:04 +03:00
Yair Morgenstern
eac2055b3e Better icons! 2021-05-21 12:28:56 +03:00
Yair Morgenstern
e547479c92 Added unit icons in unit overview screen 2021-05-21 12:17:22 +03:00
Yair Morgenstern
fd5125904a 3.14.10 3.14.10 2021-05-20 22:49:40 +03:00
Yair Morgenstern
9fd80122e0
Translations update (#3969) 
* Update Turkish.properties (#3964)

* Update Spanish.properties (#3963)

* Update Indonesian.properties (#3960)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#3956)

* Update Spanish.properties (#3970)

* Fix spaceship part production boosts (#3953)

Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.

The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.

The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.

* Update Spanish.properties

I had to reopen a new pull request due to conflicts the other had.

Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>

Co-authored-by: Nazım Gediz Aydındoğmuş <nga@hotmail.com.tr>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>
 2021-05-20 22:22:09 +03:00
SomeTroglodyte
7c7d4181cc
Fix custom map sizes - saves match, size obeyed, limit UI (#3965) 
* Fix custom map sizes - Revive Enum MapSize and fix tech modifier for custom maps

* Fix custom map sizes - Fix saved size not matching tileset, obey custom size

* Fix custom map sizes - limiting custom size and UI

* Fix custom map sizes - linting and reduce warnings

* Fix custom map sizes - less verbose

* Popup gets a KeyPressDispatcher - templates
 2021-05-20 22:17:07 +03:00
Yair Morgenstern
f07c63c07f Unified "progress bars can't go beyond 100%" 2021-05-20 22:13:58 +03:00
Arthur van der Staaij
1f2dbb9a4e
Fix spaceship part production boosts (#3953) 
Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.

The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.

The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.
 2021-05-20 18:19:33 +03:00
SomeTroglodyte
b9aeb03e1b
Correction to deprecation Version number?... (#3968) 
... in MapParameters.size: The commit adding the annotation is 9 commits below the 3.14.7 commit. Sorry I didn't include this earlier!. I *did* notice then went on for the rest of the little PR with a little nagging feeling ...
 2021-05-20 12:34:05 +03:00
Duan Tao
3d062e3424
Add guided missile which acts differently from nuclear missile. (#3957) 
* Add guided missile which acts differently from nuclear missile.

* Clean png.
 2021-05-20 12:33:39 +03:00
Yair Morgenstern
11c8a67596 Merge branch 'temp' 2021-05-20 00:54:39 +03:00
Yair Morgenstern
984293c252 3.14.9-patch1 
Apparently Float.min doesn't work on older versions of Java. Appears here: https://docs.oracle.com/javase/8/docs/api/java/lang/Float.html but not here: https://docs.oracle.com/javase/7/docs/api/java/lang/Float.html  Hate you, Java. Why do you insist on not being Kotlin.
3.14.9-patch1 		2021-05-20 00:46:39 +03:00
SomeTroglodyte
591087ec25
KeyPressManager now manages listener (and cityscreen usage) (#3966) 
* KeyPressManager now manages listener (and cityscreen usage)

* KeyPressManager now manages listener - patch 1
 2021-05-20 00:25:31 +03:00
SomeTroglodyte
3e3bda42e5
Follow screen rotation even to Portrait on Android with Opt-in (#3936) 2021-05-19 23:27:23 +03:00
SomeTroglodyte
929c357663
Commenting extension functions and resolve to-do (#3932) 
* Commenting extension functions and resolve to-do

* Better readability in PromotionPickerScreen enable
 2021-05-18 13:14:56 +03:00
Yair Morgenstern
106cbb79c3 3.14.9 3.14.9 2021-05-18 01:07:17 +03:00
Yair Morgenstern
e57e7fb7d5
Translations update (#3950) 
* Update Indonesian.properties (#3947)

* Update Russian.properties (Full Translation) (#3945)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

case fix

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Simplified_Chinese translate (#3940)

* Update Simplified_Chinese.properties

* fix case problem

* Update Spanish.properties (#3924)

* Update German.properties (#3919)

* Update German.properties

* Update German.properties

* Update Italian.properties (#3917)

* Update Spanish.properties (#3928)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Maksim Klimenko <77161824+Maks-gaming@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Chris <70113017+chriscr2@users.noreply.github.com>
 2021-05-17 23:47:00 +03:00
SomeTroglodyte
7b822643d9
Fix Ctrl-S going to save game screen will not stop scrolling the map (#3949) 
* Fix Ctrl-S going to save game screen will not stop scrolling the map

* Just trying to force github to retry its build checks
 2021-05-17 22:14:49 +03:00
SomeTroglodyte
fc7859e4e7
Options screen cleanup (#3934) 
* Options popup linting and minor visual improvements

* Options popup - mod checker - missing test?
 2021-05-16 16:43:57 +03:00
Xander Lenstra
7b0ea32c47
Technology and construction bars no longer extend past their maximum (#3930) 
* Technology and construction bars no longer extend past their maximum

* Fixed compile errors

* actually fixed the issue
 2021-05-16 15:42:19 +03:00
SomeTroglodyte
abaa678e2b
Split off stuff from CameraStageBaseScreen that isn't the class itself (#3929) 2021-05-14 11:23:33 +03:00
Yair Morgenstern
d546b2b00e Caught exception when map fails to load 2021-05-13 21:43:42 +03:00
SomeTroglodyte
d92e9a1dc7
Minimap resizeable and scroll position indicator redone (#3922) 2021-05-13 20:32:45 +03:00
SomeTroglodyte
c0fbd94bf5
Trim down custom save to export/import only (#3914) 2021-05-13 20:27:19 +03:00
SomeTroglodyte
d20b3c4e58
Fix crash when a mod allows a citadel >1 tile outside borders (#3923) 
* Fix crash when a mod allows a citadel >1 tile outside borders

* Fix crash when a mod allows a citadel outside borders - no cities
 2021-05-13 20:25:16 +03:00
Yair Morgenstern
4f1798146c 3.14.8 3.14.8 2021-05-11 00:44:36 +03:00
Yair Morgenstern
6ca93f4dc9
Translations update (#3916) 
* Update Spanish.properties (#3908)

* Update German.properties (#3904)

* Update Vietnamese.propreties (#3903)

* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

Come back:)

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

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

* Update Italian.properties (#3901)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: leanhquanea1234 <69520258+leanhquanea1234@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-05-11 00:34:26 +03:00
GGGuenni
3b599d3b50
Fixed inconsistent map size (#3915) 
* Fixed inconsistent map size

* removed empty lines of code

* removed print
 2021-05-11 00:31:11 +03:00
Yair Morgenstern
61c8ab3a8f New line-of-sight rules, with new "Blocks line-of-sight from tiles at same elevation" unique! 2021-05-11 00:29:37 +03:00
Yair Morgenstern
1f50f3e97e Removed old todos 2021-05-11 00:28:49 +03:00
Yair Morgenstern
482f9ae9e5 Linting - Optimized imports 2021-05-10 22:45:29 +03:00
Yair Morgenstern
2f47fb77bc Linting 2021-05-10 22:34:50 +03:00
GGGuenni
278962c37d
Fixed Forest on Hill does not show (#3909) 
* Removed Duplicates and HillForest

since the Image HillForest got renamed to Forest to reduce ruleVariants

* reorganized legacy variants

* Added "Offshore Platform" for oil well on water
 2021-05-10 12:47:41 +03:00
SomeTroglodyte
a2939c0e27
Accelerate Load Game Screen Info (#3902) 2021-05-10 06:50:49 +03:00
Yair Morgenstern
3065cca5e1 More fantasyhex combinations 2021-05-09 23:49:07 +03:00
GGGuenni
54deb60f1b
FantasyHex update first iteration (#3884) 
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-05-09 23:44:39 +03:00
SomeTroglodyte
64119580fb
Save game UI patch (#3907) 
* Unify PickerScreens not needing scroll, fix save/load screens scrolling their center column

* Map save/load exits to previous, fix load padding, fix "Current saves" header never showed
 2021-05-09 21:25:23 +03:00
Yair Morgenstern
413c0b077b Fixed terrace farm's 'fresh water' bonus - kudos @1.7.4 2021-05-09 00:28:32 +03:00
Yair Morgenstern
0f0de8a221 3.14.7 3.14.7 2021-05-08 23:54:29 +03:00
Yair Morgenstern
8b767a10d0
Translations update (#3899) 
* Update Japanese.properties (#3896)

* Update German.properties (#3894)

* Update Japanese.properties (#3880)

translation of untranslated parts and retouch

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

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ko-chan-28 <70871262+ko-chan-28@users.noreply.github.com>
 2021-05-08 23:48:15 +03:00
Yair Morgenstern
b0f3d30d79 Fixed double consumption of resources for "Comsumes [amount] [resource]" unique 2021-05-08 23:35:52 +03:00
Yair Morgenstern
60fb38dfc3 New SDK versions, gradle properties, and androidx - this seems to solve the previous problems! 2021-05-08 23:24:57 +03:00
Yair Morgenstern
619d02d2b6 Hopefully will solve the github action fails 2021-05-08 22:54:11 +03:00
Yair Morgenstern
3a22a1127e Gradle upgrade 2021-05-07 13:18:48 +03:00
Yair Morgenstern
fca5b5075e Spaces 2021-05-07 12:39:44 +03:00
Yair Morgenstern
6fbb223aa5 Resolved #3888 - added template lines for mod management screen 2021-05-07 12:20:10 +03:00
Yair Morgenstern
7e7f72ed2f Tradition works again 2021-05-07 12:03:13 +03:00
Alexander Korolyov
453f5588ac
Custom map size (#2876) 
* Adding custom map sizes. Initial commit

* Custom map sizes UI update

* Custom map size with rectangular shape

* Added compatibility with older Maps and Game saves

* Fixed build errors and added warning messages

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-05-06 18:39:28 +03:00
Yair Morgenstern
b8f9b99bd1 Fixed Civilopedia crash 2021-05-06 18:37:12 +03:00
Yair Morgenstern
db87c04017 Linting 2021-05-06 18:02:27 +03:00