Commit Graph

3337 Commits

Author SHA1 Message Date
c5d81569f7 Removed some by-name references in construction automation 2021-06-03 22:44:13 +03:00
e22c53ca96 Key dispatcher precedence with several Popups open (#4040)
* Key dispatcher precedence with several Popups open

* Key dispatcher precedence with several Popups open - remove instrumentation
2021-06-03 22:30:42 +03:00
4b06a55bb5 Resolved #3967 - City-states can no longer 'gift' you your unique units 2021-06-03 22:25:27 +03:00
7cc440a577 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-03 19:08:39 +03:00
a70bb43dae Rewrote 'check unneeded tech prerequisites' that was causing ANRs and lowered time from 714ms to 1ms on my computer (!) for RekMOD check.
Also removed it from being blocking, since some important older mods (e.g. DeCiv) are unplayable because of this.
2021-06-03 19:07:34 +03:00
a254ec0219 Fix that when WindowState's width and height = 0 the app window will disappear (#4044) 2021-06-03 17:31:49 +03:00
e77eaf5fa5 Fix the app window changing may lead to that the app can't open in macOS (#4042) 2021-06-03 15:02:46 +03:00
aa9dda2eea Added the paratrooper unit (#4025)
* Added the paratrooper unit

* Reverted accidental reordering of action table

* Fixed Github build errors

* Hopefully actually fixed the build errors

* Added a Dutch translation, finally fixing the error

* Paratroopers can no longer actually paradrop on a tile they shouldn't be able to paradrop onto

* Removed double update action
2021-06-03 07:33:38 +03:00
a765caa97c Add global alerts for certain constructions (#4039)
* Add global alerts for certain constructions

In the original game, certain constructions alert all players upon
their completion. This commit introduces a new unique for this behavior
and adds this unique to the relevant constructions.

The code that implements the new unique is placed in
Building.postBuildEvent, so it can only be activated by buildings. If
other kinds of constructions require a global alert as well, the code
could be moved to CityConstructions.constructionComplete.

* Removed redundant line in template.properties

* Moved global alert logic to CityConstructions

Moved the implementation of "Triggers a global alert upon completion"
from Building.postBuildEvent to CityConstructions.constructionComplete,
close to the similar Wonder notification logic.
2021-06-03 07:31:39 +03:00
efe369ad19 Linting and deprecation corrections 2021-06-01 23:32:23 +03:00
c73891cbe7 3.14.13 2021-06-01 21:19:06 +03:00
084adc3396 Patch ModManager exit to allow deactivating a selected tileset (#4029) 2021-06-01 20:00:50 +03:00
876bdf8f30 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-01 19:57:00 +03:00
bc1405cdb3 City construction queue: Subsequent units no longer displays construction progress towards first unit of its kind 2021-06-01 19:56:54 +03:00
9ed73d0d3f Spruced up ModManagementScreen - phase 1 (#3983)
* Spruced up ModManagementScreen - phase 1

* Spruced up ModManagementScreen - phase 1 - patch1
2021-06-01 15:21:31 +03:00
205f479ffe Declare & Revoke protection for city-state. (#3994)
* Declare protection for city-state.

* Text templates.

* Better protector text for city-states.
2021-06-01 15:02:23 +03:00
ab4441ad1f Fix two sound credits (#4020) 2021-05-30 21:05:46 +03:00
589ed4e423 Sound upgrade - enable BaseUnit.attackSound, a few extras (#4013) 2021-05-30 10:18:42 +03:00
432e937474 Added the amphibious promotion and the marine unit (#3987)
* Technology and construction bars no longer extend past their maximum

* Fixed compile errors

* actually fixed the issue

* Added the marine unit

* Moved amphibious promotion effect to unique

* Added icons for Amphibious promotion and Marine unit

* aaah
2021-05-29 23:42:04 +03:00
97a36c3772 Spruced up Civilopedia - phase 2 - external links (#3981)
* Spruced up Civilopedia - phase 2 - external links

* Spruced up Civilopedia - phase 2 - patch1

* Spruced up Civilopedia - phase 2 - patch2
2021-05-28 17:41:03 +03:00
4df083197b City-states get all civs known by at least half of major civs, not 'by any civ' 2021-05-28 14:54:02 +03:00
f238cb3f3c Renamed ConstructionsTable -> CityConstructionsTable 2021-05-28 14:39:09 +03:00
c90a79363d Added city strength label to city button 2021-05-28 14:34:24 +03:00
c7334a461f Added unit action icons on map units, so it'll be immediately visible what each unit is doing 2021-05-28 14:06:30 +03:00
cf2be25c73 Popup gets a KeyPressDispatcher (#3973)
* Popup gets a KeyPressDispatcher

* Popup gets a KeyPressDispatcher - patch1
2021-05-27 21:49:40 +03:00
5f523cb548 Improved location notifications (#3992)
* Improved location notifications

* Improved location notifications - patch

* Improved location notifications - patch2

* Improved location notifications - patch3
2021-05-26 23:31:00 +03:00
cd6ae3dc6d 3.14.11 2021-05-26 19:37:01 +03:00
05c9813ac9 Make ImprovementPickerScreen "Pick Now" easier to hit (#3989) 2021-05-24 19:48:53 +03:00
f86a3fa47b Spruced up Civilopedia - phase 1 - linking and category Enum (#3975) 2021-05-21 15:19:18 +03:00
3801a81bf4 AI much less motivated to attack city-states 2021-05-21 13:49:33 +03:00
e95a62126d Better peace agreement evaluations, for when there is no great power imbalance between nations 2021-05-21 13:46:44 +03:00
b4f588e70f Minimap slider has better values to accommodate screen sizes 2021-05-21 13:41:58 +03:00
7e827aebd3 Doubled ancient ruins spawn rate 2021-05-21 13:35:07 +03:00
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
eac2055b3e Better icons! 2021-05-21 12:28:56 +03:00
e547479c92 Added unit icons in unit overview screen 2021-05-21 12:17:22 +03:00
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
f07c63c07f Unified "progress bars can't go beyond 100%" 2021-05-20 22:13:58 +03:00
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
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
11c8a67596 Merge branch 'temp' 2021-05-20 00:54:39 +03:00
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.
2021-05-20 00:46:39 +03:00
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
3e3bda42e5 Follow screen rotation even to Portrait on Android with Opt-in (#3936) 2021-05-19 23:27:23 +03:00
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
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
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
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
abaa678e2b Split off stuff from CameraStageBaseScreen that isn't the class itself (#3929) 2021-05-14 11:23:33 +03:00
d546b2b00e Caught exception when map fails to load 2021-05-13 21:43:42 +03:00