diff --git a/core/src/com/unciv/ui/worldscreen/Minimap.kt b/core/src/com/unciv/ui/worldscreen/Minimap.kt index 7674a26b25..392c8be696 100644 --- a/core/src/com/unciv/ui/worldscreen/Minimap.kt +++ b/core/src/com/unciv/ui/worldscreen/Minimap.kt @@ -29,7 +29,6 @@ class Minimap(val mapHolder: WorldMapHolder) : ScrollPane(null){ } init{ - setScrollingDisabled(true,true) var topX = 0f var topY = 0f var bottomX = 0f @@ -39,7 +38,7 @@ class Minimap(val mapHolder: WorldMapHolder) : ScrollPane(null){ val hex = ImageGetter.getImage("OtherIcons/Hexagon") val positionalVector = HexMath.hex2WorldCoords(tileInfo.position) - val groupSize = mapHolder.worldScreen.stage.height / 8f / mapHolder.tileMap.mapParameters.size.radius * (mapHolder.worldScreen.stage.height / 600f) + val groupSize = 10f hex.setSize(groupSize,groupSize) hex.setPosition(positionalVector.x * 0.5f * groupSize, positionalVector.y * 0.5f * groupSize) @@ -110,7 +109,7 @@ class MinimapHolder(mapHolder: WorldMapHolder): Table(){ fun getWrappedMinimap(): Table { val internalMinimapWrapper = Table() - internalMinimapWrapper.add(minimap) + internalMinimapWrapper.add(minimap).size(worldScreen.stage.width/5,worldScreen.stage.height/5) internalMinimapWrapper.background=ImageGetter.getBackground(Color.GRAY) internalMinimapWrapper.pack() diff --git a/extraImages/Feature graphic.png b/extraImages/Feature graphic.png index 4ca60ab157..ea6c29a333 100644 Binary files a/extraImages/Feature graphic.png and b/extraImages/Feature graphic.png differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a2bf1313b8..774d2f791b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sun Apr 19 13:05:52 IDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip