diff --git a/Fonts/DetailText.tres b/Fonts/DetailText.tres new file mode 100644 index 0000000..b753bd1 --- /dev/null +++ b/Fonts/DetailText.tres @@ -0,0 +1,7 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://Fonts/Kenney Pixel Square.ttf" type="DynamicFontData" id=1] + +[resource] +size = 10 +font_data = ExtResource( 1 ) diff --git a/Fonts/Kenney Pixel Square.ttf b/Fonts/Kenney Pixel Square.ttf new file mode 100644 index 0000000..e540208 Binary files /dev/null and b/Fonts/Kenney Pixel Square.ttf differ diff --git a/Fonts/PageTitles.tres b/Fonts/PageTitles.tres new file mode 100644 index 0000000..ee9cd51 --- /dev/null +++ b/Fonts/PageTitles.tres @@ -0,0 +1,7 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://Fonts/Kenney Pixel Square.ttf" type="DynamicFontData" id=1] + +[resource] +size = 15 +font_data = ExtResource( 1 ) diff --git a/Fonts/TextFonts.tres b/Fonts/TextFonts.tres new file mode 100644 index 0000000..5ba067e --- /dev/null +++ b/Fonts/TextFonts.tres @@ -0,0 +1,7 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://Fonts/Kenney Pixel Square.ttf" type="DynamicFontData" id=1] + +[resource] +size = 12 +font_data = ExtResource( 1 ) diff --git a/Global/T_SplashScreen.png b/Global/T_SplashScreen.png deleted file mode 100644 index a999ff2..0000000 Binary files a/Global/T_SplashScreen.png and /dev/null differ diff --git a/README.md b/README.md index f6ac69c..ec5f97e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Color-Eater +# Retro Magic Demo **Status:** Demo Project **Current Phase:** Prototype -**Version** 1.0.0 +**Version** 1.1.0 ## The Project @@ -14,8 +14,6 @@ Features: Simple UI, FPS Fast paced Controlls, Enemy AI with Pathfinding and States, Weapon and Projectile System, Music/Sound-Effects and a complete game loop to experience. -#### Demo Video: coming soon. - ## Screenshots

@@ -37,7 +35,7 @@ Simple UI, FPS Fast paced Controlls, Enemy AI with Pathfinding and States, Weapo **Renderer:** GLES 3.0 (OpenGL ES 3.0) -**Game Engine:** Godot (3.3) +**Game Engine:** Godot (3.4.4) ## Rules diff --git a/Scenes/Characters/SC_Player.tscn b/Scenes/Characters/SC_Player.tscn index e4f592c..952fce9 100644 --- a/Scenes/Characters/SC_Player.tscn +++ b/Scenes/Characters/SC_Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://Scripts/Gameplay/CO_Player.gd" type="Script" id=1] [ext_resource path="res://Scripts/Gameplay/CO_SpellController.gd" type="Script" id=2] @@ -9,9 +9,6 @@ [sub_resource type="CapsuleShape" id=1] radius = 0.5 -[sub_resource type="CubeMesh" id=2] -size = Vector3( 0.2, 0.2, 0.5 ) - [node name="Player" type="KinematicBody"] collision_layer = 2 script = ExtResource( 1 ) @@ -29,16 +26,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0 ) [node name="Camera" type="Camera" parent="Head"] fov = 90.0 -[node name="RightArm" type="MeshInstance" parent="Head"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.378335, -0.561418, -0.696038 ) -mesh = SubResource( 2 ) -material/0 = null - -[node name="LeftArm" type="MeshInstance" parent="Head"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.394099, -0.561418, -0.696038 ) -mesh = SubResource( 2 ) -material/0 = null - [node name="Hand" type="Position3D" parent="Head"] transform = Transform( 1, 0, 0, 0, 0.999997, -0.00246091, 0, 0.00246091, 0.999997, 0, -0.728066, -1.40332 ) diff --git a/Scenes/Main/SC_MainMenu.tscn b/Scenes/Main/SC_MainMenu.tscn index 7ecb1d3..a5fea03 100644 --- a/Scenes/Main/SC_MainMenu.tscn +++ b/Scenes/Main/SC_MainMenu.tscn @@ -1,15 +1,15 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Scripts/Main/CO_MainMenu.gd" type="Script" id=1] [ext_resource path="res://Scenes/Core/SC_SceneTransition.tscn" type="PackedScene" id=2] +[ext_resource path="res://Fonts/DetailText.tres" type="DynamicFont" id=3] +[ext_resource path="res://Fonts/PageTitles.tres" type="DynamicFont" id=4] +[ext_resource path="res://Fonts/TextFonts.tres" type="DynamicFont" id=5] [node name="MainMenu" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Background" type="ColorRect" parent="."] margin_right = 640.0 @@ -24,18 +24,16 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -50.5857 +margin_left = -58.0 margin_top = -91.5 -margin_right = 49.4143 -margin_bottom = -71.5 +margin_right = 58.0 +margin_bottom = -68.5 custom_colors/font_color = Color( 1, 1, 1, 1 ) +custom_fonts/font = ExtResource( 4 ) text = "Retro Magic" align = 1 valign = 1 uppercase = true -__meta__ = { -"_edit_use_anchors_": false -} [node name="PlayButton" type="Button" parent="."] anchor_left = 0.5 @@ -46,10 +44,8 @@ margin_left = -50.0 margin_top = -40.0 margin_right = 50.0 margin_bottom = -20.0 +custom_fonts/font = ExtResource( 5 ) text = "Play" -__meta__ = { -"_edit_use_anchors_": false -} [node name="CreditsButton" type="Button" parent="."] anchor_left = 0.5 @@ -60,6 +56,7 @@ margin_left = -50.0 margin_top = -10.0 margin_right = 50.0 margin_bottom = 10.0 +custom_fonts/font = ExtResource( 5 ) text = "Credits" __meta__ = { "_edit_use_anchors_": false @@ -74,6 +71,7 @@ margin_left = -50.0 margin_top = 20.0 margin_right = 50.0 margin_bottom = 40.0 +custom_fonts/font = ExtResource( 5 ) text = "Exit" __meta__ = { "_edit_use_anchors_": false @@ -81,5 +79,54 @@ __meta__ = { [node name="SceneTransition" parent="." instance=ExtResource( 2 )] +[node name="CreditsPanel" type="Panel" parent="."] +visible = false +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -78.0 +margin_top = -57.0 +margin_right = 79.0 +margin_bottom = 150.0 + +[node name="Title" type="Label" parent="CreditsPanel"] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -31.0 +margin_top = 8.0 +margin_right = 31.0 +margin_bottom = 26.0 +custom_fonts/font = ExtResource( 5 ) +text = "Credits" + +[node name="Details" type="RichTextLabel" parent="CreditsPanel"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -69.0 +margin_top = -68.5 +margin_right = 69.0 +margin_bottom = 68.5 +custom_fonts/normal_font = ExtResource( 3 ) +text = "This is Retro Magic an open source game project created by Kamyab Nazari in part of an educational Project to teach anybody how to use godot." +scroll_active = false + +[node name="CloseButton" type="Button" parent="CreditsPanel"] +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -28.0 +margin_top = -28.0 +margin_right = 28.0 +margin_bottom = -4.0 +custom_colors/font_color = Color( 1, 0.494118, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) +text = "Close" + [connection signal="pressed" from="PlayButton" to="." method="_on_PlayButton_pressed"] +[connection signal="pressed" from="CreditsButton" to="." method="_on_CreditsButton_pressed"] [connection signal="pressed" from="ExitButton" to="." method="_on_ExitButton_pressed"] +[connection signal="pressed" from="CreditsPanel/CloseButton" to="." method="_on_CloseButton_pressed"] diff --git a/Scripts/Main/CO_MainMenu.gd b/Scripts/Main/CO_MainMenu.gd index 9d446b5..e3a6f2f 100644 --- a/Scripts/Main/CO_MainMenu.gd +++ b/Scripts/Main/CO_MainMenu.gd @@ -4,6 +4,7 @@ extends Control # MainMenu of the Game onready var _transition = $SceneTransition; +onready var creditsPanel = $CreditsPanel; func ready(): _transition.fade_out() @@ -15,3 +16,9 @@ func _on_PlayButton_pressed(): func _on_ExitButton_pressed(): get_tree().quit() + +func _on_CreditsButton_pressed(): + creditsPanel.visible = true; + +func _on_CloseButton_pressed(): + creditsPanel.visible = false; diff --git a/project.godot b/project.godot index 09bcb10..5356845 100644 --- a/project.godot +++ b/project.godot @@ -35,7 +35,6 @@ _global_script_class_icons={ config/name="Retro Magic" config/description="You are the Arena fighter, use your magic to defeat your enemies." run/main_scene="res://Scenes/Core/SC_Main.tscn" -boot_splash/image="res://Global/T_SplashScreen.png" boot_splash/bg_color=Color( 0, 0, 0, 1 ) config/icon="res://ScreenShots/T-Icon.png" @@ -86,27 +85,27 @@ texture={ move_forward={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } move_backward={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } move_right={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } move_left={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } jump={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } primary_action={