peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +4
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ce55ca8bb5 - Show all commits

1
Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
View File

@@ -156,6 +156,7 @@ else if(boardSelect != null) {
p = UUID.randomUUID(); p = UUID.randomUUID();
gameView.getBoardHandler().addPlayer(Color.AIRFORCE,List.of(p,UUID.randomUUID(),UUID.randomUUID(),UUID.randomUUID())); gameView.getBoardHandler().addPlayer(Color.AIRFORCE,List.of(p,UUID.randomUUID(),UUID.randomUUID(),UUID.randomUUID()));
gameView.getBoardHandler().movePieceStartAnim(p,0); gameView.getBoardHandler().movePieceStartAnim(p,0);
gameView.getBoardHandler().outlineMove(List.of(p),List.of(2),List.of(false));
//gameView.getBoardHandler().movePieceAnim(p,0, 8); //gameView.getBoardHandler().movePieceAnim(p,0, 8);
} else { } else {
gameView.getBoardHandler().throwPiece(p, Color.ARMY); gameView.getBoardHandler().throwPiece(p, Color.ARMY);

2
Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
View File

@@ -676,6 +676,7 @@ public void pieceSelect(PieceControl pieceSelected) {
} }
else { else {
pieceSelected.unSelect(); pieceSelected.unSelect();
selectedPieceNodeMap.get(pieceSelected).highlight();
selectedOwnPiece = null; selectedOwnPiece = null;
} }
} }
@@ -717,6 +718,7 @@ public void clearSelectable(){
outlineNodes.clear(); outlineNodes.clear();
selectableEnemyPieces.clear(); selectableEnemyPieces.clear();
selectableOwnPieces.clear(); selectableOwnPieces.clear();
selectedPieceNodeMap.clear();
selectedEnemyPiece = null; selectedEnemyPiece = null;
selectedOwnPiece = null; selectedOwnPiece = null;
} }

1
Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java
View File

@@ -96,6 +96,7 @@ public void rollDice(int diceNum, Runnable actionAfter) {
if (isRolling) return; if (isRolling) return;
spin = false; spin = false;
slerp = false; slerp = false;
timeElapsed = 0;
this.actionAfter = actionAfter; this.actionAfter = actionAfter;
angularVelocity.set( angularVelocity.set(
FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX), FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX),