Skip to content

Commit edadb26

Browse files
MattsAttackMattsAttack
committed
water changes and Forward+
1 parent 14c26e0 commit edadb26

File tree

3 files changed

+29
-30
lines changed

3 files changed

+29
-30
lines changed

‎game/zones/outside/outside_zone.tscn

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -115,34 +115,34 @@ _data = {
115115
"Thumb": ExtResource("37_kpb8w")
116116
}
117117

118-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_3bnhs"]
118+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_llmnr"]
119119
animation = &"Grip"
120120

121-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_4t32q"]
121+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_shhf3"]
122122
animation = &"Grip"
123123

124-
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_ct86m"]
124+
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_b2enr"]
125125
filter_enabled = true
126126
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"]
127127

128-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_sxkk3"]
128+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_wlxny"]
129129
animation = &"Grip 5"
130130

131-
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_tukrt"]
131+
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_rag20"]
132132
filter_enabled = true
133133
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"]
134134

135-
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_jns0a"]
135+
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_wv45u"]
136136
graph_offset = Vector2(-536, 11)
137-
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_3bnhs")
137+
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_llmnr")
138138
nodes/ClosedHand1/position = Vector2(-600, 300)
139-
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_4t32q")
139+
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_shhf3")
140140
nodes/ClosedHand2/position = Vector2(-360, 300)
141-
nodes/Grip/node = SubResource("AnimationNodeBlend2_ct86m")
141+
nodes/Grip/node = SubResource("AnimationNodeBlend2_b2enr")
142142
nodes/Grip/position = Vector2(0, 20)
143-
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_sxkk3")
143+
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_wlxny")
144144
nodes/OpenHand/position = Vector2(-600, 100)
145-
nodes/Trigger/node = SubResource("AnimationNodeBlend2_tukrt")
145+
nodes/Trigger/node = SubResource("AnimationNodeBlend2_rag20")
146146
nodes/Trigger/position = Vector2(-360, 20)
147147
node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"]
148148

@@ -185,34 +185,34 @@ _data = {
185185
"Thumb": ExtResource("72_vpdgb")
186186
}
187187

188-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_6138t"]
188+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_npo8m"]
189189
animation = &"Grip"
190190

191-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_iulk3"]
191+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_3fwwd"]
192192
animation = &"Grip"
193193

194-
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_kjlkc"]
194+
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_oyk3d"]
195195
filter_enabled = true
196196
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"]
197197

198-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_d0ci4"]
198+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_weqds"]
199199
animation = &"Grip 5"
200200

201-
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_5r231"]
201+
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_ymco0"]
202202
filter_enabled = true
203203
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"]
204204

205-
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_t3oyd"]
205+
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_gma72"]
206206
graph_offset = Vector2(-552.664, 107.301)
207-
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_6138t")
207+
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_npo8m")
208208
nodes/ClosedHand1/position = Vector2(-600, 300)
209-
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_iulk3")
209+
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_3fwwd")
210210
nodes/ClosedHand2/position = Vector2(-360, 300)
211-
nodes/Grip/node = SubResource("AnimationNodeBlend2_kjlkc")
211+
nodes/Grip/node = SubResource("AnimationNodeBlend2_oyk3d")
212212
nodes/Grip/position = Vector2(0, 40)
213-
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_d0ci4")
213+
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_weqds")
214214
nodes/OpenHand/position = Vector2(-600, 100)
215-
nodes/Trigger/node = SubResource("AnimationNodeBlend2_5r231")
215+
nodes/Trigger/node = SubResource("AnimationNodeBlend2_ymco0")
216216
nodes/Trigger/position = Vector2(-360, 40)
217217
node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"]
218218

@@ -255,7 +255,7 @@ visible = false
255255
libraries = {
256256
"": SubResource("AnimationLibrary_kw48d")
257257
}
258-
tree_root = SubResource("AnimationNodeBlendTree_jns0a")
258+
tree_root = SubResource("AnimationNodeBlendTree_wv45u")
259259

260260
[node name="WristUI" parent="XROrigin3D/LeftHand/CollisionHandLeft" index="7"]
261261
visible = false
@@ -291,7 +291,7 @@ visible = false
291291
libraries = {
292292
"": SubResource("AnimationLibrary_reqae")
293293
}
294-
tree_root = SubResource("AnimationNodeBlendTree_t3oyd")
294+
tree_root = SubResource("AnimationNodeBlendTree_gma72")
295295

296296
[node name="LeftPocket" parent="XROrigin3D/PlayerBody" index="0"]
297297
visible = false
@@ -351,7 +351,7 @@ mesh = SubResource("CylinderMesh_vn0uq")
351351
shape = SubResource("CylinderShape3D_loupj")
352352

353353
[node name="Water" parent="World" index="11" instance=ExtResource("6_cfk41")]
354-
transform = Transform3D(0.997825, 0, 0, 0, 0.997825, 0, 0, 0, 0.997825, 0, -1.21416, 0)
354+
transform = Transform3D(0.997825, 0, 0, 0, 0.997825, 0, 0, 0, 0.997825, -0.0193071, -0.650075, 0.0158176)
355355
skeleton = NodePath("../..")
356356

357357
[node name="Start" type="Timer" parent="World" index="12"]

‎project.godot

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ common/drop_mouse_on_gui_input_disabled=true
5353

5454
[rendering]
5555

56-
renderer/rendering_method="gl_compatibility"
5756
renderer/rendering_method.mobile="gl_compatibility"
5857
textures/vram_compression/import_etc2_astc=true
5958
environment/defaults/default_clear_color=Color(0.482353, 0.717647, 0.976471, 1)

‎water.tscn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
[sub_resource type="QuadMesh" id="QuadMesh_rwwvi"]
66
lightmap_size_hint = Vector2i(7, 7)
77
size = Vector2(50, 50)
8-
subdivide_width = 200
9-
subdivide_depth = 200
8+
subdivide_width = 1500
9+
subdivide_depth = 1500
1010
orientation = 1
1111

1212
[sub_resource type="FastNoiseLite" id="FastNoiseLite_su50w"]
@@ -43,9 +43,9 @@ shader_parameter/metallic = 0.0
4343
shader_parameter/roughness = 0.02
4444
shader_parameter/wave_direction = Vector2(2, 0)
4545
shader_parameter/wave_direction2 = Vector2(0, 1)
46-
shader_parameter/time_scale = 0.025
46+
shader_parameter/time_scale = 0.04
4747
shader_parameter/noise_scale = 10.0
48-
shader_parameter/height_scale = 0.15
48+
shader_parameter/height_scale = 0.3
4949
shader_parameter/color_deep = Color(0, 0, 0, 1)
5050
shader_parameter/color_shallow = Color(0, 0, 0, 1)
5151
shader_parameter/beers_law = 2.0

0 commit comments

Comments
 (0)