Implemented HTTPS checking for web multiplayer, fixed chat jamming all text fields

This commit is contained in:
Anuken
2018-01-21 11:54:54 -05:00
parent 40f7bf51c2
commit 2172daf145
7 changed files with 52 additions and 33 deletions

View File

@@ -18,5 +18,10 @@ public abstract class PlatformFunction{
public void onGameExit(){}
public void openDonations(){}
public void requestWritePerms(){}
public String getLocaleName(Locale locale){return locale.toString();}
public String getLocaleName(Locale locale){
return locale.toString();
}
public boolean canJoinGame(){
return true;
}
}

View File

@@ -20,7 +20,7 @@ import io.anuke.ucore.function.Consumer;
import java.io.IOException;
public class Net{
public static final int version = 9;
public static final int version = 10;
private static boolean server;
private static boolean active;

View File

@@ -49,7 +49,7 @@ public class ChatFragment extends Table implements Fragment{
//TODO put it in input?
update(() -> {
if(!Net.active()){
if(!Net.active() && chatOpen){
hide();
}

View File

@@ -28,7 +28,7 @@ public class MenuFragment implements Fragment{
add(new MenuButton("$text.play", group, ui.levels::show));
row();
if(!Vars.gwt) {
if(Mindustry.platforms.canJoinGame()) {
add(new MenuButton("$text.joingame", group, ui.join::show));
row();
}