Skip to content

Commit

Permalink
added logos to walls
Browse files Browse the repository at this point in the history
  • Loading branch information
@MattsAttack
MattsAttack committed Mar 22, 2024
1 parent 667280c commit 255cb20
Show file tree
Hide file tree
Showing 12 changed files with 161 additions and 35 deletions.
Binary file added assets/Images/DodgeLabel.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions assets/Images/DodgeLabel.png.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://lrtvfwv7os"
path.s3tc="res://.godot/imported/DodgeLabel.png-ea479651af000f667c3e3ec273be5d66.s3tc.ctex"
path.etc2="res://.godot/imported/DodgeLabel.png-ea479651af000f667c3e3ec273be5d66.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}

[deps]

source_file="res://assets/Images/DodgeLabel.png"
dest_files=["res://.godot/imported/DodgeLabel.png-ea479651af000f667c3e3ec273be5d66.s3tc.ctex", "res://.godot/imported/DodgeLabel.png-ea479651af000f667c3e3ec273be5d66.etc2.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Binary file added assets/Images/DuckLabel.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions assets/Images/DuckLabel.png.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cwh52xugiyjsk"
path.s3tc="res://.godot/imported/DuckLabel.png-69818946a7b71f8344b6c8153fc0436c.s3tc.ctex"
path.etc2="res://.godot/imported/DuckLabel.png-69818946a7b71f8344b6c8153fc0436c.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}

[deps]

source_file="res://assets/Images/DuckLabel.png"
dest_files=["res://.godot/imported/DuckLabel.png-69818946a7b71f8344b6c8153fc0436c.s3tc.ctex", "res://.godot/imported/DuckLabel.png-69818946a7b71f8344b6c8153fc0436c.etc2.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Binary file added assets/Images/WallLabel.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions assets/Images/WallLabel.png.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cedby7sy0qiao"
path.s3tc="res://.godot/imported/WallLabel.png-67ca07648ae3c5e85c10de14e30f6fa1.s3tc.ctex"
path.etc2="res://.godot/imported/WallLabel.png-67ca07648ae3c5e85c10de14e30f6fa1.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}

[deps]

source_file="res://assets/Images/WallLabel.png"
dest_files=["res://.godot/imported/WallLabel.png-67ca07648ae3c5e85c10de14e30f6fa1.s3tc.ctex", "res://.godot/imported/WallLabel.png-67ca07648ae3c5e85c10de14e30f6fa1.etc2.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
0 game/zones/outside/tropical_rush.png → assets/Images/tropical_rush.png
View file
File renamed without changes
8 changes: 4 additions & 4 deletions game/zones/outside/tropical_rush.png.import → assets/Images/tropical_rush.png.import
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cbamap6i3aj2o"
path.s3tc="res://.godot/imported/tropical_rush.png-1c4621b3f59d401c95b5bbc0fda5497e.s3tc.ctex"
path.etc2="res://.godot/imported/tropical_rush.png-1c4621b3f59d401c95b5bbc0fda5497e.etc2.ctex"
path.s3tc="res://.godot/imported/tropical_rush.png-ec6291e4add94cf7e36617208f7bb0da.s3tc.ctex"
path.etc2="res://.godot/imported/tropical_rush.png-ec6291e4add94cf7e36617208f7bb0da.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}

[deps]

source_file="res://game/zones/outside/tropical_rush.png"
dest_files=["res://.godot/imported/tropical_rush.png-1c4621b3f59d401c95b5bbc0fda5497e.s3tc.ctex", "res://.godot/imported/tropical_rush.png-1c4621b3f59d401c95b5bbc0fda5497e.etc2.ctex"]
source_file="res://assets/Images/tropical_rush.png"
dest_files=["res://.godot/imported/tropical_rush.png-ec6291e4add94cf7e36617208f7bb0da.s3tc.ctex", "res://.godot/imported/tropical_rush.png-ec6291e4add94cf7e36617208f7bb0da.etc2.ctex"]

[params]

Expand Down
11 changes: 10 additions & 1 deletion duck_wall.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=6 format=3 uid="uid://be84v8ckjlybh"]
[gd_scene load_steps=7 format=3 uid="uid://be84v8ckjlybh"]

[ext_resource type="Script" path="res://flying_wall.gd" id="1_o64j7"]
[ext_resource type="Texture2D" uid="uid://cwh52xugiyjsk" path="res://assets/Images/DuckLabel.png" id="2_0pjk0"]

[sub_resource type="BoxShape3D" id="BoxShape3D_0u5qo"]
size = Vector3(9.87498, 1.83564, 0.4)
Expand All @@ -25,3 +26,11 @@ shape = SubResource("BoxShape3D_0u5qo")
transform = Transform3D(9.90165, 0, 0, 0, 1.85, 0, 0, 0, 0.387, 0, 0.540423, 0)
mesh = SubResource("BoxMesh_wiawj")
surface_material_override/0 = SubResource("StandardMaterial3D_7buq1")

[node name="Sprite3D" type="Sprite3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000156164, 0.543892, 0.196808)
texture = ExtResource("2_0pjk0")

[node name="Sprite3D2" type="Sprite3D" parent="."]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.000156164, 0.543892, -0.193956)
texture = ExtResource("2_0pjk0")
11 changes: 10 additions & 1 deletion flying_wall.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=6 format=3 uid="uid://c1lrnpmoykp0"]
[gd_scene load_steps=7 format=3 uid="uid://c1lrnpmoykp0"]

[ext_resource type="Script" path="res://flying_wall.gd" id="1_al88d"]
[ext_resource type="Texture2D" uid="uid://lrtvfwv7os" path="res://assets/Images/DodgeLabel.png" id="2_gr3nq"]

[sub_resource type="BoxShape3D" id="BoxShape3D_0u5qo"]
size = Vector3(6.12568, 2.6, 0.4)
Expand All @@ -25,3 +26,11 @@ shape = SubResource("BoxShape3D_0u5qo")
transform = Transform3D(6.14934, 0, 0, 0, 2.60556, 0, 0, 0, 0.387296, 0, 0, 0)
mesh = SubResource("BoxMesh_wiawj")
surface_material_override/0 = SubResource("StandardMaterial3D_7buq1")

[node name="Sprite3D" type="Sprite3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.864906, 0, 0, 0, 1, -0.0369999, 0.112981, 0.208354)
texture = ExtResource("2_gr3nq")

[node name="Sprite3D2" type="Sprite3D" parent="."]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 0.864906, 0, 8.74228e-08, 0, -1, -0.0369999, 0.112981, -0.206376)
texture = ExtResource("2_gr3nq")
8 changes: 4 additions & 4 deletions game/start_scene/start_scene.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
resource_local_to_scene = true
size = Vector2(3, 2)

[sub_resource type="ViewportTexture" id="ViewportTexture_0mu5d"]
[sub_resource type="ViewportTexture" id="ViewportTexture_3soqp"]
viewport_path = NodePath("Viewport")

[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_y4gbq"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6agpw"]
transparency = 1
cull_mode = 2
shading_mode = 0
albedo_texture = SubResource("ViewportTexture_0mu5d")
albedo_texture = SubResource("ViewportTexture_3soqp")
texture_filter = 1

[sub_resource type="BoxShape3D" id="BoxShape3D_iru2p"]
Expand Down Expand Up @@ -59,7 +59,7 @@ unshaded = true

[node name="Screen" parent="Screen" index="1"]
mesh = SubResource("QuadMesh_44p7b")
surface_material_override/0 = SubResource("StandardMaterial3D_y4gbq")
surface_material_override/0 = SubResource("StandardMaterial3D_6agpw")

[node name="CollisionShape3D" parent="Screen/StaticBody3D" index="0"]
shape = SubResource("BoxShape3D_iru2p")
Expand Down
50 changes: 25 additions & 25 deletions game/zones/outside/outside_zone.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
[ext_resource type="Animation" uid="uid://bq7cjxdn28jcv" path="res://addons/godot-xr-tools/hands/animations/right/Surfer.res" id="71_23ljh"]
[ext_resource type="Animation" uid="uid://d2ukhr3n2r1u8" path="res://addons/godot-xr-tools/hands/animations/right/Thumb.res" id="72_vpdgb"]
[ext_resource type="PackedScene" uid="uid://c8di31x8aviu7" path="res://assets/sky/sky.tscn" id="74_oxnep"]
[ext_resource type="Texture2D" uid="uid://cbamap6i3aj2o" path="res://game/zones/outside/tropical_rush.png" id="75_2ujg7"]
[ext_resource type="Texture2D" uid="uid://cbamap6i3aj2o" path="res://assets/Images/tropical_rush.png" id="75_2ujg7"]
[ext_resource type="Terrain3DStorage" uid="uid://d4n4oxjw8hxo7" path="res://new_terrain_3d_storage.res" id="76_lrjdy"]
[ext_resource type="Terrain3DMaterial" uid="uid://c4m48gihf1oxn" path="res://new_terrain_3d_material.tres" id="77_4wak6"]
[ext_resource type="Terrain3DTextureList" uid="uid://cgq4iftxm46is" path="res://new_terrain_3d_texture_list.tres" id="78_wkllm"]
Expand Down Expand Up @@ -119,34 +119,34 @@ _data = {
"Thumb": ExtResource("37_kpb8w")
}

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_f84ng"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ibwmb"]
animation = &"Grip"

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_hcaay"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_h28b8"]
animation = &"Grip"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_np85n"]
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_pxp54"]
filter_enabled = true
filters = ["Armature/Skeleton3D:Little_Distal_L", "Armature/Skeleton3D:Little_Intermediate_L", "Armature/Skeleton3D:Little_Metacarpal_L", "Armature/Skeleton3D:Little_Proximal_L", "Armature/Skeleton3D:Middle_Distal_L", "Armature/Skeleton3D:Middle_Intermediate_L", "Armature/Skeleton3D:Middle_Metacarpal_L", "Armature/Skeleton3D:Middle_Proximal_L", "Armature/Skeleton3D:Ring_Distal_L", "Armature/Skeleton3D:Ring_Intermediate_L", "Armature/Skeleton3D:Ring_Metacarpal_L", "Armature/Skeleton3D:Ring_Proximal_L", "Armature/Skeleton3D:Thumb_Distal_L", "Armature/Skeleton3D:Thumb_Metacarpal_L", "Armature/Skeleton3D:Thumb_Proximal_L", "Armature/Skeleton:Little_Distal_L", "Armature/Skeleton:Little_Intermediate_L", "Armature/Skeleton:Little_Proximal_L", "Armature/Skeleton:Middle_Distal_L", "Armature/Skeleton:Middle_Intermediate_L", "Armature/Skeleton:Middle_Proximal_L", "Armature/Skeleton:Ring_Distal_L", "Armature/Skeleton:Ring_Intermediate_L", "Armature/Skeleton:Ring_Proximal_L", "Armature/Skeleton:Thumb_Distal_L", "Armature/Skeleton:Thumb_Proximal_L"]

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_xf6xa"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_fpbeb"]
animation = &"Grip 5"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_c4r2f"]
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_6h6vl"]
filter_enabled = true
filters = ["Armature/Skeleton3D:Index_Distal_L", "Armature/Skeleton3D:Index_Intermediate_L", "Armature/Skeleton3D:Index_Metacarpal_L", "Armature/Skeleton3D:Index_Proximal_L", "Armature/Skeleton:Index_Distal_L", "Armature/Skeleton:Index_Intermediate_L", "Armature/Skeleton:Index_Proximal_L"]

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_55uh8"]
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_5micm"]
graph_offset = Vector2(-536, 11)
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_f84ng")
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_ibwmb")
nodes/ClosedHand1/position = Vector2(-600, 300)
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_hcaay")
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_h28b8")
nodes/ClosedHand2/position = Vector2(-360, 300)
nodes/Grip/node = SubResource("AnimationNodeBlend2_np85n")
nodes/Grip/node = SubResource("AnimationNodeBlend2_pxp54")
nodes/Grip/position = Vector2(0, 20)
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_xf6xa")
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_fpbeb")
nodes/OpenHand/position = Vector2(-600, 100)
nodes/Trigger/node = SubResource("AnimationNodeBlend2_c4r2f")
nodes/Trigger/node = SubResource("AnimationNodeBlend2_6h6vl")
nodes/Trigger/position = Vector2(-360, 20)
node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"]

Expand Down Expand Up @@ -189,34 +189,34 @@ _data = {
"Thumb": ExtResource("72_vpdgb")
}

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_h1t5b"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_1m2ju"]
animation = &"Grip"

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_r7xnx"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_fxt1c"]
animation = &"Grip"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_vi1rg"]
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_elv8k"]
filter_enabled = true
filters = ["Armature/Skeleton3D:Little_Distal_R", "Armature/Skeleton3D:Little_Intermediate_R", "Armature/Skeleton3D:Little_Metacarpal_R", "Armature/Skeleton3D:Little_Proximal_R", "Armature/Skeleton3D:Middle_Distal_R", "Armature/Skeleton3D:Middle_Intermediate_R", "Armature/Skeleton3D:Middle_Metacarpal_R", "Armature/Skeleton3D:Middle_Proximal_R", "Armature/Skeleton3D:Ring_Distal_R", "Armature/Skeleton3D:Ring_Intermediate_R", "Armature/Skeleton3D:Ring_Metacarpal_R", "Armature/Skeleton3D:Ring_Proximal_R", "Armature/Skeleton3D:Thumb_Distal_R", "Armature/Skeleton3D:Thumb_Metacarpal_R", "Armature/Skeleton3D:Thumb_Proximal_R", "Armature/Skeleton:Little_Distal_R", "Armature/Skeleton:Little_Intermediate_R", "Armature/Skeleton:Little_Proximal_R", "Armature/Skeleton:Middle_Distal_R", "Armature/Skeleton:Middle_Intermediate_R", "Armature/Skeleton:Middle_Proximal_R", "Armature/Skeleton:Ring_Distal_R", "Armature/Skeleton:Ring_Intermediate_R", "Armature/Skeleton:Ring_Proximal_R", "Armature/Skeleton:Thumb_Distal_R", "Armature/Skeleton:Thumb_Proximal_R"]

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_s8pb2"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_3m5qw"]
animation = &"Grip 5"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_i4reo"]
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_x3j3b"]
filter_enabled = true
filters = ["Armature/Skeleton3D:Index_Distal_R", "Armature/Skeleton3D:Index_Intermediate_R", "Armature/Skeleton3D:Index_Metacarpal_R", "Armature/Skeleton3D:Index_Proximal_R", "Armature/Skeleton:Index_Distal_R", "Armature/Skeleton:Index_Intermediate_R", "Armature/Skeleton:Index_Proximal_R"]

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_ocq35"]
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_0si8c"]
graph_offset = Vector2(-552.664, 107.301)
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_h1t5b")
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_1m2ju")
nodes/ClosedHand1/position = Vector2(-600, 300)
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_r7xnx")
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_fxt1c")
nodes/ClosedHand2/position = Vector2(-360, 300)
nodes/Grip/node = SubResource("AnimationNodeBlend2_vi1rg")
nodes/Grip/node = SubResource("AnimationNodeBlend2_elv8k")
nodes/Grip/position = Vector2(0, 40)
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_s8pb2")
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_3m5qw")
nodes/OpenHand/position = Vector2(-600, 100)
nodes/Trigger/node = SubResource("AnimationNodeBlend2_i4reo")
nodes/Trigger/node = SubResource("AnimationNodeBlend2_x3j3b")
nodes/Trigger/position = Vector2(-360, 40)
node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"]

Expand Down Expand Up @@ -266,7 +266,7 @@ visible = false
libraries = {
"": SubResource("AnimationLibrary_kw48d")
}
tree_root = SubResource("AnimationNodeBlendTree_55uh8")
tree_root = SubResource("AnimationNodeBlendTree_5micm")

[node name="WristUI" parent="XROrigin3D/LeftHand/CollisionHandLeft" index="7"]
visible = false
Expand Down Expand Up @@ -302,7 +302,7 @@ visible = false
libraries = {
"": SubResource("AnimationLibrary_reqae")
}
tree_root = SubResource("AnimationNodeBlendTree_ocq35")
tree_root = SubResource("AnimationNodeBlendTree_0si8c")

[node name="LeftPocket" parent="XROrigin3D/PlayerBody" index="0"]
visible = false
Expand Down

1 comment on commit 255cb20

@lishaduck
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay!

Please sign in to comment.