diff --git a/Millions-1.1.0-installer.exe b/Millions-1.1.0-installer.exe deleted file mode 100644 index 192a42e..0000000 Binary files a/Millions-1.1.0-installer.exe and /dev/null differ diff --git a/Millions.exe b/Millions.exe deleted file mode 100644 index 065600d..0000000 Binary files a/Millions.exe and /dev/null differ diff --git a/pom.xml b/pom.xml index a210996..2921a8a 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,8 @@ META-INF/*.SF META-INF/*.DSA META-INF/*.RSA + module-info.class + META-INF/versions/*/module-info.class @@ -111,17 +113,27 @@ 1.6.0 Millions - 1.0.0 + 1.2.0 edu.ntnu.idi.idatt2003.gruppe42 target target/dist Millions-1.0-SNAPSHOT.jar edu.ntnu.idi.idatt2003.gruppe42.Launcher - DMG - src/main/resources/images/app_icon.icns + EXE + src/main/resources/images/app_icon.ico + + + + + true + true + true + true + Millions + true diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/controller/GameController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/controller/GameController.java index cfc5eaf..0f70299 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/controller/GameController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/controller/GameController.java @@ -64,7 +64,7 @@ public void setGameState(final GameState gameState) { public void startGame() { timer = new Timer(true); final int delay = 0; - final int period = 10; + final int period = 1000; timer.scheduleAtFixedRate(new TimerTask() { @Override