Removed antialiasing due to bugs / Improved default waves
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -155,6 +155,27 @@ public class DefaultWaves{
|
|||||||
spacing = 3;
|
spacing = 3;
|
||||||
}},
|
}},
|
||||||
|
|
||||||
|
new SpawnGroup(UnitTypes.chaosArray){{
|
||||||
|
begin = 41;
|
||||||
|
unitAmount = 1;
|
||||||
|
unitScaling = 1;
|
||||||
|
spacing = 30;
|
||||||
|
}},
|
||||||
|
|
||||||
|
new SpawnGroup(UnitTypes.eradicator){{
|
||||||
|
begin = 81;
|
||||||
|
unitAmount = 1;
|
||||||
|
unitScaling = 1;
|
||||||
|
spacing = 40;
|
||||||
|
}},
|
||||||
|
|
||||||
|
new SpawnGroup(UnitTypes.lich){{
|
||||||
|
begin = 131;
|
||||||
|
unitAmount = 1;
|
||||||
|
unitScaling = 1;
|
||||||
|
spacing = 40;
|
||||||
|
}},
|
||||||
|
|
||||||
new SpawnGroup(UnitTypes.ghoul){{
|
new SpawnGroup(UnitTypes.ghoul){{
|
||||||
begin = 90;
|
begin = 90;
|
||||||
unitAmount = 2;
|
unitAmount = 2;
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public class MapGenerator extends Generator{
|
|||||||
if(((tile.block() instanceof StaticWall
|
if(((tile.block() instanceof StaticWall
|
||||||
&& tiles[newX][newY].block() instanceof StaticWall)
|
&& tiles[newX][newY].block() instanceof StaticWall)
|
||||||
|| (tile.block() == Blocks.air && !tiles[newX][newY].block().synthetic())
|
|| (tile.block() == Blocks.air && !tiles[newX][newY].block().synthetic())
|
||||||
|| (tiles[newX][newY].block() == Blocks.air && tile.block() instanceof StaticWall)) && tiles[newX][newY].block() != Blocks.spawn){
|
|| (tiles[newX][newY].block() == Blocks.air && tile.block() instanceof StaticWall)) && tiles[newX][newY].block() != Blocks.spawn && tile.block() != Blocks.spawn){
|
||||||
tile.setBlock(tiles[newX][newY].block());
|
tile.setBlock(tiles[newX][newY].block());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -181,8 +181,6 @@ public class SettingsMenuDialog extends SettingsDialog{
|
|||||||
|
|
||||||
|
|
||||||
if(!mobile){
|
if(!mobile){
|
||||||
graphics.sliderPref("antialias", 0, 0, 5, 1, s -> (s == 0 ? 0 : (1 << s)) + "x");
|
|
||||||
|
|
||||||
graphics.checkPref("vsync", true, b -> Core.graphics.setVSync(b));
|
graphics.checkPref("vsync", true, b -> Core.graphics.setVSync(b));
|
||||||
graphics.checkPref("fullscreen", false, b -> {
|
graphics.checkPref("fullscreen", false, b -> {
|
||||||
if(b){
|
if(b){
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
package io.anuke.mindustry.desktop;
|
package io.anuke.mindustry.desktop;
|
||||||
|
|
||||||
import io.anuke.arc.*;
|
import io.anuke.arc.ApplicationListener;
|
||||||
import io.anuke.arc.backends.lwjgl3.Lwjgl3Application;
|
import io.anuke.arc.backends.lwjgl3.Lwjgl3Application;
|
||||||
import io.anuke.arc.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
|
import io.anuke.arc.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
|
||||||
import io.anuke.arc.files.FileHandle;
|
|
||||||
import io.anuke.arc.util.OS;
|
|
||||||
import io.anuke.mindustry.Mindustry;
|
import io.anuke.mindustry.Mindustry;
|
||||||
import io.anuke.mindustry.Vars;
|
|
||||||
import io.anuke.mindustry.core.Platform;
|
import io.anuke.mindustry.core.Platform;
|
||||||
import io.anuke.mindustry.net.Net;
|
|
||||||
import io.anuke.mindustry.net.*;
|
import io.anuke.mindustry.net.*;
|
||||||
|
|
||||||
public class DesktopLauncher extends Lwjgl3Application{
|
public class DesktopLauncher extends Lwjgl3Application{
|
||||||
@@ -26,21 +22,6 @@ public class DesktopLauncher extends Lwjgl3Application{
|
|||||||
config.setWindowedMode(960, 540);
|
config.setWindowedMode(960, 540);
|
||||||
config.setWindowIcon("sprites/icon.png");
|
config.setWindowIcon("sprites/icon.png");
|
||||||
|
|
||||||
try{
|
|
||||||
Settings settings = new Settings(){
|
|
||||||
@Override
|
|
||||||
public FileHandle getDataDirectory(){
|
|
||||||
return dataDirectory == null ? new FileHandle(OS.getAppDataDirectoryString(appName)) : dataDirectory;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
settings.setAppName(Vars.appName);
|
|
||||||
settings.loadValues();
|
|
||||||
int level = settings.getInt("antialias", 0);
|
|
||||||
config.setBackBufferConfig(8, 8, 8, 8, 0, 0, level == 0 ? 0 : 1 << level);
|
|
||||||
}catch(Throwable t){
|
|
||||||
t.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
Platform.instance = new DesktopPlatform(arg);
|
Platform.instance = new DesktopPlatform(arg);
|
||||||
|
|
||||||
Net.setClientProvider(new ArcNetClient());
|
Net.setClientProvider(new ArcNetClient());
|
||||||
|
|||||||
Reference in New Issue
Block a user