updated flake texture fixed collision issue, and minor value changes

This commit is contained in:
Harrison Deng 2017-06-04 17:44:02 -05:00
parent c416d9f1ea
commit 16d45757e5
12 changed files with 4 additions and 4 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 248 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 577 B

After

Width:  |  Height:  |  Size: 487 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 658 B

After

Width:  |  Height:  |  Size: 503 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 993 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 167 B

View File

@ -134,7 +134,6 @@ public class EntityController {
pelletPool.free(pellet);
break;
case SHARD:
System.out.println("freed");
Shard shard = (Shard) entity;
shard.remove();
shardPool.free(shard);

View File

@ -24,6 +24,7 @@ public class PolyJetEntity extends Actor implements Entity {
private float speed, accel;
private float rate;
public PolyJetEntity(AssetManager assets, float speed, float accel, String jet) {
health = 100;
this.speed = speed;
this.accel = accel;
setSize(1.5f, 1.5f);

View File

@ -73,7 +73,7 @@ public class Shard extends Actor implements Entity, Poolable {
public void draw(Batch batch, float parentAlpha) {
sprite.setCenter(getX()+center.x, getY()+center.y);
sprite.setColor((float)hp/(float)maxHp, 1f, 0.5f, 1f);
sprite.setColor((float)hp/(float)maxHp, 0f, 0f, 1f);
sprite.draw(batch);
batch.setColor(Color.WHITE);
super.draw(batch, parentAlpha);

View File

@ -40,7 +40,7 @@ public class SpawnerWindow extends Window {
mod1 = new Slider(0.1f, 50f, 0.01f, true, skin);
mod2 = new Slider(0f, 15f, 0.01f, true, skin);
mod3 = new Slider(0.1f, 15f, 0.01f, true, skin);
mod4 = new Slider(1f, 8f, 0.01f, true, skin);
mod4 = new Slider(1f, 12f, 0.01f, true, skin);
listOfEntities = new List<>(skin);
listOfEntities.setItems(Entities.values());
@ -62,7 +62,7 @@ public class SpawnerWindow extends Window {
private Vector2 coords = new Vector2();
@Override
public void act(float delta) {
if (Gdx.input.justTouched() && Gdx.input.isKeyPressed(Keys.SHIFT_LEFT)) {
if (Gdx.input.justTouched() && Gdx.input.isKeyPressed(Keys.CONTROL_LEFT)) {
coords.set(Gdx.input.getX(), Gdx.input.getY());
stage.screenToStageCoordinates(coords);