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

merge dev into test #33

Merged
j23f0712 merged 36 commits from development into dev/test 2024-12-02 17:37:00 +01:00
Conversation 2 Commits 36 Files Changed 60 +1319 -416
60 changed files with 1319 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f21fd9b0a6 - Show all commits

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

@@ -100,7 +100,6 @@ public void onAction(String name, boolean isPressed, float tpf) {
if(diceSelect != null) { if(diceSelect != null) {
app.getModelSynchronize().rolledDice(); app.getModelSynchronize().rolledDice();
gameView.getGuiHandler().hideText();
} }
else if(cardLayerSelect != null) { else if(cardLayerSelect != null) {
//cardSelect //cardSelect

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

@@ -82,6 +82,7 @@ public static void main(String[] args) {
MdgaApp app = new MdgaApp(); MdgaApp app = new MdgaApp();
app.setSettings(settings); app.setSettings(settings);
app.setShowSettings(false); app.setShowSettings(false);
app.setPauseOnLostFocus(false);
app.start(); app.start();
} }

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

@@ -148,6 +148,7 @@ private void handleGame(Notification notification) {
} else if (notification instanceof ResumeNotification) { } else if (notification instanceof ResumeNotification) {
//TODO //TODO
} else if (notification instanceof RollDiceNotification n) { } else if (notification instanceof RollDiceNotification n) {
gameView.getGuiHandler().hideText();
if(n.getColor() == gameView.getOwnColor()){ if(n.getColor() == gameView.getOwnColor()){
guiHandler.rollDice(n.getEyes(), n.isTurbo() ? n.getMultiplier() : -1); guiHandler.rollDice(n.getEyes(), n.isTurbo() ? n.getMultiplier() : -1);
} }

8
Projekte/mdga/model/src/main/java/pp/mdga/notification/RollDiceNotification.java
View File

@@ -18,6 +18,14 @@ public class RollDiceNotification extends Notification{
* @param color the color of the player that rolled the die. * @param color the color of the player that rolled the die.
* @param eyes the number of eyes that were rolled. * @param eyes the number of eyes that were rolled.
*/ */
public RollDiceNotification(Color color, int eyes) {
this.color = color;
this.eyes = eyes;
this.turbo = false;
this.multiplier = -1;
this.isRanking = false;
}
public RollDiceNotification(Color color, int eyes, boolean isRanking) { public RollDiceNotification(Color color, int eyes, boolean isRanking) {
this.color = color; this.color = color;
this.eyes = eyes; this.eyes = eyes;