Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic

godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.md5

@@ -1,3 +1,3 @@
 source_md5="def9518adb67248106449930ecafbf56"
-dest_md5="f9d758e8df7027a5ee66a8f1cb4910e6"
+dest_md5="b1f6910cd5bbb4c510a140a0147c5476"
 

godot_ship/assets/backgrounds/Background_Light.png.import

@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -30,5 +30,5 @@ process/HDR_as_SRGB=false
 process/invert_color=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
 svg/scale=1.0

godot_ship/scenes/Game/Game.tscn

@@ -30,7 +30,6 @@ margin_bottom = 20.0
 text = "Forfeit"
 
 [node name="ConfirmationDialog" type="ConfirmationDialog" parent="."]
-visible = true
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
@@ -48,3 +47,4 @@ __meta__ = {
 }
 
 [connection signal="pressed" from="Buttons/Forfeit" to="." method="_on_Forfeit_pressed"]
+[connection signal="confirmed" from="ConfirmationDialog" to="." method="_on_ConfirmationDialog_confirmed"]

godot_ship/script/game/Gameplay/Game.gd

@@ -58,7 +58,10 @@ func display_turn():
 
 func _on_Forfeit_pressed():
 	AudioBus.emit_signal("button_clicked")
-	end()
+	get_node("ConfirmationDialog").popup()
 
 func end():
 	queue_free()
+
+func _on_ConfirmationDialog_confirmed():
+	end()