Merge branch 'master' of https://github.com/unfa/jam-01

Assets/Effects/BulletTracer.gd

@@ -1,19 +1,23 @@
 extends Spatial
 
+var first = true
+var velocity = 4
 
 # Declare member variables here. Examples:
 # var a = 2
 # var b = "text"
 
-
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	pass # Replace with function body.
 
-
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
-	translate_object_local(Vector3(0,4,0))
+	if first:
+		translate_object_local(Vector3(0,rand_range(0, velocity),0))
+		first = false
+	else:
+		translate_object_local(Vector3(0,velocity,0))
 
 func _on_Raycast_body_entered(body):
 	queue_free()

Player.tscn

@@ -72,9 +72,9 @@ anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
 margin_left = -511.401
-margin_top = -300.599
+margin_top = -300.757
 margin_right = 512.599
-margin_bottom = 299.401
+margin_bottom = 299.243
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -127,3 +127,53 @@ rect_pivot_offset = Vector2( -8, 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
+
+[node name="CrosshairHitConfirmation" type="Control" parent="CrosshairContainer"]
+margin_left = 512.0
+margin_top = 300.0
+margin_right = 512.0
+margin_bottom = 300.0
+
+[node name="Line1" type="ColorRect" parent="CrosshairContainer/CrosshairHitConfirmation"]
+margin_left = 8.0
+margin_top = -1.0
+margin_right = 16.0
+margin_bottom = 1.0
+rect_rotation = 45.3067
+rect_pivot_offset = Vector2( -8, 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Line2" type="ColorRect" parent="CrosshairContainer/CrosshairHitConfirmation"]
+margin_left = 8.0
+margin_top = -1.0
+margin_right = 16.0
+margin_bottom = 1.0
+rect_rotation = 135.307
+rect_pivot_offset = Vector2( -8, 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Line3" type="ColorRect" parent="CrosshairContainer/CrosshairHitConfirmation"]
+margin_left = 8.0
+margin_top = -1.0
+margin_right = 16.0
+margin_bottom = 1.0
+rect_rotation = 225.306
+rect_pivot_offset = Vector2( -8, 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Line4" type="ColorRect" parent="CrosshairContainer/CrosshairHitConfirmation"]
+margin_left = 8.0
+margin_top = -1.0
+margin_right = 16.0
+margin_bottom = 1.0
+rect_rotation = -44.6931
+rect_pivot_offset = Vector2( -8, 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}