Merge pull request 'feature/improves-ux' (#6) from feature/improves-ux into dev

Reviewed-on: Athena/game-source#6

assets/fonts/MKXTitle.tres

@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/fonts/MKX Title.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 30
+font_data = ExtResource( 1 )

assets/props/rock floor/textures/tx_rock_floor_bc.tga.import

@@ -4,15 +4,16 @@ importer="texture"
 type="StreamTexture"
 path.s3tc="res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.s3tc.stex"
 path.etc2="res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc2.stex"
+path.etc="res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc.stex"
 metadata={
-"imported_formats": [ "s3tc", "etc2" ],
+"imported_formats": [ "s3tc", "etc2", "etc" ],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://assets/props/rock floor/textures/tx_rock_floor_bc.tga"
-dest_files=[ "res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.s3tc.stex", "res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc2.stex" ]
+dest_files=[ "res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.s3tc.stex", "res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc2.stex", "res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc.stex" ]
 
 [params]
 

project.godot

@@ -13,6 +13,7 @@ config_version=4
 config/name="Athena-Hidden-Object"
 run/main_scene="res://scenes/main.tscn"
 config/icon="res://icon.png"
+config/quit_on_go_back=false
 
 [display]
 

scenes/levels/WarCraft.gd

@@ -0,0 +1,9 @@
+extends Spatial
+
+export (PackedScene) var main = load("res://scenes/main.tscn")
+
+func _notification(what):
+	# Back to main scene
+	if what == MainLoop.NOTIFICATION_WM_GO_BACK_REQUEST:
+		var scene = main.instance()
+		call_deferred("add_child", scene)

scenes/levels/WarCraft.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://assets/props/rock floor/rock floor.gltf" type="PackedScene" id=1]
 [ext_resource path="res://assets/props/table/table.gltf" type="PackedScene" id=2]
 [ext_resource path="res://assets/props/stool b/stool b.gltf" type="PackedScene" id=3]
 [ext_resource path="res://assets/hdri/tx_night_place.hdr" type="Texture" id=4]
 [ext_resource path="res://assets/props/book/book.gltf" type="PackedScene" id=5]
+[ext_resource path="res://scenes/levels/WarCraft.gd" type="Script" id=6]
 
 [sub_resource type="PanoramaSky" id=1]
 panorama = ExtResource( 4 )
@@ -15,6 +16,7 @@ background_sky = SubResource( 1 )
 ambient_light_color = Color( 0.266667, 0.14902, 0.0627451, 1 )
 
 [node name="Warcraft" type="Spatial"]
+script = ExtResource( 6 )
 
 [node name="rock floor" parent="." instance=ExtResource( 1 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 2.253 )

scenes/main.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://scenes/main.gd" type="Script" id=1]
 [ext_resource path="res://icon.png" type="Texture" id=2]
+[ext_resource path="res://assets/fonts/MKXTitle.tres" type="DynamicFont" id=3]
 
 [sub_resource type="GDScript" id=1]
 script/source = "extends LinkButton
@@ -48,6 +49,7 @@ __meta__ = {
 [node name="Title" type="Label" parent="Grid/Menu/Banner/ColorRect"]
 margin_right = 150.0
 margin_bottom = 150.0
+custom_fonts/font = ExtResource( 3 )
 text = "Loki
 "
 align = 1
@@ -75,31 +77,45 @@ __meta__ = {
 }
 
 [node name="New" type="LinkButton" parent="Grid/Menu/Action"]
+margin_left = 10.0
 margin_top = 30.0
-margin_right = 150.0
+margin_right = 130.0
-margin_bottom = 44.0
+margin_bottom = 64.0
+custom_fonts/font = ExtResource( 3 )
 text = "Nouveau"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="Continue" type="LinkButton" parent="Grid/Menu/Action"]
-margin_top = 70.0
+margin_left = 10.0
-margin_right = 151.0
+margin_top = 80.0
-margin_bottom = 74.0
+margin_right = 136.0
+margin_bottom = 114.0
+custom_fonts/font = ExtResource( 3 )
 disabled = true
 text = "Reprendre"
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="About" type="LinkButton" parent="Grid/Menu/Action"]
-margin_top = 110.0
+margin_left = 10.0
-margin_right = 151.0
+margin_top = 130.0
-margin_bottom = 80.0
+margin_right = 86.0
+margin_bottom = 164.0
+custom_fonts/font = ExtResource( 3 )
 text = "Credit"
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="Quit" type="LinkButton" parent="Grid/Menu/Action"]
-margin_top = 400.0
+margin_left = 10.0
-margin_right = 151.0
+margin_top = 401.059
-margin_bottom = 98.0
+margin_right = 161.0
+margin_bottom = 435.059
+custom_fonts/font = ExtResource( 3 )
 text = "Quitter"
 script = SubResource( 1 )
 __meta__ = {