Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23

godot/Level/Island.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=28 format=3 uid="uid://3d51hjh2st8a"]
+[gd_scene load_steps=30 format=3 uid="uid://3d51hjh2st8a"]
 
 [ext_resource type="PackedScene" uid="uid://d2d4uv7o5gx5p" path="res://Level/World/screen_shader.tscn" id="1_huyen"]
 [ext_resource type="PackedScene" uid="uid://b35w4hlh4n1jt" path="res://Level/World/world_environment.tscn" id="2_lerrn"]
@@ -26,6 +26,23 @@
 [ext_resource type="PackedScene" uid="uid://bw3k2c75qavce" path="res://Models/beach_decor/bucket.tscn" id="27_f3p1i"]
 [ext_resource type="PackedScene" uid="uid://g4gmc0pwlak1" path="res://Models/buildings/fence.tscn" id="28_prydb"]
 
+[sub_resource type="Animation" id="Animation_jpnyu"]
+resource_name = "waves"
+length = 6.0
+loop_mode = 1
+tracks/0/type = "position_3d"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath(".")
+tracks/0/interp = 2
+tracks/0/loop_wrap = true
+tracks/0/keys = PackedFloat32Array(0, 1, 0, 1.67685, 0, 3, 1, 0, 1.72422, 0, 6, 1, 0, 1.67685, 0)
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_p0f8x"]
+_data = {
+"waves": SubResource("Animation_jpnyu")
+}
+
 [sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_hf2jh"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_um2bu"]
@@ -41,7 +58,13 @@ size = Vector3(19.9041, 1, 1)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 
 [node name="ocean" parent="." instance=ExtResource("4_dey2i")]
-transform = Transform3D(5.04206, 0, 0, 0, 1.96278, 0, 0, 0, 4.42374, 0, 1.67685, 0)
+transform = Transform3D(5.04206, 0, 0, 0, 1.96278, 0, 0, 0, 4.42374, 0, 1.67782, 0)
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="ocean"]
+autoplay = "waves"
+libraries = {
+"": SubResource("AnimationLibrary_p0f8x")
+}
 
 [node name="Decorations" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
@@ -264,7 +287,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.192051, 2.60275, 0)
 
 [node name="Ambiance" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("22_4tylf")
-volume_db = 5.0
+volume_db = 7.0
 autoplay = true
 
 [node name="Music" type="AudioStreamPlayer" parent="."]