Merge

godot_ship/.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.md5

@@ -0,0 +1,3 @@
+source_md5="a88d669f1f058a347cc4de2244bac64b"
+dest_md5="1073062c6e594eff250036d7489d44a7"
+

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

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

godot_ship/assets/backgrounds/Background_Dark.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/dark.png-1931de55ce8abaebbea8e169cd476889.stex"
+path="res://.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/backgrounds/dark.png"
-dest_files=[ "res://.import/dark.png-1931de55ce8abaebbea8e169cd476889.stex" ]
+source_file="res://assets/backgrounds/Background_Dark.png"
+dest_files=[ "res://.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex" ]
 
 [params]
 

godot_ship/assets/backgrounds/Background_Light.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/backgrounds/Background_Light.png"
+dest_files=[ "res://.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

godot_ship/scenes/Game/Game.tscn

@@ -1,7 +1,9 @@
 [gd_scene load_steps=2 format=2]
 
+[ext_resource path="res://assets/backgrounds/Background_Dark.png" type="Texture" id=1]
 [ext_resource path="res://script/game/Gameplay/Game.gd" type="Script" id=3]
 
+
 [node name="Game" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0

godot_ship/scenes/Options.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://assets/backgrounds/dark.png" type="Texture" id=1]
+[ext_resource path="res://assets/backgrounds/Background_Dark.png" type="Texture" id=1]
 [ext_resource path="res://script/options/Options.gd" type="Script" id=2]
 
 [node name="Options" type="Control"]

godot_ship/scenes/Title Screen.tscn

@@ -1,6 +1,5 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://assets/backgrounds/dark.png" type="Texture" id=1]
 [ext_resource path="res://script/title screen/Title Screen.gd" type="Script" id=2]
 [ext_resource path="res://assets/font/Minecraft.ttf" type="DynamicFontData" id=3]
 
@@ -18,10 +17,6 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="Title-Screen-Background" type="Sprite" parent="."]
-position = Vector2( 320, 180 )
-texture = ExtResource( 1 )
-
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 anchor_left = 0.5
 anchor_top = 0.5

godot_ship/script/options/OptionsController.gd

@@ -23,6 +23,7 @@ func set_theme(theme_name):
 			save_options()
 			emit_signal("change_theme", theme)
 	save_options()
+	
 func set_vol(volume, type):
 	if type == "mas_vol":
 		mas_vol = volume