Skip to content

Commit

Permalink
Fixed html
Browse files Browse the repository at this point in the history
  • Loading branch information
dasfuu committed Apr 24, 2017
1 parent c3cfef7 commit 205c8a6
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ project(":html") {
compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
compile "com.badlogicgames.ashley:ashley:$ashleyVersion:sources"
compile "com.github.czyzby:noise4j:0.1.0:sources"
}
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/LDGame.gwt.xml
Original file line number Diff line number Diff line change
@@ -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="de/dogedev/dl38" />
<source path="de/dogedev/ld38" />
</module>
2 changes: 1 addition & 1 deletion core/src/de/dogedev/ld38/ashley/systems/AiSystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class AiSystem extends IntervalSystem {
private ImmutableArray<Entity> spawns;

public AiSystem(GameScreen gameScreen) {
super(0.5f);
super(Statics.settings.aiTickRate);
this.gameScreen = gameScreen;
}

Expand Down
5 changes: 3 additions & 2 deletions core/src/de/dogedev/ld38/assets/GameSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ public class GameSettings {
public int maxPeeps = 10;

public int numBuildings = (int) ((tilesX*tilesY)*.4);
public float difficulty = .6f; // 0 = easy peasy; 1 = "super hard"
public float finishCheckInterval = 1;
public float difficulty = .4f; // 0 = easy peasy; 1 = "super hard"
public float aiTickRate = 0.1f;

public float finishCheckInterval = 1;
// effects
//movementspeed
public float hangar = 20;
Expand Down
3 changes: 1 addition & 2 deletions core/src/de/dogedev/ld38/screens/GameScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.badlogic.ashley.core.Family;
import com.badlogic.ashley.utils.ImmutableArray;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.Screen;
import com.badlogic.gdx.audio.Music;
import com.badlogic.gdx.graphics.GL20;
Expand Down Expand Up @@ -70,7 +69,7 @@ public GameScreen() {
ashley.addSystem(new InputSystem(camera, this));
ashley.addSystem(new CameraSystem(camera));
ashley.addSystem(new MovementSystem());
// ashley.addSystem(new AiSystem(this));
ashley.addSystem(new AiSystem(this));
ashley.addSystem(mapRenderSystem);
ashley.addSystem(renderSystem);
// ashley.addSystem(new DebugUISystem(camera));
Expand Down
2 changes: 1 addition & 1 deletion html/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ task addSource << {
tasks.compileGwt.dependsOn(addSource)
tasks.draftCompileGwt.dependsOn(addSource)

sourceCompatibility = 1.6
sourceCompatibility = 1.7
sourceSets.main.java.srcDirs = [ "src/" ]


Expand Down
3 changes: 3 additions & 0 deletions html/src/de/dogedev/ld38/GdxDefinition.gwt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
<module rename-to="html">
<inherits name='com.badlogic.gdx.backends.gdx_backends_gwt' />
<inherits name='com.badlogic.ashley_gwt' />
<inherits name='com.github.czyzby.noise4j.Noise4J' />


<inherits name='LDGame' />
<entry-point class='de.dogedev.ld38.client.HtmlLauncher' />
<set-configuration-property name='xsiframe.failIfScriptTag' value='FALSE'/>
<set-configuration-property name="gdx.assetpath" value="../core/assets" />
<extend-configuration-property name="gdx.reflect.include" value="de.dogedev.ld38" />
</module>
2 changes: 1 addition & 1 deletion html/src/de/dogedev/ld38/client/HtmlLauncher.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class HtmlLauncher extends GwtApplication {

@Override
public GwtApplicationConfiguration getConfig () {
return new GwtApplicationConfiguration(480, 320);
return new GwtApplicationConfiguration(1280, 720);
}

@Override
Expand Down

0 comments on commit 205c8a6

Please sign in to comment.