diff --git a/assets/interfaces/buttons/close_icon.png b/assets/interfaces/buttons/close_icon.png new file mode 100644 index 0000000..7ac21b4 Binary files /dev/null and b/assets/interfaces/buttons/close_icon.png differ diff --git a/assets/interfaces/themes/khanat_theme.theme b/assets/interfaces/themes/khanat_theme.theme new file mode 100644 index 0000000..c0009a8 Binary files /dev/null and b/assets/interfaces/themes/khanat_theme.theme differ diff --git a/assets/interfaces/themes/login_theme.theme b/assets/interfaces/themes/login_theme.theme deleted file mode 100644 index f1ba6ca..0000000 Binary files a/assets/interfaces/themes/login_theme.theme and /dev/null differ diff --git a/assets/interfaces/windows/window_frame.png b/assets/interfaces/windows/window_frame.png new file mode 100644 index 0000000..17140ac Binary files /dev/null and b/assets/interfaces/windows/window_frame.png differ diff --git a/scenes/game/game.tscn b/scenes/game/game.tscn index be9a962..418759c 100644 --- a/scenes/game/game.tscn +++ b/scenes/game/game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://scenes/player/player.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/decors/terrains/dunes/dunes.tscn" type="PackedScene" id=2] @@ -8,6 +8,8 @@ [ext_resource path="res://scenes/game/sky.gd" type="Script" id=6] [ext_resource path="res://assets/mist/mist.shader" type="Shader" id=7] [ext_resource path="res://assets/interfaces/debug_window/debug_window.tscn" type="PackedScene" id=8] +[ext_resource path="res://assets/interfaces/themes/khanat_theme.theme" type="Theme" id=9] +[ext_resource path="res://assets/interfaces/buttons/close_icon.png" type="Texture" id=10] [sub_resource type="OpenSimplexNoise" id=1] period = 8.0 @@ -22,8 +24,8 @@ noise = SubResource( 1 ) [sub_resource type="ShaderMaterial" id=3] resource_local_to_scene = true shader = ExtResource( 5 ) -shader_param/iTime = 19.1832 -shader_param/iFrame = 657 +shader_param/iTime = 3252.08 +shader_param/iFrame = 118130 shader_param/COVERAGE = 0.5 shader_param/THICKNESS = 25.0 shader_param/ABSORPTION = 1.031 @@ -120,5 +122,8 @@ mesh = SubResource( 8 ) material/0 = SubResource( 9 ) [node name="debug_window" parent="." instance=ExtResource( 8 )] +visible = true +theme = ExtResource( 9 ) +custom_icons/close = ExtResource( 10 ) [connection signal="mist_level_changed" from="debug_window" to="." method="_on_debug_window_mist_level_changed"] [connection signal="time_of_day_changed" from="debug_window" to="." method="_on_debug_window_time_of_day_changed"] diff --git a/scenes/interfaces/creatures_editor/creatures_editor_ui.tscn b/scenes/interfaces/creatures_editor/creatures_editor_ui.tscn index a9d5632..5f80875 100644 --- a/scenes/interfaces/creatures_editor/creatures_editor_ui.tscn +++ b/scenes/interfaces/creatures_editor/creatures_editor_ui.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://assets/interfaces/themes/login_theme.theme" type="Theme" id=1] +[ext_resource path="res://assets/interfaces/themes/khanat_theme.theme" type="Theme" id=1] [ext_resource path="res://assets/interfaces/settings-Khanat-background.png" type="Texture" id=2] [ext_resource path="res://scenes/interfaces/creatures_editor/creatures_editor_ui.gd" type="Script" id=3] [ext_resource path="res://addons/kh_slider/kh_h_slider.gd" type="Script" id=4] @@ -8,6 +8,7 @@ [ext_resource path="res://assets/interfaces/slider_minus.png" type="Texture" id=6] [ext_resource path="res://scenes/creatures/ra/ra.tscn" type="PackedScene" id=7] + [sub_resource type="ViewportTexture" id=1] viewport_path = NodePath("viewport") diff --git a/scenes/interfaces/creatures_menu/creatures_menu_ui.tscn b/scenes/interfaces/creatures_menu/creatures_menu_ui.tscn index 00e1419..e7d7d75 100644 --- a/scenes/interfaces/creatures_menu/creatures_menu_ui.tscn +++ b/scenes/interfaces/creatures_menu/creatures_menu_ui.tscn @@ -2,7 +2,8 @@ [ext_resource path="res://scenes/interfaces/creatures_menu/creatures_menu_ui.gd" type="Script" id=1] [ext_resource path="res://assets/interfaces/settings-Khanat-background.png" type="Texture" id=2] -[ext_resource path="res://assets/interfaces/themes/login_theme.theme" type="Theme" id=3] +[ext_resource path="res://assets/interfaces/themes/khanat_theme.theme" type="Theme" id=3] + [node name="creatures_menu_ui" type="Control"] anchor_right = 1.0 diff --git a/scenes/interfaces/main_menu/main_menu.tscn b/scenes/interfaces/main_menu/main_menu.tscn index c6b5f66..a43d40d 100644 --- a/scenes/interfaces/main_menu/main_menu.tscn +++ b/scenes/interfaces/main_menu/main_menu.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://assets/interfaces/Login-Khanat-background.png" type="Texture" id=1] -[ext_resource path="res://assets/interfaces/themes/login_theme.theme" type="Theme" id=2] +[ext_resource path="res://assets/interfaces/themes/khanat_theme.theme" type="Theme" id=2] [ext_resource path="res://scenes/interfaces/main_menu/main_menu.gd" type="Script" id=3] + [node name="main_menu" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0