peet/Gruppe-01-fin

merge the new developmentbranch into the test branch #39

Closed

j23f0712 wants to merge 431 commits from development2 into dev/test

1 changed files with 1 additions and 0 deletions

Showing only changes of commit 44f893ccef - Show all commits

									
										1

Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
									
												View File
												
					@@ -65,6 +65,7 @@ public Game() {

					            drawPile.add(BonusCard.SHIELD);

					            drawPile.add(BonusCard.SHIELD);

					        }

					        }

					        board = new Board();

					        board = new Board();

					        die = new Die();

					    }

					    }

					    /**

					    /**