merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
14 changed files with 686 additions and 117 deletions
Showing only changes of commit 0d9a922f55 - Show all commits

View File

@@ -1,40 +0,0 @@
package pp.mdga.message.server;
import com.jme3.network.serializing.Serializable;
import pp.mdga.game.Color;
import pp.mdga.game.PlayerData;
@Serializable
public class PlayerDataMessage extends ServerMessage{
private final PlayerData playerData;
private final Color color;
public PlayerDataMessage(PlayerData playerData, Color color){
super();
this.playerData = playerData;
this.color = color;
}
private PlayerDataMessage(){
this(null, null);
}
@Override
public void accept(ServerInterpreter interpreter) {
interpreter.received(this);
}
@Override
public String getInfoTextKey() {
return "";
}
public PlayerData getPlayerData(){
return playerData;
}
public Color getColor(){
return color;
}
}

View File

@@ -1,33 +0,0 @@
package pp.mdga.message.server;
import com.jme3.network.serializing.Serializable;
import pp.mdga.game.Board;
@Serializable
public class StartBriefingMessage extends ServerMessage {
private final Board board;
public StartBriefingMessage(Board board) {
super();
this.board = board;
}
private StartBriefingMessage() {
this(null);
}
public Board getBoard() {
return this.board;
}
@Override
public void accept(ServerInterpreter interpreter) {
interpreter.received(this);
}
@Override
public String getInfoTextKey() {
return "";
}
}