Skip to content

Commit

Permalink
actually it's about a cool soda can
Browse files Browse the repository at this point in the history
  • Loading branch information
anhinton committed Nov 29, 2017
1 parent d6e771b commit b973be2
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 31 deletions.
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
Expand Up @@ -12,7 +12,7 @@
android:label="@string/app_name"
android:theme="@style/GdxTheme" >
<activity
android:name="nz.co.canadia.gameoffjam2017.AndroidLauncher"
android:name="nz.co.canadia.coolsodacan.AndroidLauncher"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Expand Up @@ -18,7 +18,7 @@ android {
exclude 'META-INF/robovm/ios/robovm.xml'
}
defaultConfig {
applicationId "nz.co.canadia.gameoffjam2017"
applicationId "nz.co.canadia.coolsodacan"
minSdkVersion 8
targetSdkVersion 20
}
Expand Down Expand Up @@ -71,7 +71,7 @@ task run(type: Exec) {
}

def adb = path + "/platform-tools/adb"
commandLine "$adb", 'shell', 'am', 'start', '-n', 'nz.co.canadia.gameoffjam2017/nz.co.canadia.gameoffjam2017.AndroidLauncher'
commandLine "$adb", 'shell', 'am', 'start', '-n', 'nz.co.canadia.coolsodacan/AndroidLauncher'
}

// sets up the Android Eclipse project, using the old Ant based build.
Expand Down
2 changes: 1 addition & 1 deletion android/res/values/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<string name="app_name">GameOff2017</string>
<string name="app_name">CoolSodaCan</string>

</resources>
@@ -1,10 +1,9 @@
package nz.co.canadia.gameoffjam2017;
package nz.co.canadia.coolsodacan;

import android.os.Bundle;

import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
import nz.co.canadia.gameoffjam2017.GameOffJam;

public class AndroidLauncher extends AndroidApplication {
@Override
Expand All @@ -14,6 +13,6 @@ protected void onCreate (Bundle savedInstanceState) {
config.useAccelerometer = false;
config.useCompass = false;
config.useImmersiveMode = true;
initialize(new GameOffJam(), config);
initialize(new CoolSodaCan(), config);
}
}
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -17,7 +17,7 @@ allprojects {

version = '2017-11-02'
ext {
appName = "GameOffJam2017"
appName = "Cool"
gdxVersion = '1.9.7'
roboVMVersion = '2.3.3'
box2DLightsVersion = '1.4'
Expand Down
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit trunk//EN" "http://google-web-toolkit.googlecode.com/svn/trunk/distro-source/core/src/gwt-module.dtd">
<module>
<source path="nz/co/canadia/gameoffjam2017" />
<source path="nz/co/canadia/coolsodacan" />
</module>
@@ -1,11 +1,11 @@
package nz.co.canadia.gameoffjam2017;
package nz.co.canadia.coolsodacan;

/**
* Game constants
*/

public class Constants {
public static final String GAME_NAME = "GameOff Jam 2017 by Ashley Noel Hinton";
public static final String GAME_NAME = "Cool Soda Can by Ashley Noel Hinton";

// app dimensions for Desktop
public static final int DESKTOP_WIDTH = 800;
Expand Down
@@ -1,10 +1,10 @@
package nz.co.canadia.gameoffjam2017;
package nz.co.canadia.coolsodacan;

import com.badlogic.gdx.Game;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;

public class GameOffJam extends Game {
public class CoolSodaCan extends Game {
SpriteBatch batch;
ShapeRenderer shapeRenderer;

Expand Down
@@ -1,4 +1,4 @@
package nz.co.canadia.gameoffjam2017;
package nz.co.canadia.coolsodacan;

import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputProcessor;
Expand All @@ -15,13 +15,13 @@

public class GameScreen implements Screen, InputProcessor {

private final GameOffJam game;
private final CoolSodaCan game;
private Player player;
private OrthographicCamera camera;
private Viewport viewport;
private boolean debug;

GameScreen(GameOffJam game) {
GameScreen(CoolSodaCan game) {
Gdx.input.setCursorPosition(Gdx.graphics.getWidth() / 2, Gdx.graphics.getHeight());
this.game = game;

Expand Down
@@ -1,4 +1,4 @@
package nz.co.canadia.gameoffjam2017;
package nz.co.canadia.coolsodacan;

import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Texture;
Expand Down
2 changes: 1 addition & 1 deletion desktop/build.gradle
Expand Up @@ -3,7 +3,7 @@ apply plugin: "java"
sourceCompatibility = 1.6
sourceSets.main.java.srcDirs = [ "src/" ]

project.ext.mainClassName = "nz.co.canadia.gameoffjam2017.desktop.DesktopLauncher"
project.ext.mainClassName = "DesktopLauncher"
project.ext.assetsDir = new File("../android/assets");

task run(dependsOn: classes, type: JavaExec) {
Expand Down
@@ -1,17 +1,17 @@
package nz.co.canadia.gameoffjam2017.desktop;
package nz.co.canadia.coolsodacan.desktop;

import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;

import nz.co.canadia.gameoffjam2017.Constants;
import nz.co.canadia.gameoffjam2017.GameOffJam;
import nz.co.canadia.coolsodacan.Constants;
import nz.co.canadia.coolsodacan.CoolSodaCan;

public class DesktopLauncher {
public static void main (String[] arg) {
LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
config.width = Constants.DESKTOP_WIDTH;
config.height = Constants.DESKTOP_HEIGHT;
config.title = Constants.GAME_NAME;
new LwjglApplication(new GameOffJam(), config);
new LwjglApplication(new CoolSodaCan(), config);
}
}
4 changes: 2 additions & 2 deletions html/build.gradle
Expand Up @@ -7,8 +7,8 @@ gwt {
minHeapSize="1G"

src = files(file("src/")) // Needs to be in front of "modules" below.
modules 'nz.co.canadia.gameoffjam2017.GdxDefinition'
devModules 'nz.co.canadia.gameoffjam2017.GdxDefinitionSuperdev'
modules 'nz.co.canadia.coolsodacan.GdxDefinition'
devModules 'nz.co.canadia.coolsodacan.GdxDefinitionSuperdev'
project.webAppDirName = 'webapp'

compiler {
Expand Down
Expand Up @@ -4,8 +4,8 @@
<inherits name='com.badlogic.gdx.backends.gdx_backends_gwt' />
<inherits name='com.badlogic.gdx.physics.box2d.box2d-gwt' />

<inherits name='GameOffJam' />
<entry-point class='nz.co.canadia.gameoffjam2017.client.HtmlLauncher' />
<inherits name='CoolSodaCan' />
<entry-point class='nz.co.canadia.coolsodacan.client.HtmlLauncher' />
<set-configuration-property name='xsiframe.failIfScriptTag' value='FALSE'/>
<set-configuration-property name="gdx.assetpath" value="../android/assets" />
</module>
Expand Up @@ -4,7 +4,7 @@
<inherits name='com.badlogic.gdx.backends.gdx_backends_gwt' />
<inherits name='com.badlogic.gdx.physics.box2d.box2d-gwt' />

<inherits name='nz.co.canadia.gameoffjam2017.GdxDefinition' />
<inherits name='nz.co.canadia.coolsodacan.GdxDefinition' />

<collapse-all-properties />

Expand Down
@@ -1,11 +1,11 @@
package nz.co.canadia.gameoffjam2017.client;
package nz.co.canadia.coolsodacan.client;

import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.backends.gwt.GwtApplication;
import com.badlogic.gdx.backends.gwt.GwtApplicationConfiguration;

import nz.co.canadia.gameoffjam2017.Constants;
import nz.co.canadia.gameoffjam2017.GameOffJam;
import nz.co.canadia.coolsodacan.Constants;
import nz.co.canadia.coolsodacan.CoolSodaCan;

public class HtmlLauncher extends GwtApplication {

Expand All @@ -18,6 +18,6 @@ public GwtApplicationConfiguration getConfig () {

@Override
public ApplicationListener createApplicationListener () {
return new GameOffJam();
return new CoolSodaCan();
}
}

0 comments on commit b973be2

Please sign in to comment.