mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-04 16:11:46 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,429 Commits 6 Branches 1,047 Tags 1.1 GiB
f2b5407fe0
Commit Graph

3453 Commits

Author SHA1 Message Date
Yair Morgenstern
e8bbd4bc70 Resource.building, Building.resourceBonusStats deprecated in favor of '[stats] from [resource] tiles in this city' unique 2021-06-08 20:01:49 +03:00
SomeTroglodyte
21aa371cc3
Re-show redundant tech prereq mod errors without impeding playability (#4046) 
* Re-show redundant tech prereq mod errors without impeding playability

* Re-enable playability of mods with less severe errors - fun version
 2021-06-08 06:44:25 +03:00
Federico Luongo
0b696451ce
Map Generation Seedable (#4072) 
* Map Generation Seedable
* Added Seed editable field in MapParametersTable
Previously, using the same set of parameters, one could not get the same map twice (i.e. negligible probability for it to happen). With this commit players can specify, alongside the usual map parameters, a long integer used to seed the RNG and get replicable results.

* Fixed Natural Wonder Spawn was not using MapGenerationRandomness hence giving not reproducible maps

* Translation strings
 2021-06-08 06:42:27 +03:00
Federico Luongo
7c9b0e04b4
Map Generation Fixes and Tweaks (#4069) 
* * Renamed Continents to Two Continents
* Created Four Continents map size
It spawns a vertical and a horizontal ocean to split the map in 4 major continents. Works properly on all sizes and with world wrap

* Fixed Pangea extending to boundaries in rectangular maps
* Unified Pangea for rectangular and hexagonal maps

* Fixed Default map type bias on Rectangular maps. Also removed "pangea effect" on Default: land can spawn with the same probability in the whole map.

* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings

* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings
 2021-06-08 06:41:02 +03:00
SomeTroglodyte
fadd1684ac
Make CivilizationInfo.gold read-only (#4074) 
* Make CivilizationInfo.gold read-only

* Make CivilizationInfo.gold read-only
 2021-06-08 06:40:17 +03:00
Aron de Jong
cd58f6ace8
Refund wasted production as gold (#4058) 
* Refund wasted production as gold

Any wasted production, from for instance a partially completed wonder or
obsolete units, will now be refunded as gold (in a 1:1 ratio).

We update both at the start and end of the user turn. Updating at the
start to account for wonders completed after our previous turn and
updating at the end to account for obsolete buildings/units as a
consequence of our own turn.

When obsolete units get replaced by their upgraded version (as in civ 5)
this code should probably be updated.

* Implement wonder refund and obsolete unit upgrade

If a wonder is built somewhere else but the user has production in this
wonder, the production will be refunded as gold in a 1:1 ratio. A
notification will be shown to indicate this. This reflects the behaviour
in Civ 5.

If a unit becomes obsolete and an upgrade is available, the production
put into this unit will now be transferred to the upgraded version. If
the unit is queued, the queued unit will also be changed to the new
version and the user will be notified via notification.

* Shorten notification messages

* Update alerts: been obsolete -> become obsolete
 2021-06-07 22:04:33 +03:00
SomeTroglodyte
7a5b88923d
Cosmetic: Convenience shortcuts, some linting (#4067) 2021-06-07 07:26:01 +03:00
Arthur van der Staaij
a7afc0718c
Unit swapping (#4049) 
* Added an icon for unit swapping

* Implemented unit swapping

In the original Civ V, unit swapping is a supported mechanic.
If you try to move a unit to a tile with another of your units, and both
units have enough movement points left to reach the other's tile, they
will swap places. They will consume only the movement points needed to
reach the other's tile in this way.

This change implements unit swapping for Unciv.

To prevent all kinds of problems from arising with automatic unit
movement, unit swapping can only be done explicitly. This also means
that it can only be done if the unit-swap movement is possible in a
single turn. It is however not limited to adjacent units.

Because Unciv supports mobile devices, there is in general no separation
between a unit-selection click and a movement click. Clicking on another
unit while a unit is selected simply selects that other unit. Because we
do not want to make it more difficult to select other units in this way,
unit swapping is implemented as a separate "movement mode": to toggle
this mode on or off, the new unit action "Swap units" must be used.
Newly selected units still always start in the normal movement mode.

In the unit-swap movement mode, the possible swap tiles are highlighted
instead of the possible movement and attack tiles. Clicking on a
highlighted tile will display a swap button, similar to the movement
button, or instantly perform the swap if single-click-movement is
enabled. This new behavior overrides the selection of the unit on the
target tile: if the user wants to select the unit instead, they have to
exit the unit-swapping mode first.

The swapping code is robust, it can even handle swaps that involve a
paradrop!

An option to always swap-move when an eligible tile is clicked instead
of requiring the unit-swapping mode, similar to the existing
single-click-movement option, could perhaps be added in later.

* Added some comments to existing movement functions

* Fixed a silly mistake

Fixed a silly mistake which caused the unit-swapping eligibility
detection to sometimes remove units from the world.

* Removed some unneeded code

* Fixed movement buttons not showing with world wrap

Fixed a bug where the "move here" and "swap with" buttons would only
show on the leftmost copy of the world when world wrap was enabled.

* Made the swap action only display if usable

Made the unit swapping button only display if there is at least one
possible swap movement.
 2021-06-06 22:56:25 +03:00
SomeTroglodyte
cc3eeb3c7c
Fix gold able to over- and underflow (#4065) 2021-06-06 19:29:23 +03:00
SomeTroglodyte
298dbcb3ee
More power to improvement uniques (resourceTerrainAllow-be-gone) (#4024) 
* More flexibility for modding improvements (tileFilter), deprecate resourceTerrainAllow

* More tileFilter and improvement uniques - Translations

* Update template.properties

* More tileFilter and improvement uniques - Revert and/or inside unique parameter
 2021-06-06 12:40:02 +03:00
SomeTroglodyte
dc8657dc02
Map editor save / load / download keys (#4056) 2021-06-06 12:36:12 +03:00
SomeTroglodyte
11cbe1c84a
TileInfoTable translation and padding (#4061) 2021-06-06 12:26:55 +03:00
SomeTroglodyte
52b7999c48
Map editor fix translations, a few keys (#4055) 2021-06-06 09:18:22 +03:00
Xander Lenstra
d7b2436bcf
Fixed a few bugs noted in #4057 (#4062) 2021-06-06 09:15:22 +03:00
SomeTroglodyte
6c203d68f7
Unified exit game popups, removed obsolete closing handler (#4048) 2021-06-06 09:09:02 +03:00
Yair Morgenstern
a1b0a90506 3.14.14 2021-06-04 14:33:22 +03:00
Yair Morgenstern
c5d81569f7 Removed some by-name references in construction automation 2021-06-03 22:44:13 +03:00
SomeTroglodyte
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
Yair Morgenstern
4b06a55bb5 Resolved #3967 - City-states can no longer 'gift' you your unique units 2021-06-03 22:25:27 +03:00
Yair Morgenstern
7cc440a577 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-03 19:08:39 +03:00
Yair Morgenstern
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
lishaoxia1985
a254ec0219
Fix that when WindowState's width and height = 0 the app window will disappear (#4044) 2021-06-03 17:31:49 +03:00
lishaoxia1985
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
Xander Lenstra
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
Arthur van der Staaij
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
Yair Morgenstern
efe369ad19 Linting and deprecation corrections 2021-06-01 23:32:23 +03:00
Yair Morgenstern
c73891cbe7 3.14.13 2021-06-01 21:19:06 +03:00
SomeTroglodyte
084adc3396
Patch ModManager exit to allow deactivating a selected tileset (#4029) 2021-06-01 20:00:50 +03:00
Yair Morgenstern
876bdf8f30 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-01 19:57:00 +03:00
Yair Morgenstern
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
SomeTroglodyte
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
Duan Tao
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
SomeTroglodyte
ab4441ad1f
Fix two sound credits (#4020) 2021-05-30 21:05:46 +03:00
SomeTroglodyte
589ed4e423
Sound upgrade - enable BaseUnit.attackSound, a few extras (#4013) 2021-05-30 10:18:42 +03:00
Xander Lenstra
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
SomeTroglodyte
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
Yair Morgenstern
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
Yair Morgenstern
f238cb3f3c Renamed ConstructionsTable -> CityConstructionsTable 2021-05-28 14:39:09 +03:00
Yair Morgenstern
c90a79363d Added city strength label to city button 2021-05-28 14:34:24 +03:00
Yair Morgenstern
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
SomeTroglodyte
cf2be25c73
Popup gets a KeyPressDispatcher (#3973) 
* Popup gets a KeyPressDispatcher

* Popup gets a KeyPressDispatcher - patch1
 2021-05-27 21:49:40 +03:00
SomeTroglodyte
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
Yair Morgenstern
cd6ae3dc6d 3.14.11 2021-05-26 19:37:01 +03:00
SomeTroglodyte
05c9813ac9
Make ImprovementPickerScreen "Pick Now" easier to hit (#3989) 2021-05-24 19:48:53 +03:00
SomeTroglodyte
f86a3fa47b
Spruced up Civilopedia - phase 1 - linking and category Enum (#3975) 2021-05-21 15:19:18 +03:00
Yair Morgenstern
3801a81bf4 AI much less motivated to attack city-states 2021-05-21 13:49:33 +03:00
Yair Morgenstern
e95a62126d Better peace agreement evaluations, for when there is no great power imbalance between nations 2021-05-21 13:46:44 +03:00
Yair Morgenstern
b4f588e70f Minimap slider has better values to accommodate screen sizes 2021-05-21 13:41:58 +03:00
Yair Morgenstern
7e827aebd3 Doubled ancient ruins spawn rate 2021-05-21 13:35:07 +03:00
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
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
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.
 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
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
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
SomeTroglodyte
a2939c0e27
Accelerate Load Game Screen Info (#3902) 2021-05-10 06:50:49 +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
b0f3d30d79 Fixed double consumption of resources for "Comsumes [amount] [resource]" unique 2021-05-08 23:35:52 +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
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
Yair Morgenstern
dbc3bcb5a1 Fixed 'dead code' that got in on one of the PRs 2021-05-06 17:53:06 +03:00
SomeTroglodyte
7a8bf68885
Option Screen choices visible on minimap toggle buttons immediately - ugly (#3881) 2021-05-06 16:09:19 +03:00
SomeTroglodyte
7c34c5f440
Resource revealed notification can point to all reveals (#3879) 
* May resolve #3862: Resource revealed notification can point to all reveals

* Resource revealed notification can point to all reveals - wording
 2021-05-06 16:08:35 +03:00
SomeTroglodyte
d11cf286b4
Worldscreen key bindings (#3875) 
* WorldScreen most Civ5 key bindings

* WorldScreen keys - Overview button key hint

* WorldScreen most Civ5 key bindings - v2

* WorldScreen most Civ5 key bindings - civilopedia

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-05-06 16:04:24 +03:00
SomeTroglodyte
c622a3d9fd
City overview force consistent row height (#3861) 
* City overview force consistent row height

* City overview force consistent row height - simpler
 2021-05-06 15:48:58 +03:00
Yair Morgenstern
7f937e9784 I think we've removed all removable references to isHill() 2021-05-06 15:31:09 +03:00
Yair Morgenstern
e8d4767b6d Height of terrains is now defined by a unique 2021-05-06 15:27:30 +03:00
Yair Morgenstern
59a419c1c9 TileInfo.hasUnique() 2021-05-06 15:13:15 +03:00
Yair Morgenstern
b7383bb959 Refixed denunciation effects - sorry Chek! 2021-05-06 14:40:08 +03:00
Yair Morgenstern
c601f7f9ec Genericized "No Maintenance costs for improvements in [] tiles" 2021-05-06 14:34:40 +03:00
Yair Morgenstern
34bed66198 Genericized hill's "extra sight for land units" to a unique 2021-05-06 14:28:54 +03:00
Yair Morgenstern
8d2629088f Hill city-strength bonus genericized 2021-05-06 14:27:12 +03:00
Yair Morgenstern
7686b1ee4a Simplified rough terrain check 2021-05-06 12:35:28 +03:00
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
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
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
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
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
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
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
SomeTroglodyte
600f262cca
Fixes #3729 "Android crash on loading from custom location" (#3828) 2021-04-21 23:42:45 +03:00
Yair Morgenstern
55ef131fb2 3.14.3 2021-04-21 22:12:46 +03:00
SomeTroglodyte
722772b08e
Solves #3802 Mod translations don't appear in new game screen (#3823) 
* Solves #3802 Mod translations don't appear in new game screen

* Rehomed translationActiveMods to Translations
 2021-04-21 21:45:58 +03:00
Yair Morgenstern
6ffbce4ee1 Added "Updated!" next to updated mods in mod management screen 2021-04-21 21:22:55 +03:00
Yair Morgenstern
146a806b08 Added 'last updated time' to mod description 2021-04-21 20:53:14 +03:00
Yair Morgenstern
72f63b7ba1 Added "open Github page of mod" in mod management screen 2021-04-21 20:30:25 +03:00
Yair Morgenstern
0c80a31c9a Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-20 22:18:55 +03:00
Yair Morgenstern
d674be2234 Can no longer enter diplomacy screen for self, defeated and spectator civs through diplomacy overview screen 2021-04-20 22:18:11 +03:00
SomeTroglodyte
615fa78101
Modify choice of city to own the tiles acquired by a citadel - v2 (#3819) 2021-04-19 23:01:47 +03:00
SomeTroglodyte
e2c6ae450d
Make city center unpillagable using a unique (#3818) 2021-04-19 20:18:20 +03:00
Yair Morgenstern
1eb3629c09 Resolved #3817 - don't display resource requirements from uniques twice 2021-04-19 19:29:21 +03:00
SpacedOutChicken
8d4aa955b3
Parameterize civ-wide sight bonus (#3809) 
* Make science a possible reward for killing units

* no message

* Revert "Make science a possible reward for killing units"

This reverts commit 296b8fab54.
 2021-04-18 22:12:47 +03:00
Yair Morgenstern
e0b1cce74f Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-18 21:31:01 +03:00
Yair Morgenstern
11f5937cdf Revert "World wrap is publicly released!" 
This reverts commit 55659657aa.
 2021-04-18 21:29:37 +03:00