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

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

@@ -11,6 +11,7 @@ public enum Asset {
cir, cir,
heer, heer,
jet, jet,
jet_noGear("Models/jet/jet_noGear.j3o", "Models/jet/jet_diff.png"),
lw, lw,
marine, marine,
node_home_blue("Models/node_home/node_home.j3o", "Models/node_home/node_home_blue_diff.png"), node_home_blue("Models/node_home/node_home.j3o", "Models/node_home/node_home_blue_diff.png"),

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,5,6,3,6); die = new Die(2,1,6,2,1,3);
} }
/** /**