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

Version 1.0 #40

Merged
j23f0779 merged 947 commits from development2 into main 2024-12-13 10:26:49 +01:00
Conversation 2 Commits 947 Files Changed 528 +4 -9
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0c7030659a - Show all commits

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

@@ -848,12 +848,7 @@ private void throwMatrix(UUID uuid) {
app.getAcousticHandler().playSound(MdgaSound.MATRIX); app.getAcousticHandler().playSound(MdgaSound.MATRIX);
Spatial piece = pieces.get(uuid).getSpatial(); Spatial piece = pieces.get(uuid).getSpatial();
piece.addControl(new MatrixAnimation(app, radarPos,()-> { piece.addControl(new MatrixAnimation(app, radarPos,()-> {
piece.addControl(new FadeControl(1,1,0, throwPieceAnim(uuid);
() -> {
throwPiece(uuid);
piece.addControl(new FadeControl(1,0,1));
}
));
})); }));
} }

6
Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
View File

@@ -87,9 +87,9 @@ public Game() {
gameStatistics = new Statistic(); gameStatistics = new Statistic();
initializeDrawPile(); initializeDrawPile();
board = new Board(); board = new Board();
die = new Die(1,2,3, die = new Die(1,2,3,4,
5,1,1, //SHIELD 5, 1,1,1
3); //MODIFIER );
} }
/** /**