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

7
Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java
View File

@@ -1,5 +1,6 @@
package pp.mdga.client; package pp.mdga.client;
import pp.mdga.Resources;
import pp.mdga.game.BonusCard; import pp.mdga.game.BonusCard;
import pp.mdga.game.Color; import pp.mdga.game.Color;
import pp.mdga.game.Game; import pp.mdga.game.Game;
@@ -398,7 +399,11 @@ public void received(ServerStartGameMessage msg) {
* @param msg the SelectTSK message received. * @param msg the SelectTSK message received.
*/ */
@Override @Override
public void received(ShutdownMessage msg) {state.received(msg);} public void received(ShutdownMessage msg) {
addNotification(new InfoNotification(Resources.stringLookup("server.shutdown")));
addNotification(new StartDialogNotification());
setState(dialogsState);
}
/** /**
* Handles a IncorrectRequest message received from the server. * Handles a IncorrectRequest message received from the server.

1
Projekte/mdga/model/src/main/resources/mdga.properties
View File

@@ -1,4 +1,5 @@
lobby.deny.join=The lobby is already full. lobby.deny.join=The lobby is already full.
server.shutdown=The server has shut down.
incorrect.request.0=The selected TSK is already occupied. incorrect.request.0=The selected TSK is already occupied.
incorrect.request.1=No TSK is available for selection. incorrect.request.1=No TSK is available for selection.

1
Projekte/mdga/model/src/main/resources/mdga_de.properties
View File

@@ -1,4 +1,5 @@
lobby.deny.join=Die Lobby ist bereits voll. lobby.deny.join=Die Lobby ist bereits voll.
server.shutdown=Der Server wurde heruntergefahren.
incorrect.request.1=Die ausgewählte TSK ist bereits belegt. incorrect.request.1=Die ausgewählte TSK ist bereits belegt.
incorrect.request.2=Es gibt keine freie TSK mehr, welche ausgewählt werden kann. incorrect.request.2=Es gibt keine freie TSK mehr, welche ausgewählt werden kann.