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 +14040 -2669
264 changed files with 14040 additions and 2669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 38687b6d25 - Show all commits

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

@@ -66,7 +66,7 @@ public class MdgaApp extends SimpleApplication {
private ServerConnection networkConnection;
public static final int DEBUG_MULTIPLIER = 1;
public static final int DEBUG_MULTIPLIER = 0;
public MdgaApp() {
networkConnection = new NetworkSupport(this);

2
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java
View File

@@ -42,7 +42,7 @@ public void received(DiceNowMessage msg) {
@Override
public void received(DieMessage msg) {
logic.getGame().setDiceEyes(msg.getDiceEye());
if(logic.getGame()){
if(logic.getGame().getTurboFlag()){
logic.addNotification(new RollDiceNotification(logic.getGame().getPlayerById(logic.getOwnPlayerId()).getColor(), msg.getDiceEye()));
}
else {

7
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java
View File

@@ -51,11 +51,12 @@ public void selectDice(){
public void received(DieMessage msg){
logic.getGame().setDiceEyes(msg.getDiceEye());
if(logic.getGame()){
logic.addNotification(new RollDiceNotification(logic.getGame().getPlayerById(logic.getOwnPlayerId()).getColor(), msg.getDiceEye()));
if(logic.getGame().getTurboFlag()){
logic.addNotification(new RollDiceNotification(logic.getGame().getPlayerById(logic.getOwnPlayerId()).getColor(), msg.getDiceEye(), logic.getGame().getDiceModifier()));
}
else {
logic.addNotification(new RollDiceNotification(logic.getGame().getPlayerById(logic.getOwnPlayerId()).getColor(), msg.getDiceEye(), logic.getGame().getDiceModifier()));
logic.addNotification(new RollDiceNotification(logic.getGame().getPlayerById(logic.getOwnPlayerId()).getColor(), msg.getDiceEye()));
}
}