merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
197 changed files with 10806 additions and 1939 deletions
Showing only changes of commit 2e1fe3c050 - Show all commits

View File

@@ -47,6 +47,11 @@ public void setState(TurnStates state){
this.state = state;
}
@Override
public void selectDice(){
state.selectDice();
}
@Override
public void selectPiece(Piece piece){
state.selectPiece(piece);

View File

@@ -37,11 +37,17 @@ public void selectDice(){
logic.send(new RequestDieMessage());
}
@Override
public void received(DieMessage msg){
logic.getGame().setDiceEyes(msg.getDiceEye());
parent.setState(parent.getChoosePiece());
logic.addNotification(new RollDiceNotification(logic.getGame().getPlayerById(logic.getOwnPlayerId()).getColor(), msg.getDiceEye(),false));
}
// @Override
// public void received(ChoosePieceStateMessage msg){
// parent.setState(parent.getChoosePiece());
// }
@Override
public void received(NoTurnMessage msg){
parent.getParent().setState(parent.getParent().getWaiting());