Merge work #7

Merged
fkoppe merged 31 commits from dev/client_koppe into dev/client 2024-11-20 13:50:01 +01:00
35 changed files with 53 additions and 53 deletions
Showing only changes of commit 9662e1f684 - Show all commits

View File

@@ -6,7 +6,7 @@
<option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$" /> <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="pp.mdga.client.Board.*" /> <option name="PATTERN" value="pp.mdga.client.board.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

View File

@@ -1,4 +0,0 @@
package pp.mdga.client.Animation;
public enum MdgaAnimation {
}

View File

@@ -1,5 +0,0 @@
package pp.mdga.client.Board;
class PileControl {
}

View File

@@ -1,5 +0,0 @@
package pp.mdga.client.Dialog;
public class Dialog {
}

View File

@@ -1,5 +0,0 @@
package pp.mdga.client.Dialog;
public class MenuDialog {
}

View File

@@ -1,5 +0,0 @@
package pp.mdga.client.Gui;
public class GuiView {
}

View File

@@ -2,12 +2,12 @@
import com.jme3.app.SimpleApplication; import com.jme3.app.SimpleApplication;
import com.jme3.system.NanoTimer; import com.jme3.system.NanoTimer;
import pp.mdga.client.Acoustic.AcousticHandler; import pp.mdga.client.acoustic.AcousticHandler;
import pp.mdga.client.Acoustic.MdgaSound; import pp.mdga.client.acoustic.MdgaSound;
import pp.mdga.client.Animation.AnimationHandler; import pp.mdga.client.animation.AnimationHandler;
import com.jme3.system.AppSettings; import com.jme3.system.AppSettings;
import pp.mdga.client.Board.BoardView; import pp.mdga.client.board.BoardView;
import pp.mdga.client.Dialog.DialogView; import pp.mdga.client.dialog.DialogView;
public class MdgaApp extends SimpleApplication { public class MdgaApp extends SimpleApplication {
private AnimationHandler animationHandler; private AnimationHandler animationHandler;

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Acoustic; package pp.mdga.client.acoustic;
import com.jme3.system.NanoTimer; import com.jme3.system.NanoTimer;
import pp.mdga.client.MdgaApp; import pp.mdga.client.MdgaApp;

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Acoustic; package pp.mdga.client.acoustic;
import com.jme3.audio.AudioData; import com.jme3.audio.AudioData;
import com.jme3.audio.AudioNode; import com.jme3.audio.AudioNode;

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Acoustic; package pp.mdga.client.acoustic;
import com.jme3.audio.AudioData; import com.jme3.audio.AudioData;
import com.jme3.audio.AudioNode; import com.jme3.audio.AudioNode;

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Acoustic; package pp.mdga.client.acoustic;
/** /**
* Enum representing the various sound effects used in the game. * Enum representing the various sound effects used in the game.

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Acoustic; package pp.mdga.client.acoustic;
/** /**
* Enum representing various music assets used in the game. * Enum representing various music assets used in the game.

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Acoustic; package pp.mdga.client.acoustic;
/** /**
* Enum representing various sound assets used in the game. * Enum representing various sound assets used in the game.

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Acoustic; package pp.mdga.client.acoustic;
/** /**
* A record that encapsulates a sound asset along with its playback settings: * A record that encapsulates a sound asset along with its playback settings:

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Animation; package pp.mdga.client.animation;
abstract class Animation { abstract class Animation {

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Animation; package pp.mdga.client.animation;
import pp.mdga.client.MdgaApp; import pp.mdga.client.MdgaApp;

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Animation; package pp.mdga.client.animation;
class EmptyAnimation extends Animation { class EmptyAnimation extends Animation {
@Override @Override

View File

@@ -0,0 +1,4 @@
package pp.mdga.client.animation;
public enum MdgaAnimation {
}

View File

@@ -1,3 +1,3 @@
package pp.mdga.client.Board; package pp.mdga.client.board;
record AssetOnMap(BoardAsset asset, int x, int y, float rot) {} record AssetOnMap(BoardAsset asset, int x, int y, float rot) {}

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Board; package pp.mdga.client.board;
enum BoardAsset { enum BoardAsset {
bigTent, bigTent,

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Board; package pp.mdga.client.board;
import com.jme3.light.AmbientLight; import com.jme3.light.AmbientLight;
import com.jme3.light.DirectionalLight; import com.jme3.light.DirectionalLight;

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Board; package pp.mdga.client.board;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Board; package pp.mdga.client.board;
import com.jme3.renderer.RenderManager; import com.jme3.renderer.RenderManager;
import com.jme3.renderer.ViewPort; import com.jme3.renderer.ViewPort;

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Board; package pp.mdga.client.board;
import com.jme3.renderer.RenderManager; import com.jme3.renderer.RenderManager;
import com.jme3.renderer.ViewPort; import com.jme3.renderer.ViewPort;

View File

@@ -0,0 +1,5 @@
package pp.mdga.client.board;
class PileControl {
}

View File

@@ -0,0 +1,5 @@
package pp.mdga.client.dialog;
public class Dialog {
}

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Dialog; package pp.mdga.client.dialog;
import pp.dialog.DialogManager; import pp.dialog.DialogManager;
import pp.mdga.client.MdgaApp; import pp.mdga.client.MdgaApp;

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Dialog; package pp.mdga.client.dialog;
public class InterruptDialog { public class InterruptDialog {
} }

View File

@@ -0,0 +1,5 @@
package pp.mdga.client.dialog;
public class MenuDialog {
}

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Dialog; package pp.mdga.client.dialog;
public class NetworkDialog { public class NetworkDialog {

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Dialog; package pp.mdga.client.dialog;
public class SoundDialog { public class SoundDialog {

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Dialog; package pp.mdga.client.dialog;
import com.simsilica.lemur.Checkbox; import com.simsilica.lemur.Checkbox;
import com.simsilica.lemur.Container; import com.simsilica.lemur.Container;

View File

@@ -1,4 +1,4 @@
package pp.mdga.client.Dialog; package pp.mdga.client.dialog;
public class VideoDialog { public class VideoDialog {

View File

@@ -0,0 +1,5 @@
package pp.mdga.client.gui;
public class GuiView {
}

View File

@@ -305,7 +305,7 @@ public void setGameHasStarted(Boolean gameHasStarted) {
* *
* @return the player has disconnected * @return the player has disconnected
*/ */
public Boolean getPlayerHasDisconnected() { public Boolean playerHasDisconnected() {
return playerHasDisconnected; return playerHasDisconnected;
} }