merge development into test #26

Merged
j23f0712 merged 95 commits from development into dev/test 2024-12-01 21:02:48 +01:00
5 changed files with 8 additions and 9 deletions
Showing only changes of commit ae1ec74056 - Show all commits

View File

@@ -3,7 +3,7 @@
public enum Asset {
bigTent,
cardStack,
cir("Models/lcir/cir_newOrigin.obj"),
cir("Models/+cir/cir_newOrigin.obj"),
heer("Models/heer/heer_newOrigin.obj"),
jet,
lw("Models/lw/lw_newOrigin.obj"),

View File

@@ -53,6 +53,8 @@ public void simpleInitApp() {
notificationSynchronizer = new NotificationSynchronizer(this);
inputSynchronizer = new InputSynchronizer(this);
modelSyncronizer = new ModelSyncronizer(this);
enter(state);
}
@Override

View File

@@ -1,5 +1,8 @@
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.LobbyView;
import pp.mdga.game.Color;

View File

@@ -63,7 +63,6 @@ public void onEnter() {
camera.init();
boardHandler.init();
guiHandler.init();
continueButton.show();
@@ -84,8 +83,6 @@ public void onEnter() {
@Override
public void onLeave() {
continueButton.hide();
camera.shutdown();
boardHandler.shutdown();
guiHandler.shutdown();

View File

@@ -11,10 +11,7 @@ public class ThrowPieceNotification extends Notification{
/**
* This constructor is used to create a new ThrowPieceNotification
*
* @param pieceId1 the pieceId1
* @param pieceId2 the pieceId2
* @param nodeIndex the nodeIndex
* @param colorPiece2 the color
* @param pieceId the pieceId
*/
public ThrowPieceNotification(UUID pieceId) {
this.pieceId = pieceId;