Multiplayer: works on android devices

master
EmaMaker 2020-05-02 16:37:22 +02:00
parent 876c259511
commit 48b5585c61
6 changed files with 14 additions and 16 deletions

View File

@ -2,6 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.emamaker.amazeing" >
<uses-permission android:name="android.permission.INTERNET" />
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"

View File

@ -112,7 +112,7 @@ public class PlayerChooseScreen extends MyScreen {
@Override
public void buildTable() {
super.buildTable();
super.buildTable();
firstRowTable.clear();
labels = new Label[MazeSettings.MAXPLAYERS];
@ -122,16 +122,13 @@ public class PlayerChooseScreen extends MyScreen {
}
float d = containerDiagonal();
float labScale = d * .00080f;
float labScale = d * .00090f;
float buttonDim = d * 0.05f;
firstRowContainer.setSize(cw, ch * 0.2f);
firstRowContainer.setPosition(tableContainer.getX(), ch * 0.1f);
firstRowContainer.fill();
helpDlg.setScale(d * 0.00075f);
helpDlg.setPosition(width / 2, height / 2);
instLab.setFontScale(labScale);
backBtn.getLabel().setFontScale(labScale);
setBtn.getLabel().setFontScale(labScale);
@ -139,10 +136,10 @@ public class PlayerChooseScreen extends MyScreen {
playBtn.getLabel().setFontScale(labScale);
firstRowTable.add(backBtn).fillX().expandX().space(cw * 0.005f).width(buttonDim).height(buttonDim);
firstRowTable.add(instLab).space(cw * 0.25f);
firstRowTable.add(instLab).space(cw * 0.25f).width(cw / 2);
firstRowTable.add(setBtn).fillX().expandX().space(cw * 0.005f).height(buttonDim);
firstRowTable.add(helpBtn).fillX().expandX().space(cw * 0.005f).width(buttonDim).height(buttonDim);
table.row().colspan(MazeSettings.MAXPLAYERS == 2 ? 2 : 4);
table.add(firstRowContainer);
@ -159,7 +156,6 @@ public class PlayerChooseScreen extends MyScreen {
}
MazePlayerLocal p;
@Override
public void update() {
// Consantly search for new players to be added

View File

@ -135,7 +135,7 @@ public class PreGameScreen extends MyScreen {
firstRowTable.clear();
float d = containerDiagonal();
float labScale = d * .00080f;
float labScale = d * .00090f;
float buttonDim = d * 0.05f;
firstRowContainer.setSize(cw, ch * 0.2f);
@ -149,7 +149,7 @@ public class PreGameScreen extends MyScreen {
playBtn.getLabel().setFontScale(labScale);
firstRowTable.add(backBtn).fillX().expandX().space(cw * 0.005f).width(buttonDim).height(buttonDim);
firstRowTable.add(instLab).space(cw * 0.25f);
firstRowTable.add(instLab).space(cw * 0.25f).width(cw / 2);
if (type == GameType.SERVER)
firstRowTable.add(setBtn).fillX().expandX().space(cw * 0.005f).height(buttonDim);
firstRowTable.add(helpBtn).fillX().expandX().space(cw * 0.005f).width(buttonDim).height(buttonDim);

View File

@ -115,7 +115,7 @@ public class ServerJoinScreen extends MyScreen {
float d = containerDiagonal();
float labScale = d * .00080f;
float labScale = d * .00090f;
float buttonDim = d * 0.05f;
firstRowContainer.setSize(cw, ch * 0.2f);
@ -127,7 +127,7 @@ public class ServerJoinScreen extends MyScreen {
helpBtn.getLabel().setFontScale(labScale);
firstRowTable.add(backBtn).fillX().expandX().space(cw * 0.005f).width(buttonDim).height(buttonDim);
firstRowTable.add(instLab).space(cw * 0.25f);
firstRowTable.add(instLab).space(cw * 0.25f).width(cw / 2);
firstRowTable.add(helpBtn).fillX().expandX().space(cw * 0.005f).width(buttonDim).height(buttonDim);
table.row().colspan(4);

View File

@ -123,7 +123,7 @@ public class ServerLaunchScreen extends MyScreen {
firstRowTable.clear();
float d = containerDiagonal();
float labScale = d * .00080f;
float labScale = d * .00090f;
float buttonDim = d * 0.05f;
firstRowContainer.setSize(cw, ch * 0.2f);
@ -135,7 +135,7 @@ public class ServerLaunchScreen extends MyScreen {
helpBtn.getLabel().setFontScale(labScale);
firstRowTable.add(backBtn).fillX().expandX().space(cw * 0.005f).width(buttonDim).height(buttonDim);
firstRowTable.add(instLab).space(cw * 0.25f);
firstRowTable.add(instLab).space(cw * 0.25f).width(cw / 2);
firstRowTable.add(helpBtn).fillX().expandX().space(cw * 0.005f).width(buttonDim).height(buttonDim);
table.row().colspan(4);

View File

@ -141,7 +141,7 @@ public class SettingsScreen extends MyScreen {
float d = containerDiagonal();
float labScale = d * .00080f;
float labScale = d * .00090f;
float buttonDim = d * 0.05f;
firstRowContainer.setSize(cw, ch * 0.2f);
@ -155,7 +155,7 @@ public class SettingsScreen extends MyScreen {
saveBtn.getLabel().setFontScale(labScale);
firstRowTable.add(backBtn).fillX().expandX().space(cw * 0.005f).width(buttonDim).height(buttonDim);
firstRowTable.add(instLab).space(cw * 0.25f);
firstRowTable.add(instLab).space(cw * 0.25f).width(cw / 2);
firstRowTable.add(helpBtn).fillX().expandX().space(cw * 0.005f).width(buttonDim).height(buttonDim);;
table.row().colspan(4);