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

3
android/src/mindustry/android/AndroidLauncher.java
View File

@@ -15,7 +15,6 @@ import arc.func.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.util.*; import arc.util.*;
import dalvik.system.*; import dalvik.system.*;
import io.anuke.mindustry.*;
import mindustry.*; import mindustry.*;
import mindustry.game.Saves.*; import mindustry.game.Saves.*;
import mindustry.io.*; import mindustry.io.*;
@@ -232,7 +231,7 @@ public class AndroidLauncher extends AndroidApplication{
super.onResume(); super.onResume();
//TODO enable once GPGS is set up on the GP console //TODO enable once GPGS is set up on the GP console
if(false && BuildConfig.FLAVOR.equals("gp")){ if(false && getPackageName().endsWith(".gp")){
try{ try{
if(gpService == null){ if(gpService == null){
serviceClass = Class.forName("mindustry.android.GPGameService"); serviceClass = Class.forName("mindustry.android.GPGameService");

2
build.gradle
View File

@@ -36,7 +36,7 @@ allprojects{
ext{ ext{
versionNumber = '7' versionNumber = '7'
if(!project.hasProperty("versionModifier")) versionModifier = 'pre-alpha' if(!project.hasProperty("versionModifier")) versionModifier = 'dev'
if(!project.hasProperty("versionType")) versionType = 'official' if(!project.hasProperty("versionType")) versionType = 'official'
appName = 'Mindustry' appName = 'Mindustry'
steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94' steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'

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

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

2
gradle.properties
View File

@@ -8,4 +8,4 @@ kapt.use.worker.api=true
kapt.include.compile.classpath=false kapt.include.compile.classpath=false
# I don't need to use the kotlin stdlib yet, so remove it to prevent extra bloat & method count issues # I don't need to use the kotlin stdlib yet, so remove it to prevent extra bloat & method count issues
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false
archash=4db7abe679c53dbcef400b65da75247ffa6334d3 archash=5a9d95001fc988df2681616ebc33152b9c88ea92