Merge branch 'dave'

8 files changed, 120 insertions, 3 deletions

diff --git a/godot/assets/fonts/Roboto-Medium.ttf b/godot/assets/fonts/Roboto-Medium.ttf
new file mode 100644
index 0000000..8458c90
--- /dev/null
+++ b/godot/assets/fonts/Roboto-Medium.ttf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d0d55a303bfd13b79a87721f65185e93f235e2d77fe398b2dca67ac519915f5
+size 168644
diff --git a/godot/assets/fonts/Roboto.zip b/godot/assets/fonts/Roboto.zip
new file mode 100644
index 0000000..cfc3014
--- /dev/null
+++ b/godot/assets/fonts/Roboto.zip
diff --git a/godot/assets/fonts/default_dynamicfont.tres b/godot/assets/fonts/default_dynamicfont.tres
new file mode 100644
index 0000000..a2da028
--- /dev/null
+++ b/godot/assets/fonts/default_dynamicfont.tres
@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/fonts/default_dynamicfontdata.tres" type="DynamicFontData" id=1]
+
+[resource]
+size = 50
+font_data = ExtResource( 1 )
diff --git a/godot/assets/fonts/default_dynamicfontdata.tres b/godot/assets/fonts/default_dynamicfontdata.tres
new file mode 100644
index 0000000..a952151
--- /dev/null
+++ b/godot/assets/fonts/default_dynamicfontdata.tres
@@ -0,0 +1,4 @@
+[gd_resource type="DynamicFontData" format=2]
+
+[resource]
+font_path = "res://assets/fonts/format.otf"
diff --git a/godot/assets/fonts/format.tres b/godot/assets/fonts/format.tres
index 9020d9c..7fca71e 100644
--- a/godot/assets/fonts/format.tres
+++ b/godot/assets/fonts/format.tres
@@ -3,5 +3,5 @@
 [ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=1]
 
 [resource]
-size = 50
+size = 89
 font_data = ExtResource( 1 )
diff --git a/godot/assets/fonts/theme_middletext.tres b/godot/assets/fonts/theme_middletext.tres
new file mode 100644
index 0000000..abe61fe
--- /dev/null
+++ b/godot/assets/fonts/theme_middletext.tres
@@ -0,0 +1,50 @@
+[gd_resource type="Theme" load_steps=10 format=2]
+
+[ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=1]
+
+[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="DynamicFont" id=8]
+size = 50
+font_data = ExtResource( 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 = SubResource( 8 )
+Panel/styles/panel = SubResource( 7 )
diff --git a/godot/assets/fonts/theme_smalltext.tres b/godot/assets/fonts/theme_smalltext.tres
new file mode 100644
index 0000000..078fa10
--- /dev/null
+++ b/godot/assets/fonts/theme_smalltext.tres
@@ -0,0 +1,53 @@
+[gd_resource type="Theme" load_steps=11 format=2]
+
+[ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=1]
+
+[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="DynamicFontData" id=9]
+font_path = "res://assets/fonts/Roboto-Medium.ttf"
+
+[sub_resource type="DynamicFont" id=8]
+size = 30
+font_data = SubResource( 9 )
+
+[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 = SubResource( 8 )
+Panel/styles/panel = SubResource( 7 )
diff --git a/godot/assets/game_objects/stone(Clone).material b/godot/assets/game_objects/stone(Clone).material
index dd7a6bb..fbc9627 100644
--- a/godot/assets/game_objects/stone(Clone).material
+++ b/godot/assets/game_objects/stone(Clone).material
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6bda96ce6a9969c5bca66bec269f889f463d65184797c048469a8ce43ba9b99e
-size 757
+oid sha256:b72c3b30ce22bd387a8575140eb29031885841bde7ae13e6bfa028f6a90346df
+size 756