merge the new developmentbranch into the test branch #39
@@ -156,6 +156,7 @@ else if(boardSelect != null) {
|
||||
p = UUID.randomUUID();
|
||||
gameView.getBoardHandler().addPlayer(Color.AIRFORCE,List.of(p,UUID.randomUUID(),UUID.randomUUID(),UUID.randomUUID()));
|
||||
gameView.getBoardHandler().movePieceStartAnim(p,0);
|
||||
gameView.getBoardHandler().outlineMove(List.of(p),List.of(2),List.of(false));
|
||||
//gameView.getBoardHandler().movePieceAnim(p,0, 8);
|
||||
} else {
|
||||
gameView.getBoardHandler().throwPiece(p, Color.ARMY);
|
||||
|
||||
@@ -676,6 +676,7 @@ public void pieceSelect(PieceControl pieceSelected) {
|
||||
}
|
||||
else {
|
||||
pieceSelected.unSelect();
|
||||
selectedPieceNodeMap.get(pieceSelected).highlight();
|
||||
selectedOwnPiece = null;
|
||||
}
|
||||
}
|
||||
@@ -717,6 +718,7 @@ public void clearSelectable(){
|
||||
outlineNodes.clear();
|
||||
selectableEnemyPieces.clear();
|
||||
selectableOwnPieces.clear();
|
||||
selectedPieceNodeMap.clear();
|
||||
selectedEnemyPiece = null;
|
||||
selectedOwnPiece = null;
|
||||
}
|
||||
|
||||
@@ -96,6 +96,7 @@ public void rollDice(int diceNum, Runnable actionAfter) {
|
||||
if (isRolling) return;
|
||||
spin = false;
|
||||
slerp = false;
|
||||
timeElapsed = 0;
|
||||
this.actionAfter = actionAfter;
|
||||
angularVelocity.set(
|
||||
FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX),
|
||||
|
||||
Reference in New Issue
Block a user