summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--android/assets/data/menu.atlas28
-rw-r--r--android/assets/data/menu.pngbin167431 -> 112827 bytes
-rw-r--r--assets/menu/lnl.pngbin8175 -> 0 bytes
-rw-r--r--assets/menu/logo.pngbin71797 -> 0 bytes
-rw-r--r--core/src/ch/asynk/creepingarmor/screens/MenuScreen.java6
5 files changed, 7 insertions, 27 deletions
diff --git a/android/assets/data/menu.atlas b/android/assets/data/menu.atlas
index 7677131..92bd78a 100644
--- a/android/assets/data/menu.atlas
+++ b/android/assets/data/menu.atlas
@@ -1,61 +1,47 @@
menu.png
-size: 1024,512
+size: 1024,256
format: RGBA8888
filter: Nearest,Nearest
repeat: none
from
rotate: false
- xy: 251, 184
+ xy: 2, 2
size: 190, 217
orig: 190, 217
offset: 0, 0
index: -1
ge-flag
rotate: false
- xy: 2, 2
+ xy: 386, 118
size: 153, 101
orig: 153, 101
offset: 0, 0
index: -1
-lnl
- rotate: false
- xy: 251, 117
- size: 270, 65
- orig: 270, 65
- offset: 0, 0
- index: -1
-logo
- rotate: false
- xy: 2, 105
- size: 247, 296
- orig: 247, 296
- offset: 0, 0
- index: -1
move
rotate: false
- xy: 790, 287
+ xy: 667, 105
size: 100, 114
orig: 100, 114
offset: 0, 0
index: -1
to
rotate: false
- xy: 443, 184
+ xy: 194, 2
size: 190, 217
orig: 190, 217
offset: 0, 0
index: -1
unit
rotate: false
- xy: 635, 177
+ xy: 541, 95
size: 124, 124
orig: 124, 124
offset: 0, 0
index: -1
us-flag
rotate: false
- xy: 635, 303
+ xy: 386, 18
size: 153, 98
orig: 153, 98
offset: 0, 0
diff --git a/android/assets/data/menu.png b/android/assets/data/menu.png
index 4eecb8b..ef80642 100644
--- a/android/assets/data/menu.png
+++ b/android/assets/data/menu.png
Binary files differ
diff --git a/assets/menu/lnl.png b/assets/menu/lnl.png
deleted file mode 100644
index 9338d3e..0000000
--- a/assets/menu/lnl.png
+++ /dev/null
Binary files differ
diff --git a/assets/menu/logo.png b/assets/menu/logo.png
deleted file mode 100644
index eb86f82..0000000
--- a/assets/menu/logo.png
+++ /dev/null
Binary files differ
diff --git a/core/src/ch/asynk/creepingarmor/screens/MenuScreen.java b/core/src/ch/asynk/creepingarmor/screens/MenuScreen.java
index 536b72f..92d4ba9 100644
--- a/core/src/ch/asynk/creepingarmor/screens/MenuScreen.java
+++ b/core/src/ch/asynk/creepingarmor/screens/MenuScreen.java
@@ -47,8 +47,6 @@ public class MenuScreen implements Screen
private Sprite to;
private Sprite geFlag;
private Sprite usFlag;
- private Sprite lnl;
- private Sprite logo;
private MainMenu mainMenu;
private OptionsMenu optionsMenu;
@@ -79,8 +77,6 @@ public class MenuScreen implements Screen
this.to = new Sprite(game.menuAtlas.findRegion("to"));
this.usFlag = new Sprite(game.menuAtlas.findRegion("us-flag"));
this.geFlag = new Sprite(game.menuAtlas.findRegion("ge-flag"));
- this.lnl = new Sprite(game.menuAtlas.findRegion("lnl"));
- this.logo = new Sprite(game.menuAtlas.findRegion("logo"));
this.mainMenu = new MainMenu(game.fontB, game.uiAtlas);
this.optionsMenu = new OptionsMenu(game, game.fontB, game.uiAtlas);
@@ -186,8 +182,6 @@ public class MenuScreen implements Screen
batch.setProjectionMatrix(camera.uiCombined());
batch.begin();
- batch.draw(logo, OFFSET, (camera.getScreenHeight() - logo.getRegionHeight() - OFFSET));
- batch.draw(lnl, (camera.getScreenWidth() - lnl.getRegionWidth() - (2 * OFFSET)), (2 * OFFSET));
mainMenu.draw(batch);
optionsMenu.draw(batch);
scenariosMenu.draw(batch);