merged menu branch

4 files changed, 55 insertions, 3 deletions

diff --git a/godot/assets/fonts/format.otf b/godot/assets/fonts/format.otf
new file mode 100644
index 0000000..129be34
--- /dev/null
+++ b/godot/assets/fonts/format.otf
diff --git a/godot/assets/fonts/format.tres b/godot/assets/fonts/format.tres
new file mode 100644
index 0000000..9020d9c
--- /dev/null
+++ b/godot/assets/fonts/format.tres
@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=1]
+
+[resource]
+size = 50
+font_data = ExtResource( 1 )
diff --git a/godot/assets/sounds/Uuhhh.mp3.import b/godot/assets/sounds/Uuhhh.mp3.import
index 4044597..cbe7703 100644
--- a/godot/assets/sounds/Uuhhh.mp3.import
+++ b/godot/assets/sounds/Uuhhh.mp3.import
@@ -2,13 +2,11 @@
 
 importer="mp3"
 type="AudioStreamMP3"
-path="res://.import/Uuhhh.mp3-1452b4c6d720c509ff34f445446a352e.mp3str"
+valid=false
 
 [deps]
 
 source_file="res://assets/sounds/Uuhhh.mp3"
-dest_files=[ "res://.import/Uuhhh.mp3-1452b4c6d720c509ff34f445446a352e.mp3str" ]
-
 [params]
 
 loop=true
diff --git a/godot/assets/theme.tres b/godot/assets/theme.tres
new file mode 100644
index 0000000..1269b54
--- /dev/null
+++ b/godot/assets/theme.tres
@@ -0,0 +1,47 @@
+[gd_resource type="Theme" load_steps=10 format=2]
+
+[ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=1]
+[ext_resource path="res://assets/fonts/format.tres" type="DynamicFont" id=2]
+
+[sub_resource type="DynamicFont" id=1]
+size = 55
+extra_spacing_bottom = -15
+font_data = ExtResource( 1 )
+
+[sub_resource type="StyleBoxFlat" id=2]
+content_margin_top = 10.0
+content_margin_bottom = 10.0
+bg_color = Color( 0.4, 0.337255, 0.313726, 0.32549 )
+
+[sub_resource type="StyleBoxFlat" id=3]
+content_margin_top = 10.0
+content_margin_bottom = 10.0
+bg_color = Color( 0.176471, 0.14902, 0.141176, 1 )
+
+[sub_resource type="StyleBoxFlat" id=4]
+content_margin_top = 10.0
+content_margin_bottom = 10.0
+bg_color = Color( 0.4, 0.337255, 0.313726, 1 )
+
+[sub_resource type="StyleBoxFlat" id=5]
+content_margin_top = 20.0
+content_margin_bottom = 20.0
+bg_color = Color( 0.290196, 0.247059, 0.231373, 1 )
+
+[sub_resource type="StyleBoxFlat" id=6]
+content_margin_top = 10.0
+content_margin_bottom = 10.0
+bg_color = Color( 0.176471, 0.14902, 0.141176, 1 )
+
+[sub_resource type="StyleBoxFlat" id=7]
+bg_color = Color( 0.160784, 0.133333, 0.133333, 1 )
+
+[resource]
+Button/fonts/font = SubResource( 1 )
+Button/styles/disabled = SubResource( 2 )
+Button/styles/focus = SubResource( 3 )
+Button/styles/hover = SubResource( 4 )
+Button/styles/normal = SubResource( 5 )
+Button/styles/pressed = SubResource( 6 )
+Label/fonts/font = ExtResource( 2 )
+Panel/styles/panel = SubResource( 7 )