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 -1
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e27d325faa - Show all commits

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

@@ -85,7 +85,7 @@ public Game() {
gameStatistics = new Statistic(); gameStatistics = new Statistic();
initializeDrawPile(); initializeDrawPile();
board = new Board(); board = new Board();
die = new Die(2,1,6,2,1,3); die = new Die(2,1,2,2,1,3);
} }
/** /**

3
Projekte/mdga/model/src/main/java/pp/mdga/message/server/ChoosePieceStateMessage.java
View File

@@ -1,5 +1,8 @@
package pp.mdga.message.server; package pp.mdga.message.server;
import com.jme3.network.serializing.Serializable;
@Serializable
public class ChoosePieceStateMessage extends ServerMessage { public class ChoosePieceStateMessage extends ServerMessage {
public ChoosePieceStateMessage() { public ChoosePieceStateMessage() {