Merge dev/client_beck
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
public enum Asset {
|
public enum Asset {
|
||||||
bigTent,
|
bigTent,
|
||||||
cardStack,
|
cardStack,
|
||||||
cir("Models/lcir/cir_newOrigin.obj"),
|
cir("Models/+cir/cir_newOrigin.obj"),
|
||||||
heer("Models/heer/heer_newOrigin.obj"),
|
heer("Models/heer/heer_newOrigin.obj"),
|
||||||
jet,
|
jet,
|
||||||
lw("Models/lw/lw_newOrigin.obj"),
|
lw("Models/lw/lw_newOrigin.obj"),
|
||||||
|
|||||||
@@ -53,6 +53,8 @@ public void simpleInitApp() {
|
|||||||
notificationSynchronizer = new NotificationSynchronizer(this);
|
notificationSynchronizer = new NotificationSynchronizer(this);
|
||||||
inputSynchronizer = new InputSynchronizer(this);
|
inputSynchronizer = new InputSynchronizer(this);
|
||||||
modelSyncronizer = new ModelSyncronizer(this);
|
modelSyncronizer = new ModelSyncronizer(this);
|
||||||
|
|
||||||
|
enter(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
package pp.mdga.client;
|
package pp.mdga.client;
|
||||||
|
|
||||||
|
import pp.mdga.client.board.BoardHandler;
|
||||||
|
import pp.mdga.client.gui.GuiHandler;
|
||||||
|
import pp.mdga.client.view.CeremonyView;
|
||||||
import pp.mdga.client.view.GameView;
|
import pp.mdga.client.view.GameView;
|
||||||
import pp.mdga.client.view.LobbyView;
|
import pp.mdga.client.view.LobbyView;
|
||||||
import pp.mdga.game.Color;
|
import pp.mdga.game.Color;
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ public void onEnter() {
|
|||||||
camera.init();
|
camera.init();
|
||||||
boardHandler.init();
|
boardHandler.init();
|
||||||
guiHandler.init();
|
guiHandler.init();
|
||||||
continueButton.show();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -84,8 +83,6 @@ public void onEnter() {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLeave() {
|
public void onLeave() {
|
||||||
continueButton.hide();
|
|
||||||
|
|
||||||
camera.shutdown();
|
camera.shutdown();
|
||||||
boardHandler.shutdown();
|
boardHandler.shutdown();
|
||||||
guiHandler.shutdown();
|
guiHandler.shutdown();
|
||||||
|
|||||||
@@ -4,17 +4,14 @@
|
|||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
public class ThrowPieceNotification extends Notification{
|
public class ThrowPieceNotification extends Notification {
|
||||||
|
|
||||||
private UUID pieceId;
|
private UUID pieceId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This constructor is used to create a new ThrowPieceNotification
|
* This constructor is used to create a new ThrowPieceNotification
|
||||||
*
|
*
|
||||||
* @param pieceId1 the pieceId1
|
* @param pieceId the pieceId
|
||||||
* @param pieceId2 the pieceId2
|
|
||||||
* @param nodeIndex the nodeIndex
|
|
||||||
* @param colorPiece2 the color
|
|
||||||
*/
|
*/
|
||||||
public ThrowPieceNotification(UUID pieceId) {
|
public ThrowPieceNotification(UUID pieceId) {
|
||||||
this.pieceId = pieceId;
|
this.pieceId = pieceId;
|
||||||
|
|||||||
Reference in New Issue
Block a user