Skip to content

Commit

Permalink
Added tutorial, added fullscreen option
Browse files Browse the repository at this point in the history
  • Loading branch information
geegaz committed Aug 11, 2020
1 parent f76b767 commit c8dda5f
Show file tree
Hide file tree
Showing 33 changed files with 805 additions and 316 deletions.
Binary file added Assets/Sprites/UI/CheckButton/checkbutton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Sprites/UI/CheckButton/checkbutton.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/checkbutton.png-22a795179095e5abb74d5ca66eed14d4.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/CheckButton/checkbutton.png"
dest_files=[ "res://.import/checkbutton.png-22a795179095e5abb74d5ca66eed14d4.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0
Binary file added Assets/Sprites/UI/CheckButton/checkbutton1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Sprites/UI/CheckButton/checkbutton1.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/checkbutton1.png-dd63747a69882a6f1be32d3595d7d62b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/CheckButton/checkbutton1.png"
dest_files=[ "res://.import/checkbutton1.png-dd63747a69882a6f1be32d3595d7d62b.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0
Binary file added Assets/Sprites/UI/CheckButton/checkbutton2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Sprites/UI/CheckButton/checkbutton2.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/checkbutton2.png-60dff509bcaec5db11a0cf986f4af8f4.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/CheckButton/checkbutton2.png"
dest_files=[ "res://.import/checkbutton2.png-60dff509bcaec5db11a0cf986f4af8f4.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0
Binary file added Assets/Sprites/UI/CheckButton/checkbutton3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Sprites/UI/CheckButton/checkbutton3.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/checkbutton3.png-92a5f02e0148118dc6cb3ceb543f469d.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/CheckButton/checkbutton3.png"
dest_files=[ "res://.import/checkbutton3.png-92a5f02e0148118dc6cb3ceb543f469d.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0
Binary file added Assets/Sprites/UI/CheckButton/checkbutton4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Sprites/UI/CheckButton/checkbutton4.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/checkbutton4.png-6cbe25c33709aef24fc1c5d4b06cbc99.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/CheckButton/checkbutton4.png"
dest_files=[ "res://.import/checkbutton4.png-6cbe25c33709aef24fc1c5d4b06cbc99.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0
Binary file modified Assets/Sprites/UI/theme-Sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Sprites/Worlds/World1/background.aseprite
Binary file not shown.
Binary file modified Assets/Sprites/Worlds/World1/background_ground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Sprites/Worlds/World1/background_sky.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Sprites/end/end-Sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Sprites/end/end-Sheet.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/end-Sheet.png-653ee43068937550d0f38e7461f1ff0b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/end/end-Sheet.png"
dest_files=[ "res://.import/end-Sheet.png-653ee43068937550d0f38e7461f1ff0b.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0
Binary file added Assets/Sprites/end/end.aseprite
Binary file not shown.
30 changes: 28 additions & 2 deletions Assets/Themes/Main.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
[gd_resource type="Theme" load_steps=20 format=2]
[gd_resource type="Theme" load_steps=26 format=2]

[ext_resource path="res://Assets/Sprites/UI/theme-Sheet.png" type="Texture" id=1]
[ext_resource path="res://Assets/Fonts/joystix.monospace.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://Assets/Fonts/base_font.tres" type="DynamicFont" id=3]
[ext_resource path="res://Assets/Sprites/UI/slider/slider1.png" type="Texture" id=4]
[ext_resource path="res://Assets/Sprites/UI/slider/slider3.png" type="Texture" id=5]
[ext_resource path="res://Assets/Sprites/UI/slider/slider2.png" type="Texture" id=6]
[ext_resource path="res://Assets/Fonts/small_font.tres" type="DynamicFont" id=7]
[ext_resource path="res://Assets/Sprites/UI/CheckButton/checkbutton3.png" type="Texture" id=8]
[ext_resource path="res://Assets/Sprites/UI/CheckButton/checkbutton2.png" type="Texture" id=9]
[ext_resource path="res://Assets/Sprites/UI/CheckButton/checkbutton1.png" type="Texture" id=10]
[ext_resource path="res://Assets/Sprites/UI/CheckButton/checkbutton4.png" type="Texture" id=11]

[sub_resource type="DynamicFont" id=1]
size = 10
Expand Down Expand Up @@ -51,6 +56,8 @@ margin_right = 3.25483
margin_top = 3.08429
margin_bottom = 3.08123

[sub_resource type="StyleBoxEmpty" id=14]

[sub_resource type="StyleBoxEmpty" id=7]

[sub_resource type="StyleBoxTexture" id=8]
Expand Down Expand Up @@ -102,8 +109,9 @@ margin_top = 2.16959
margin_bottom = 2.18471

[resource]
default_font = ExtResource( 7 )
Button/colors/font_color = Color( 0, 0, 0, 1 )
Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
Button/colors/font_color_disabled = Color( 1, 1, 1, 0.2 )
Button/colors/font_color_hover = Color( 0, 0, 0, 1 )
Button/colors/font_color_pressed = Color( 0, 0, 0, 1 )
Button/constants/hseparation = 2
Expand All @@ -113,6 +121,24 @@ Button/styles/focus = SubResource( 3 )
Button/styles/hover = SubResource( 4 )
Button/styles/normal = SubResource( 5 )
Button/styles/pressed = SubResource( 6 )
CheckButton/colors/font_color = Color( 0, 0, 0, 1 )
CheckButton/colors/font_color_disabled = Color( 1, 1, 1, 0.2 )
CheckButton/colors/font_color_hover = Color( 0, 0, 0, 1 )
CheckButton/colors/font_color_hover_pressed = Color( 0, 0, 0, 1 )
CheckButton/colors/font_color_pressed = Color( 0, 0, 0, 1 )
CheckButton/constants/check_vadjust = 0
CheckButton/constants/hseparation = 4
CheckButton/fonts/font = null
CheckButton/icons/off = ExtResource( 10 )
CheckButton/icons/off_disabled = ExtResource( 9 )
CheckButton/icons/on = ExtResource( 8 )
CheckButton/icons/on_disabled = ExtResource( 11 )
CheckButton/styles/disabled = null
CheckButton/styles/focus = SubResource( 14 )
CheckButton/styles/hover = null
CheckButton/styles/hover_pressed = null
CheckButton/styles/normal = null
CheckButton/styles/pressed = null
HSlider/icons/grabber = ExtResource( 4 )
HSlider/icons/grabber_disabled = ExtResource( 5 )
HSlider/icons/grabber_highlight = ExtResource( 6 )
Expand Down
4 changes: 2 additions & 2 deletions Assets/Tilesets/world1.tres
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
8/autotile/spacing = 0
8/autotile/occluder_map = [ ]
8/autotile/navpoly_map = [ ]
8/autotile/priority_map = [ ]
8/autotile/priority_map = [ Vector3( 1, 0, 2 ) ]
8/autotile/z_index_map = [ ]
8/occluder_offset = Vector2( 0, 0 )
8/navigation_offset = Vector2( 0, 0 )
Expand All @@ -575,7 +575,7 @@ points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
9/autotile/spacing = 0
9/autotile/occluder_map = [ ]
9/autotile/navpoly_map = [ ]
9/autotile/priority_map = [ ]
9/autotile/priority_map = [ Vector3( 1, 0, 2 ) ]
9/autotile/z_index_map = [ ]
9/occluder_offset = Vector2( 0, 0 )
9/navigation_offset = Vector2( 0, 0 )
Expand Down
20 changes: 14 additions & 6 deletions Scenes/Global.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tracks/1/keys = {
} ]
}

[sub_resource type="Animation" id=3]
[sub_resource type="Animation" id=2]
resource_name = "left"
tracks/0/type = "value"
tracks/0/path = NodePath("Transitions:position")
Expand Down Expand Up @@ -64,7 +64,7 @@ tracks/1/keys = {
} ]
}

[sub_resource type="Animation" id=6]
[sub_resource type="Animation" id=3]
resource_name = "right"
tracks/0/type = "value"
tracks/0/path = NodePath("Transitions:position")
Expand Down Expand Up @@ -93,7 +93,7 @@ tracks/1/keys = {
} ]
}

[sub_resource type="Animation" id=5]
[sub_resource type="Animation" id=4]
resource_name = "up"
tracks/0/type = "value"
tracks/0/path = NodePath("Transitions:position")
Expand Down Expand Up @@ -132,9 +132,9 @@ layer = 3

[node name="TransitionPlayer" type="AnimationPlayer" parent="TransitionLayer"]
anims/down = SubResource( 1 )
anims/left = SubResource( 3 )
anims/right = SubResource( 6 )
anims/up = SubResource( 5 )
anims/left = SubResource( 2 )
anims/right = SubResource( 3 )
anims/up = SubResource( 4 )

[node name="Transitions" type="Node2D" parent="TransitionLayer"]
position = Vector2( 320, 224 )
Expand All @@ -157,6 +157,14 @@ texture = ExtResource( 6 )
region_enabled = true
region_rect = Rect2( 0, 0, 320, 256 )

[node name="Transition3" type="Sprite" parent="TransitionLayer/Transitions"]
position = Vector2( 160, -128 )
scale = Vector2( 5, 1 )
texture = ExtResource( 6 )
flip_v = true
region_enabled = true
region_rect = Rect2( 0, 0, 64, 256 )

[node name="HUD" type="CanvasLayer" parent="."]
layer = 2

Expand Down
Loading

0 comments on commit c8dda5f

Please sign in to comment.