This commit is contained in:
Anuken
2020-11-09 10:40:02 -05:00
parent 2d4f4015b1
commit acb14a0986
5 changed files with 10 additions and 3 deletions

Binary file not shown.

View File

@@ -126,7 +126,7 @@ public abstract class UnlockableContent extends MappableContent{
} }
public boolean unlocked(){ public boolean unlocked(){
if(net != null && net.client()) return state.rules.researched.contains(name); if(net != null && net.client()) return alwaysUnlocked || state.rules.researched.contains(name);
return unlocked || alwaysUnlocked; return unlocked || alwaysUnlocked;
} }

View File

@@ -0,0 +1,6 @@
package mindustry.net;
public class ServerGroup{
public String[] addresses;
public String name;
}

View File

@@ -42,7 +42,7 @@ public class Conveyor extends Block implements Autotiler{
conveyorPlacement = true; conveyorPlacement = true;
ambientSound = Sounds.conveyor; ambientSound = Sounds.conveyor;
ambientSoundVolume = 0.002f; ambientSoundVolume = 0.0015f;
unloadable = false; unloadable = false;
noUpdateDisabled = false; noUpdateDisabled = false;
} }

View File

@@ -16,6 +16,7 @@ import mindustry.net.*;
import mindustry.ui.*; import mindustry.ui.*;
import org.robovm.apple.coregraphics.*; import org.robovm.apple.coregraphics.*;
import org.robovm.apple.foundation.*; import org.robovm.apple.foundation.*;
import org.robovm.apple.glkit.*;
import org.robovm.apple.uikit.*; import org.robovm.apple.uikit.*;
import org.robovm.objc.block.*; import org.robovm.objc.block.*;
@@ -173,7 +174,7 @@ public class IOSLauncher extends IOSApplication.Delegate{
UINavigationController.attemptRotationToDeviceOrientation(); UINavigationController.attemptRotationToDeviceOrientation();
} }
}, new IOSApplicationConfiguration(){{ }, new IOSApplicationConfiguration(){{
stencilFormat = GLKViewDrawableStencilFormat._8;
}}); }});
} }