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

godot/Level/Island.tscn

@@ -36,7 +36,7 @@
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 
 [node name="ocean" parent="." instance=ExtResource("4_dey2i")]
-transform = Transform3D(1.96278, 0, 0, 0, 1.96278, 0, 0, 0, 1.96278, 0, 1.6366, 0)
+transform = Transform3D(5.04206, 0, 0, 0, 1.96278, 0, 0, 0, 4.42374, 0, 1.6366, 0)
 
 [node name="Decorations" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
@@ -192,6 +192,12 @@ transform = Transform3D(4.02251, 0, 0, 0, 4.02251, 0, 0, 0, 4.02251, 3.67653, 1.
 [node name="buildingruined" parent="Decorations/buildings" instance=ExtResource("15_6cbuu")]
 transform = Transform3D(3, 0, 0, 0, 7, 0, 0, 0, 3, 0.264704, 3.59073, -4.06142)
 
+[node name="buildingruined2" parent="Decorations/buildings" instance=ExtResource("15_6cbuu")]
+transform = Transform3D(10.7763, 0, 0, 0, 24.2281, -2.8831, 0, 6.72724, 10.3835, -18.0761, 2.05149, -1.87535)
+
+[node name="buildingruined3" parent="Decorations/buildings" instance=ExtResource("15_6cbuu")]
+transform = Transform3D(8.34623, 5.51405, 6.3941, -2.9358, 24.1936, 0, -6.15225, -4.06456, 8.67434, 21.0247, 2.05149, 0.72028)
+
 [node name="beach items" type="Node3D" parent="Decorations"]
 
 [node name="Floatie" parent="Decorations/beach items" instance=ExtResource("15_2v7p7")]

godot/Level/World/world_environment.tscn

@@ -1,11 +1,23 @@
-[gd_scene load_steps=2 format=3 uid="uid://b35w4hlh4n1jt"]
+[gd_scene load_steps=5 format=3 uid="uid://b35w4hlh4n1jt"]
+
+[ext_resource type="Texture2D" uid="uid://b53s6847b8ata" path="res://Textures/sunsetgradient.jpg" id="1_6dx4j"]
+
+[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_0nggy"]
+panorama = ExtResource("1_6dx4j")
+
+[sub_resource type="Sky" id="Sky_xyk6p"]
+sky_material = SubResource("PanoramaSkyMaterial_0nggy")
 
 [sub_resource type="Environment" id="Environment_cxd2l"]
-background_mode = 1
+background_mode = 2
-background_color = Color(0.733333, 0.317647, 0, 1)
+sky = SubResource("Sky_xyk6p")
 ambient_light_source = 2
-ambient_light_color = Color(1, 1, 1, 1)
+ambient_light_color = Color(0.988235, 0.752941, 0.580392, 1)
-ambient_light_energy = 0.1
+ambient_light_energy = 0.5
+fog_light_color = Color(0.670588, 0.333333, 0.129412, 1)
+fog_sun_scatter = 0.25
+fog_sky_affect = 0.0
+volumetric_fog_sky_affect = 0.0
 
 [node name="WorldEnvironment" type="WorldEnvironment"]
 environment = SubResource("Environment_cxd2l")

godot/Models/rocks/rock_1.tscn

@@ -1,5 +1,9 @@
-[gd_scene load_steps=2 format=3 uid="uid://g8vvg7c5ddkr"]
+[gd_scene load_steps=3 format=3 uid="uid://g8vvg7c5ddkr"]
 
 [ext_resource type="PackedScene" uid="uid://djmky2hkbqcni" path="res://Models/rocks/rock1.glb" id="1_81161"]
+[ext_resource type="Material" uid="uid://c5u3wq66dejxt" path="res://Textures/rock.tres" id="2_iyn5h"]
 
 [node name="rock1" instance=ExtResource("1_81161")]
+
+[node name="node_id4" parent="root" index="0"]
+surface_material_override/0 = ExtResource("2_iyn5h")

godot/Models/rocks/rock_2.tscn

@@ -1,5 +1,9 @@
-[gd_scene load_steps=2 format=3 uid="uid://bjafsu0utvm0g"]
+[gd_scene load_steps=3 format=3 uid="uid://bjafsu0utvm0g"]
 
 [ext_resource type="PackedScene" uid="uid://bfbdt30bmh76e" path="res://Models/rocks/rock2.glb" id="1_o8opw"]
+[ext_resource type="Material" uid="uid://c5u3wq66dejxt" path="res://Textures/rock.tres" id="2_f830k"]
 
 [node name="rock2" instance=ExtResource("1_o8opw")]
+
+[node name="node_id4" parent="root" index="0"]
+surface_material_override/0 = ExtResource("2_f830k")

godot/Models/rocks/rock_3.tscn

@@ -1,5 +1,9 @@
-[gd_scene load_steps=2 format=3 uid="uid://bf6bbqbaeh21y"]
+[gd_scene load_steps=3 format=3 uid="uid://bf6bbqbaeh21y"]
 
 [ext_resource type="PackedScene" uid="uid://cvmb3o2yv2ycq" path="res://Models/rocks/rock3.glb" id="1_gu6i8"]
+[ext_resource type="Material" uid="uid://c5u3wq66dejxt" path="res://Textures/rock.tres" id="2_mib4i"]
 
 [node name="rock3" instance=ExtResource("1_gu6i8")]
+
+[node name="node_id4" parent="root" index="0"]
+surface_material_override/0 = ExtResource("2_mib4i")

godot/Textures/sunsetgradient.jpg.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b53s6847b8ata"
+path.s3tc="res://.godot/imported/sunsetgradient.jpg-c1f0b7826ac39aff12d362ee64da002e.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/sunsetgradient.jpg"
+dest_files=["res://.godot/imported/sunsetgradient.jpg-c1f0b7826ac39aff12d362ee64da002e.s3tc.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

godot/Textures/water.tres

@@ -7,4 +7,4 @@
 albedo_color = Color(0.219608, 0.772549, 0.67451, 1)
 albedo_texture = ExtResource("1_02nrx")
 normal_texture = ExtResource("1_x366e")
-uv1_scale = Vector3(15, 15, 15)
+uv1_scale = Vector3(20, 20, 20)