Skip to content

Commit

Permalink
finished background loading,
Browse files Browse the repository at this point in the history
started reworking control keys
  • Loading branch information
geegaz committed Feb 8, 2022
1 parent 6bcd1e4 commit 12948c0
Show file tree
Hide file tree
Showing 82 changed files with 412 additions and 323 deletions.
14 changes: 3 additions & 11 deletions Assets/Materials/background_cube.tres
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
[gd_resource type="SpatialMaterial" load_steps=2 format=2]

[ext_resource path="res://Assets/Materials/background_cube_emission.png" type="Texture" id=1]
[ext_resource path="res://Assets/Materials/background_cube_color.png" type="Texture" id=2]

[resource]
resource_local_to_scene = true
albedo_color = Color( 0.792157, 0.654902, 0.662745, 1 )
metallic_specular = 0.0
emission_enabled = true
emission = Color( 0, 0, 0, 1 )
emission_energy = 0.0
emission_operator = 0
emission_on_uv2 = false
emission_texture = ExtResource( 1 )
uv1_scale = Vector3( 3, 2, 1 )
uv2_scale = Vector3( 0.5, 1, 1 )
flags_unshaded = true
albedo_texture = ExtResource( 2 )
Binary file added Assets/Materials/background_cube_color.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/anti_control_tiles.png-b0b7545b014ba859c0be24f499ca81b7.stex"
path="res://.import/background_cube_color.png-f3f1b8f7a053a94fcc394384b3da727b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Tilesets/tilesets/anti_control_tiles.png"
dest_files=[ "res://.import/anti_control_tiles.png-b0b7545b014ba859c0be24f499ca81b7.stex" ]
source_file="res://Assets/Materials/background_cube_color.png"
dest_files=[ "res://.import/background_cube_color.png-f3f1b8f7a053a94fcc394384b3da727b.stex" ]

[params]

Expand Down
8 changes: 0 additions & 8 deletions Assets/Materials/cube.tres

This file was deleted.

8 changes: 8 additions & 0 deletions Assets/Materials/end_cube.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[gd_resource type="SpatialMaterial" load_steps=2 format=2]

[ext_resource path="res://Assets/Materials/end_cube_color.png" type="Texture" id=1]

[resource]
resource_local_to_scene = true
flags_unshaded = true
albedo_texture = ExtResource( 1 )
Binary file added Assets/Materials/end_cube_color.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/prop_tiles.png-0be80c92c25f283381173ec73a7c885c.stex"
path="res://.import/end_cube_color.png-18bc81ac935e811df451f74411f882ea.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Tilesets/tilesets/prop_tiles.png"
dest_files=[ "res://.import/prop_tiles.png-0be80c92c25f283381173ec73a7c885c.stex" ]
source_file="res://Assets/Materials/end_cube_color.png"
dest_files=[ "res://.import/end_cube_color.png-18bc81ac935e811df451f74411f882ea.stex" ]

[params]

Expand Down
Binary file added Assets/Models/custom_cube.blend
Binary file not shown.
Binary file added Assets/Models/custom_cube.blend1
Binary file not shown.
48 changes: 48 additions & 0 deletions Assets/Models/custom_cube.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Blender v2.92.0 OBJ File: 'custom_cube.blend'
# www.blender.org
o Cube
v 1.000000 1.000000 -1.000000
v 1.000000 -1.000000 -1.000000
v 1.000000 1.000000 1.000000
v 1.000000 -1.000000 1.000000
v -1.000000 1.000000 -1.000000
v -1.000000 -1.000000 -1.000000
v -1.000000 1.000000 1.000000
v -1.000000 -1.000000 1.000000
vt 0.017857 0.684524
vt 0.315476 0.684524
vt 0.315476 0.982143
vt 0.017857 0.982143
vt 0.982143 0.017857
vt 0.982143 0.315476
vt 0.684524 0.315476
vt 0.684524 0.017857
vt 0.982143 0.351191
vt 0.982143 0.648810
vt 0.684524 0.648810
vt 0.684524 0.351191
vt 0.684524 0.684524
vt 0.982143 0.684524
vt 0.982143 0.982143
vt 0.684524 0.982143
vt 0.315476 0.351191
vt 0.315476 0.648810
vt 0.017857 0.648810
vt 0.017857 0.351191
vt 0.315476 0.017857
vt 0.315476 0.315476
vt 0.017857 0.315476
vt 0.017857 0.017857
vn 0.0000 1.0000 0.0000
vn 0.0000 0.0000 1.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
s off
f 1/1/1 5/2/1 7/3/1 3/4/1
f 4/5/2 3/6/2 7/7/2 8/8/2
f 8/9/3 7/10/3 5/11/3 6/12/3
f 6/13/4 2/14/4 4/15/4 8/16/4
f 2/17/5 1/18/5 3/19/5 4/20/5
f 6/21/6 5/22/6 1/23/6 2/24/6
19 changes: 19 additions & 0 deletions Assets/Models/custom_cube.obj.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="wavefront_obj"
type="Mesh"
path="res://.import/custom_cube.obj-b6d9425b97ea1e29f2c12182182ab466.mesh"

[deps]

files=[ "res://.import/custom_cube.obj-b6d9425b97ea1e29f2c12182182ab466.mesh" ]

source_file="res://Assets/Models/custom_cube.obj"
dest_files=[ "res://.import/custom_cube.obj-b6d9425b97ea1e29f2c12182182ab466.mesh", "res://.import/custom_cube.obj-b6d9425b97ea1e29f2c12182182ab466.mesh" ]

[params]

generate_tangents=true
scale_mesh=Vector3( 1, 1, 1 )
offset_mesh=Vector3( 0, 0, 0 )
optimize_mesh=true
Binary file modified Assets/Sprites/UI/arrows-Sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/arrows-Sheet.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/arrows-Sheet.png-e35e1612b4cc10941f158fcdd8c273cb.stex"
path="res://.import/arrows-Sheet.png-27ba61df2ffe510de3ff541615c3979b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/arrows-Sheet.png"
dest_files=[ "res://.import/arrows-Sheet.png-e35e1612b4cc10941f158fcdd8c273cb.stex" ]
source_file="res://Assets/Sprites/ui/arrows-Sheet.png"
dest_files=[ "res://.import/arrows-Sheet.png-27ba61df2ffe510de3ff541615c3979b.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/controls/controls_background.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/controls_background.png-796863eb37ba61e33ab4bc8cda232290.stex"
path="res://.import/controls_background.png-1cad13f7340565ac7fe5f94c19693fa1.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/controls/controls_background.png"
dest_files=[ "res://.import/controls_background.png-796863eb37ba61e33ab4bc8cda232290.stex" ]
source_file="res://Assets/Sprites/ui/controls/controls_background.png"
dest_files=[ "res://.import/controls_background.png-1cad13f7340565ac7fe5f94c19693fa1.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/controls/controls_background_top.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/controls_background_top.png-438e40d4214f67e17f623a3356922870.stex"
path="res://.import/controls_background_top.png-81eb5b2594d8f05226677379642b6caa.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/controls/controls_background_top.png"
dest_files=[ "res://.import/controls_background_top.png-438e40d4214f67e17f623a3356922870.stex" ]
source_file="res://Assets/Sprites/ui/controls/controls_background_top.png"
dest_files=[ "res://.import/controls_background_top.png-81eb5b2594d8f05226677379642b6caa.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/controls/controls_place.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/controls_place.png-9032d355968e98f6bdbecaf793163129.stex"
path="res://.import/controls_place.png-948e4178098d0a209ed1ec98039b0eea.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/controls/controls_place.png"
dest_files=[ "res://.import/controls_place.png-9032d355968e98f6bdbecaf793163129.stex" ]
source_file="res://Assets/Sprites/ui/controls/controls_place.png"
dest_files=[ "res://.import/controls_place.png-948e4178098d0a209ed1ec98039b0eea.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/controls/left.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/left.png-40f1fed42391917e96be59595fad14bd.stex"
path="res://.import/left.png-15db36167e2feffa05aecbb3077bff3a.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/controls/left.png"
dest_files=[ "res://.import/left.png-40f1fed42391917e96be59595fad14bd.stex" ]
source_file="res://Assets/Sprites/ui/controls/left.png"
dest_files=[ "res://.import/left.png-15db36167e2feffa05aecbb3077bff3a.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/controls/right.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/right.png-025513ce63e255004446d27f9cdc37f8.stex"
path="res://.import/right.png-fb57aac1c8dabe9522ed5ecbcc66ac3f.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/controls/right.png"
dest_files=[ "res://.import/right.png-025513ce63e255004446d27f9cdc37f8.stex" ]
source_file="res://Assets/Sprites/ui/controls/right.png"
dest_files=[ "res://.import/right.png-fb57aac1c8dabe9522ed5ecbcc66ac3f.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/controls/spacebar.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

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

[deps]

source_file="res://Assets/Sprites/UI/controls/spacebar.png"
dest_files=[ "res://.import/spacebar.png-b9e0f3baa47bb7dc25fd0bf8afe7f295.stex" ]
source_file="res://Assets/Sprites/ui/controls/spacebar.png"
dest_files=[ "res://.import/spacebar.png-c3a4b8b7ba2f3763c1309247920e2886.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/hand-Sheet.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/hand-Sheet.png-51302c3d37ae4ab7b2ae86771cc723e0.stex"
path="res://.import/hand-Sheet.png-4a296113c73a310786259457333824dc.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/hand-Sheet.png"
dest_files=[ "res://.import/hand-Sheet.png-51302c3d37ae4ab7b2ae86771cc723e0.stex" ]
source_file="res://Assets/Sprites/ui/hand-Sheet.png"
dest_files=[ "res://.import/hand-Sheet.png-4a296113c73a310786259457333824dc.stex" ]

[params]

Expand Down
Binary file modified Assets/Sprites/UI/levels-Sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/levels-Sheet.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/levels-Sheet.png-40476e5cba92ec0e2aadcbca2cd72ab5.stex"
path="res://.import/levels-Sheet.png-f726e28754771e7851eda85acb896619.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/levels-Sheet.png"
dest_files=[ "res://.import/levels-Sheet.png-40476e5cba92ec0e2aadcbca2cd72ab5.stex" ]
source_file="res://Assets/Sprites/ui/levels-Sheet.png"
dest_files=[ "res://.import/levels-Sheet.png-f726e28754771e7851eda85acb896619.stex" ]

[params]

Expand Down
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.
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/theme-Sheet.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/theme-Sheet.png-c1fc5ddf9ef0600c6e1f6030ac5d9756.stex"
path="res://.import/theme-Sheet.png-42e1189ce0e85d99b2ceef4043f7b0de.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/theme-Sheet.png"
dest_files=[ "res://.import/theme-Sheet.png-c1fc5ddf9ef0600c6e1f6030ac5d9756.stex" ]
source_file="res://Assets/Sprites/ui/theme-Sheet.png"
dest_files=[ "res://.import/theme-Sheet.png-42e1189ce0e85d99b2ceef4043f7b0de.stex" ]

[params]

Expand Down
Binary file removed Assets/Sprites/UI/transition.png
Binary file not shown.
6 changes: 3 additions & 3 deletions Assets/Sprites/UI/tutorial-Sheet.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tutorial-Sheet.png-e0d42266bb5b9d2ec4f98a463ff64024.stex"
path="res://.import/tutorial-Sheet.png-a69910cb7349dd11e33402f185c92022.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/UI/tutorial-Sheet.png"
dest_files=[ "res://.import/tutorial-Sheet.png-e0d42266bb5b9d2ec4f98a463ff64024.stex" ]
source_file="res://Assets/Sprites/ui/tutorial-Sheet.png"
dest_files=[ "res://.import/tutorial-Sheet.png-a69910cb7349dd11e33402f185c92022.stex" ]

[params]

Expand Down
34 changes: 34 additions & 0 deletions Assets/Sprites/tilesets/anti_control_tiles.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

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

[deps]

source_file="res://Assets/Sprites/tilesets/anti_control_tiles.png"
dest_files=[ "res://.import/anti_control_tiles.png-665ea1e26a6eb9b026d9e75a2e3c861e.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
Loading

0 comments on commit 12948c0

Please sign in to comment.