diff --git a/core/src/mindustry/graphics/FogRenderer.java b/core/src/mindustry/graphics/FogRenderer.java index 9a8cbd0a26..da0212bd86 100644 --- a/core/src/mindustry/graphics/FogRenderer.java +++ b/core/src/mindustry/graphics/FogRenderer.java @@ -111,12 +111,12 @@ public final class FogRenderer{ dynamicFog.getTexture().setFilter(TextureFilter.linear); Draw.shader(Shaders.fog); - Draw.color(state.rules.dynamicColor); + Draw.color(state.rules.dynamicColor, 0.5f); Draw.fbo(dynamicFog.getTexture(), world.width(), world.height(), tilesize); //TODO ai check? if(state.rules.staticFog){ //TODO why does this require a half-tile offset while dynamic does not - Draw.color(state.rules.staticColor); + Draw.color(state.rules.staticColor, 1f); Draw.fbo(staticFog.getTexture(), world.width(), world.height(), tilesize, tilesize/2f); } Draw.shader(); diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index 7d9503a82a..6ae9b26b77 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -193,7 +193,7 @@ public class MinimapRenderer{ Tmp.tr1.set(dynamicTex); Tmp.tr1.set(region.u, 1f - region.v, region.u2, 1f - region.v2); - Draw.color(state.rules.dynamicColor); + Draw.color(state.rules.dynamicColor, 0.5f); Draw.rect(Tmp.tr1, x + w/2f, y + h/2f, w, h); if(state.rules.staticFog){ @@ -201,7 +201,7 @@ public class MinimapRenderer{ Tmp.tr1.texture = staticTex; //must be black to fit with borders - Draw.color(0f, 0f, 0f, state.rules.staticColor.a); + Draw.color(0f, 0f, 0f, 1f); Draw.rect(Tmp.tr1, x + w/2f, y + h/2f, w, h); } diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index 37b1dead72..e4f3692282 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -38,7 +38,7 @@ public class Mods implements Loadable{ private @Nullable Scripts scripts; private ContentParser parser = new ContentParser(); private ObjectMap> bundles = new ObjectMap<>(); - private ObjectSet specialFolders = ObjectSet.with("bundles", "sprites", "sprites-override"); + private ObjectSet specialFolders = ObjectSet.with("bundles", "sprites", "sprites-override", ".git"); private int totalSprites; private ObjectFloatMap textureResize = new ObjectFloatMap<>();