From c53ce61b535f74f7d1a6aaa21efb4b2c83460aa5 Mon Sep 17 00:00:00 2001
From: tommy-l-ngo <tommyngo2@my.unt.edu>
Date: Sun, 14 Nov 2021 00:08:16 -0600
Subject: [PATCH 1/2] Added Confirmation dialog for Forfeit

---
 godot_ship/scenes/Game/Game.tscn        | 2 +-
 godot_ship/script/game/Gameplay/Game.gd | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/godot_ship/scenes/Game/Game.tscn b/godot_ship/scenes/Game/Game.tscn
index 31dbf81..681939f 100644
--- a/godot_ship/scenes/Game/Game.tscn
+++ b/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"]
diff --git a/godot_ship/script/game/Gameplay/Game.gd b/godot_ship/script/game/Gameplay/Game.gd
index 12a8814..27ac0a4 100644
--- a/godot_ship/script/game/Gameplay/Game.gd
+++ b/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()

From dd5b6f7b717f82682e3efc6d149cb179db6b6b88 Mon Sep 17 00:00:00 2001
From: tommy-l-ngo <tommyngo2@my.unt.edu>
Date: Sun, 14 Nov 2021 00:11:25 -0600
Subject: [PATCH 2/2] Fixed Texture Rendering for Light Mode Background

---
 ...t.png-3684b7dcc3b1fd645e9fff4401113c01.md5 |   2 +-
 ....png-3684b7dcc3b1fd645e9fff4401113c01.stex | Bin 9376 -> 9376 bytes
 .../backgrounds/Background_Light.png.import   |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.md5 b/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.md5
index ee05183..ad95732 100644
--- a/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.md5
+++ b/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.md5
@@ -1,3 +1,3 @@
 source_md5="def9518adb67248106449930ecafbf56"
-dest_md5="f9d758e8df7027a5ee66a8f1cb4910e6"
+dest_md5="b1f6910cd5bbb4c510a140a0147c5476"
 
diff --git a/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.stex b/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.stex
index 4d5e2974b252a6d248075c87d9ad652d94221e88..fa6121dff219864397da334824e8b486b94abea8 100644
GIT binary patch
delta 29
fcmZ4BxxiDz-6c4rfr)`3gOLFW1lTr;^r!#;WUvK~

delta 29
icmZ4BxxiDz-6c4rfr)`3gOP!Og#iQv*f)ywr~m+D<pq=g

diff --git a/godot_ship/assets/backgrounds/Background_Light.png.import b/godot_ship/assets/backgrounds/Background_Light.png.import
index ec92432..13140de 100644
--- a/godot_ship/assets/backgrounds/Background_Light.png.import
+++ b/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