diff --git a/android/release/android-release.apk b/android/release/android-release.apk index 7c3729b..75cc051 100644 Binary files a/android/release/android-release.apk and b/android/release/android-release.apk differ diff --git a/android/release/output.json b/android/release/output.json index 76182a3..d1d1475 100644 --- a/android/release/output.json +++ b/android/release/output.json @@ -1 +1,20 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"android-release.apk","fullName":"release","baseName":"release"},"path":"android-release.apk","properties":{}}] \ No newline at end of file +{ + "version": 1, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.throwgame.main", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "properties": [], + "versionCode": 1, + "versionName": "1", + "enabled": true, + "outputFile": "android-release.apk" + } + ] +} \ No newline at end of file diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index d79c1af..bc26d85 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1,6 +1,6 @@ - Throwgame + Orbital Throw diff --git a/android/src/com/throwgame/main/AndroidLauncher.java b/android/src/com/throwgame/main/AndroidLauncher.java index f91163e..889a9c5 100644 --- a/android/src/com/throwgame/main/AndroidLauncher.java +++ b/android/src/com/throwgame/main/AndroidLauncher.java @@ -17,6 +17,7 @@ public class AndroidLauncher extends AndroidApplication { super.onCreate(savedInstanceState); AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); Controller controller = new Controller(); + initialize(controller, config); } } diff --git a/core/src/view/Gamescreen.java b/core/src/view/Gamescreen.java index 090ed0d..1ffcc87 100644 --- a/core/src/view/Gamescreen.java +++ b/core/src/view/Gamescreen.java @@ -209,7 +209,8 @@ public class Gamescreen{ shapeRenderer.rect(object.getX(), object.getY(), object.getWidth(), object.getHeight()); } } - + + */ shapeRenderer.setColor(Color.BLACK); for(Button button : buttons){ shapeRenderer.rectLine(button.getxPos(), button.getyPos(), button.getxPos() + button.getWidth(), button.getyPos(), 4); @@ -225,8 +226,6 @@ public class Gamescreen{ shapeRenderer.begin(ShapeRenderer.ShapeType.Filled); } - */ - shapeRenderer.setColor(Color.GRAY); diff --git a/core/src/view/Titlescreen.java b/core/src/view/Titlescreen.java index 79952a9..87274b0 100644 --- a/core/src/view/Titlescreen.java +++ b/core/src/view/Titlescreen.java @@ -72,7 +72,7 @@ public class Titlescreen{ public void render(SpriteBatch batch) { font.getData().setScale(6); - font.draw(batch, "THROWGAME", GAME_WORLD_WIDTH / 2 - getTextWidth("THROWGAME") / 2, GAME_WORLD_HEIGHT * 0.9f); + font.draw(batch, "ORBITAL THROW", GAME_WORLD_WIDTH / 2 - getTextWidth("ORBITAL THROW") / 2, GAME_WORLD_HEIGHT * 0.9f); font.getData().setScale(2); clicktostartX = GAME_WORLD_WIDTH / 2 - getTextWidth("click to start ...") / 2; font.draw(batch, "click to start ...", clicktostartX, clicktostartY); diff --git a/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java b/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java index adc874a..a017609 100644 --- a/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java +++ b/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java @@ -11,6 +11,7 @@ public class DesktopLauncher { config.fullscreen = false; config.height = 900; config.width = 1600; + config.title = "Orbital Throw"; new LwjglApplication(new Controller(), config); } } diff --git a/levels/chapter5/level2.json b/levels/chapter5/level2.json index 335271c..07d48f4 100644 --- a/levels/chapter5/level2.json +++ b/levels/chapter5/level2.json @@ -1 +1 @@ -{goal:{xPos:1084,yPos:456,sizeX:250,sizeY:140,thickness:0.2},projectile:{xPos:264,yPos:378,mass:5,radius:10},math:{},xPosPivot:264,yPosPivot:228,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[{x:605,y:261,width:200,height:100},{x:605,y:337,width:200,height:100},{x:604,y:417,width:200,height:100},{x:604,y:492,width:200,height:100},{x:603,y:559,width:200,height:100},{x:602,y:643,width:200,height:100},{x:603,y:707,width:200,height:100},{x:603,y:772,width:200,height:100}]} \ No newline at end of file +{goal:{xPos:1084,yPos:456,sizeX:250,sizeY:300,thickness:0.2},projectile:{xPos:264,yPos:378,mass:5,radius:10},math:{},xPosPivot:264,yPosPivot:228,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[{x:605,y:261,width:200,height:100},{x:605,y:337,width:200,height:100},{x:604,y:417,width:200,height:100},{x:604,y:492,width:200,height:100},{x:603,y:559,width:200,height:100},{x:602,y:643,width:200,height:100},{x:603,y:707,width:200,height:100},{x:603,y:772,width:200,height:100}]} \ No newline at end of file