Skip to content
Snippets Groups Projects
Commit 2e3ac92a authored by Petter Selfors Rølvåg's avatar Petter Selfors Rølvåg
Browse files

Merge branch 'main-game-transition' into 'dev'

Main game transition

See merge request !10
parents c5e29e01 56010f36
No related branches found
No related tags found
2 merge requests!13Dev,!10Main game transition
Showing
with 50 additions and 6 deletions
No preview for this file type
<component name="libraryTable">
<library name="Gradle: org.javatuples:javatuples:1.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.javatuples/javatuples/1.2/507312ac4b601204a72a83380badbca82683dd36/javatuples-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.javatuples/javatuples/1.2/a7495f5370bdfcf46c6f3c6ed0badf52877aa467/javatuples-1.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
CheckersClient/android/assets/Menu/1x/Lobby.png

16.4 KiB

CheckersClient/android/assets/Menu/1x/LobbyMenu@1x.png

181 KiB | W: | H:

CheckersClient/android/assets/Menu/1x/LobbyMenu@1x.png

198 KiB | W: | H:

CheckersClient/android/assets/Menu/1x/LobbyMenu@1x.png
CheckersClient/android/assets/Menu/1x/LobbyMenu@1x.png
CheckersClient/android/assets/Menu/1x/LobbyMenu@1x.png
CheckersClient/android/assets/Menu/1x/LobbyMenu@1x.png
  • 2-up
  • Swipe
  • Onion skin
CheckersClient/android/assets/Menu/1x/MainMenu@1x.png

144 KiB | W: | H:

CheckersClient/android/assets/Menu/1x/MainMenu@1x.png

163 KiB | W: | H:

CheckersClient/android/assets/Menu/1x/MainMenu@1x.png
CheckersClient/android/assets/Menu/1x/MainMenu@1x.png
CheckersClient/android/assets/Menu/1x/MainMenu@1x.png
CheckersClient/android/assets/Menu/1x/MainMenu@1x.png
  • 2-up
  • Swipe
  • Onion skin
CheckersClient/android/assets/Menu/1x/MrServer.png

17.1 KiB

CheckersClient/android/assets/Menu/1x/MrServerBubblePointer.png

2.32 KiB

CheckersClient/android/assets/Menu/1x/MrServerBubbleSquare.png

3.13 KiB

CheckersClient/android/assets/Menu/1x/PlayerReady.png

5.29 KiB

CheckersClient/android/assets/Menu/1x/PlayerReadyCheck.png

18.4 KiB

CheckersClient/android/assets/Menu/1x/SpaceCheckersLogoWithBackground.png

34.6 KiB

CheckersClient/android/assets/characters/MrServer1@1x.png

27.2 KiB

CheckersClient/android/assets/characters/MrServer2@1x.png

27.2 KiB

CheckersClient/android/assets/characters/MrServer3@1x.png

27.1 KiB

CheckersClient/android/assets/characters/MrServerName.png

5.72 KiB

CheckersClient/android/assets/characters/MrServerPortrait@1x.png

59.4 KiB

......@@ -13,8 +13,6 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.5.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
......@@ -53,6 +51,7 @@ project(":desktop") {
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
implementation group: "com.esotericsoftware", name: 'kryonet', version: "2.22.0-RC1"
implementation group: "org.javatuples", name: 'javatuples', version: "1.2"
}
}
......@@ -79,6 +78,7 @@ project(":android") {
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
implementation group: "com.esotericsoftware", name: 'kryonet', version: "2.22.0-RC1"
implementation group: "org.javatuples", name: 'javatuples', version: "1.2"
}
}
......@@ -92,5 +92,6 @@ project(":core") {
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
implementation group: "com.esotericsoftware", name: 'kryonet', version: "2.22.0-RC1"
implementation group: "org.javatuples", name: 'javatuples', version: "1.2"
}
}
\ No newline at end of file
......@@ -11,6 +11,9 @@ import com.mygdx.game.model.Lobby;
import com.mygdx.game.model.Player;
import com.mygdx.game.views.tokens.PlayerAvatar;
import org.javatuples.Pair;
import org.javatuples.Tuple;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
......@@ -27,7 +30,7 @@ public class NetworkController {
client.start();
try {
//192.168.87.34
String IP4_LAN_ADDRESS = "192.168.10.154";
String IP4_LAN_ADDRESS = "192.168.87.23";
client.connect(10000, IP4_LAN_ADDRESS, 54555, 54777);
} catch (IOException e) {
e.printStackTrace();
......@@ -53,6 +56,9 @@ public class NetworkController {
kryo.register(cLobbyDelete.class, 23);
kryo.register(cLobbyGetList.class, 24);
kryo.register(cSetIndexAvatar.class, 25);
kryo.register(cSetPlayerReady.class, 26);
kryo.register(cSetPlayerName.class, 27);
kryo.register(cStartGame.class, 28);
}
public Client getClient() { return client; }
......
package com.mygdx.game.controllers;
import com.badlogic.gdx.utils.Null;
import com.esotericsoftware.kryonet.Connection;
import com.esotericsoftware.kryonet.Listener;
import com.mygdx.game.controllers.commands.*;
import com.mygdx.game.model.Lobby;
import com.mygdx.game.model.Player;
import org.javatuples.Pair;
import java.util.ArrayList;
import java.util.LinkedList;
public class PlayerController {
private NetworkController net;
......@@ -45,12 +49,20 @@ public class PlayerController {
public void lobbyGetList(){ sendCommand(new cLobbyGetList()); }
public void setLobbyPlayerReady(boolean isPlayerReady){
sendCommand(new cSetPlayerReady(isPlayerReady, lobby.getID(), player.getID()));
}
public void connectPlayer(int avatarIndex){ sendCommand(new cPlayerJoin(avatarIndex));}
public void createLobby(String name, int MAX_PLAYERS){ sendCommand(new cLobbyCreate(name, MAX_PLAYERS)); }
public void updateIndexAvatar(int indexAvatar){ sendCommand(new cSetIndexAvatar(indexAvatar)); }
public void playerSetName(String name) {
sendCommand(new cSetPlayerName(name));
}
public void deleteLobby(int id){ sendCommand(new cLobbyDelete(id)); }
public void joinLobby(int id){ sendCommand(new cLobbyJoin(id)); }
......@@ -69,6 +81,22 @@ public class PlayerController {
public void setLobbies(ArrayList<Lobby> lobbies){ this.lobbies = lobbies; }
public boolean isOwningPlayerInLobby(){
try{
if(lobby==null){
return false;
}
else if(lobby.getID() == -1){
return false;
}
else{
return true;
}
}catch (NullPointerException e){
return false;
}
}
public PlayerController getPlayerController(){ return this; }
public NetworkController getNetWorkController() { return net; }
......@@ -76,6 +104,4 @@ public class PlayerController {
public Command getLastCommand(){ return receivedCommands.getFirst(); }
}
......@@ -7,7 +7,7 @@ import com.mygdx.game.model.Lobby;
public class cSetIndexAvatar extends Command {
public cSetIndexAvatar() { super("cLobbyJoin"); }
public cSetIndexAvatar() { super("cSetIndexAvatar"); }
public cSetIndexAvatar(int indexAvatar) {
super("cSetIndexAvatar", indexAvatar);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment