reworked a few textures

android/assets/particles/standard_thrust.p

@@ -21,7 +21,7 @@ timeline0: 0.0
 lowMin: 0.0
 lowMax: 0.0
 highMin: 400.0
-highMax: 400.0
+highMax: 300.0
 relative: false
 scalingCount: 1
 scaling0: 1.0
@@ -57,7 +57,7 @@ timelineCount: 1
 timeline0: 0.0
 - Scale - 
 lowMin: 0.0
-lowMax: 0.0
+lowMax: 1.0
 highMin: 1.0
 highMax: 1.0
 relative: false
@@ -65,7 +65,7 @@ scalingCount: 4
 scaling0: 1.0
 scaling1: 0.92156863
 scaling2: 0.627451
-scaling3: 0.15686275
+scaling3: 0.0
 timelineCount: 4
 timeline0: 0.0
 timeline1: 0.5273973
@@ -91,27 +91,36 @@ highMax: 90.0
 relative: false
 scalingCount: 5
 scaling0: 0.0
-scaling1: 0.27450982
-scaling2: 0.33333334
-scaling3: 1.0
+scaling1: 0.0
+scaling2: 0.23529412
+scaling3: 0.8235294
 scaling4: 1.0
 timelineCount: 5
 timeline0: 0.0
-timeline1: 0.21232876
-timeline2: 0.32876712
-timeline3: 0.74657536
+timeline1: 0.2260274
+timeline2: 0.43835616
+timeline3: 0.82191783
 timeline4: 1.0
 - Rotation - 
-active: false
+active: true
+lowMin: 0.0
+lowMax: 0.0
+highMin: 4.0
+highMax: 120.0
+relative: false
+scalingCount: 1
+scaling0: 1.0
+timelineCount: 1
+timeline0: 0.0
 - Wind - 
 active: false
 - Gravity - 
 active: false
 - Tint - 
 colorsCount: 3
-colors0: 0.047058824
-colors1: 0.7647059
-colors2: 1.0
+colors0: 0.14901961
+colors1: 0.14901961
+colors2: 0.14901961
 timelineCount: 1
 timeline0: 0.0
 - Transparency - 
@@ -120,18 +129,20 @@ lowMax: 0.0
 highMin: 1.0
 highMax: 1.0
 relative: false
-scalingCount: 5
+scalingCount: 6
 scaling0: 0.0
 scaling1: 0.3508772
 scaling2: 1.0
-scaling3: 1.0
-scaling4: 0.0
-timelineCount: 5
+scaling3: 0.84210527
+scaling4: 0.64912283
+scaling5: 0.40350878
+timelineCount: 6
 timeline0: 0.0
 timeline1: 0.12328767
-timeline2: 0.25342464
-timeline3: 0.89041096
-timeline4: 1.0
+timeline2: 0.26027396
+timeline3: 0.63013697
+timeline4: 0.9246575
+timeline5: 1.0
 - Options - 
 attached: false
 continuous: true
@@ -140,4 +151,4 @@ additive: false
 behind: false
 premultipliedAlpha: false
 - Image Path -
-cube.png
+square.png

android/assets/uiskin.atlas

@@ -157,8 +157,8 @@ default-slider-knob
 vertical-slider-knob
   rotate: false
   xy: 27, 1
-  size: 13, 5
-  orig: 13, 5
+  size: 14, 5
+  orig: 14, 5
   offset: 0, 0
   index: -1
 default-splitpane

core/src/zero1hd/polyjet/entity/EntityController.java

@@ -1,6 +1,5 @@
 package zero1hd.polyjet.entity;
 
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;

core/src/zero1hd/polyjet/entity/ally/Laser.java

@@ -1,6 +1,5 @@
 package zero1hd.polyjet.entity.ally;
 
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.math.Rectangle;
@@ -19,21 +18,21 @@ public class Laser extends Actor implements Entity, Poolable {
 	
 	public Laser(Texture laserTexture) {
 		this.laserTexture = laserTexture;
-		setSize(0.25f, 1f);
+		setSize(0.25f, 2f);
 	}
 	
 	public void init(float x, float y, float rate) {
-		Gdx.app.debug("Laser", "Pos: " + x + "," + y);
-		
 		setX(x);
 		setY(y);
 		this.rate = rate;
 		hitBox = new Rectangle();
 		hitBox.setSize(getWidth(), getHeight());
+		toBack();
 	}
 	
 	@Override
 	public void act(float delta) {
+		toBack();
 		moveBy(0, delta*rate);
 		hitBox.setX(getX());
 		hitBox.setY(getY());
@@ -61,6 +60,9 @@ public class Laser extends Actor implements Entity, Poolable {
 
 	@Override
 	public void collided(Entity entity) {
+		if (entity.getEntityType() == Entities.VOID_CIRCLE) {
+			dead = true;
+		}
 	}
 
 	@Override

core/src/zero1hd/polyjet/entity/enemies/VoidCircle.java

@@ -1,6 +1,5 @@
 package zero1hd.polyjet.entity.enemies;
 
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
@@ -24,6 +23,7 @@ public class VoidCircle extends Actor implements Entity, Poolable {
 	private boolean done;
 	private boolean begin;
 	private Vector2 center;
+	
 public VoidCircle(ShapeRenderer shapeRenderer) {
 		hitBox = new Rectangle();
 		this.shapeRenderer = shapeRenderer;
@@ -42,6 +42,8 @@ public VoidCircle(ShapeRenderer shapeRenderer) {
 	
 	@Override
 	public void act(float delta) {
+		toFront();
+		
 		center.x = getX()+getWidth()/2f;
 		center.y = getY()+getHeight()/2f;
 		hitBox.setCenter(center.x, center.y);

core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java

@@ -37,6 +37,7 @@ public class GamePlayArea extends Stage {
 		shapes.setProjectionMatrix(getCamera().combined);
 		entityController = new EntityController(assetManager, shapes);
 		collisionDetector = new CollisionDetector(entityController.activeAllies, entityController.activeEnemies);
+		entityController.activeAllies.add(polyjet);
 		addActor(polyjet);
 	}