Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	gradle.properties
This commit is contained in:
Anuken
2021-06-02 12:41:46 -04:00
parent 1c71ee2ed7 662473936c
commit 92e970456e
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/graphics/Shaders.java
View File

@@ -48,12 +48,12 @@ public class Shaders{
tar = new SurfaceShader("tar");
slag = new SurfaceShader("slag");
space = new SpaceShader("space");
caustics = new SurfaceShader("caustics"){
@Override
public String textureName(){
return "caustics";
}
};
//caustics = new SurfaceShader("caustics"){
// @Override
// public String textureName(){
// return "caustics";
// }
//};
planet = new PlanetShader();
planetGrid = new PlanetGridShader();
atmosphere = new AtmosphereShader();