Valcuda/project_teddy
1
0
Fork 0
forked from the_adventures_of_teddy/project_teddy
Code Pull requests Activity

Water

Browse source
This commit is contained in:
Paul Black 2023-04-27 12:53:50 -06:00
parent 18ce7abc15
commit 1927b8a1d4
6 changed files with 663 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.DS_Store vendored
View file

Binary file not shown.

BIN
2DArt/.DS_Store vendored Normal file
View file

Binary file not shown.

10
scenes/farmland-map.tscn
View file

@ -1,6 +1,8 @@
[gd_scene load_steps=210 format=3 uid="uid://c1y6p4m0sktfj"] [gd_scene load_steps=212 format=3 uid="uid://c1y6p4m0sktfj"]
[ext_resource type="PackedScene" uid="uid://bxbhwe1hjul2n" path="res://objects/farmland/Farmland.glb" id="1_tthhv"] [ext_resource type="PackedScene" uid="uid://bxbhwe1hjul2n" path="res://objects/farmland/Farmland.glb" id="1_tthhv"]
[ext_resource type="PackedScene" uid="uid://c2f2to78vgbix" path="res://scenes/waterplane.tscn" id="2_snr1c"]
[ext_resource type="PackedScene" uid="uid://dytp1teb22c8o" path="res://scenes/death_collider.tscn" id="3_f02uo"]
[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_j2wnh"] [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_j2wnh"]
data = PackedVector3Array(-1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, 0.892, 0.4187, -1, 1, -1, -1, 1, 1, -1, 0.892, 0.4187, -1, 0.892, -0.4971, -1, 1, -1, -1, 0.6246, -0.4971, -1, 1, -1, -1, 0.892, -0.4971, -1, -1, 1, -1, 0.892, 0.4187, -1, 1, 1, -1, 0.892, 0.4187, -1, 0.1275, 0.5586, -1, 0.6246, 0.4187, -1, -1, 1, -1, 0.1275, 0.5586, -1, 0.892, 0.4187, -1, 0.6246, -0.4971, -1, -1, -1, -1, 1, -1, -1, -0.4586, -0.0319, -1, 0.6246, -0.4971, -1, 0.1275, -0.0319, -1, -1, 1, -1, -0.4586, 0.5586, -1, 0.1275, 0.5586, -1, -0.4586, -0.0319, -1, -1, -1, -1, 0.6246, -0.4971, -1, -1, 1, -1, -0.4586, -0.0319, -1, -0.4586, 0.5586, -1, -1, -1, -1, -0.4586, -0.0319, -1, -1, 1, -1, 0.6246, 0.4187, -1, 0.1275, -0.0319, -1, 0.6246, -0.4971, -1, 0.6246, 0.4187, -1, 0.1275, 0.5586, -1, 0.1275, -0.0319, -1, 1, 0.0895, 0.3782, 1, 1, 1, 1, 0.68, 0.3782, 1, -1, -1, 1, 0.68, -0.4287, 1, 1, -1, 1, -1, -1, 1, 0.0895, -0.4287, 1, 0.68, -0.4287, 1, 0.0895, 0.3782, 1, -1, 1, 1, 1, 1, 1, -1, -1, 1, 0.0895, 0.3782, 1, 0.0895, -0.4287, 1, -1, 1, 1, 0.0895, 0.3782, 1, -1, -1, 1, 0.68, -0.4287, 1, 1, 1, 1, 1, -1, 1, 0.68, -0.4287, 1, 0.68, 0.3782, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, 1, 1, 1, -1, 1, 1, 0.6246, 0.4187, -1, 0.6246, -0.4971, -0.6517, 0.6246, 0.4187, -0.6517, 0.6246, 0.4187, -1, 0.6246, -0.4971, -1, 0.6246, -0.4971, -0.6517, 0.892, -0.4971, -1, 0.892, 0.4187, -0.6517, 0.892, -0.4971, -0.6517, 0.892, -0.4971, -1, 0.892, 0.4187, -1, 0.892, 0.4187, -0.6517, 0.892, -0.4971, -0.6517, 0.6246, 0.4187, -0.6517, 0.6246, -0.4971, -0.6517, 0.892, -0.4971, -0.6517, 0.892, 0.4187, -0.6517, 0.6246, 0.4187, -0.6517, 0.6246, -0.4971, -1, 0.892, -0.4971, -0.6517, 0.6246, -0.4971, -0.6517, 0.6246, -0.4971, -1, 0.892, -0.4971, -1, 0.892, -0.4971, -0.6517, 0.892, 0.4187, -0.6517, 0.6246, 0.4187, -1, 0.6246, 0.4187, -0.6517, 0.892, 0.4187, -0.6517, 0.892, 0.4187, -1, 0.6246, 0.4187, -1, 0.7549, 0.0895, 0.3782, 0.7549, 0.68, -0.4287, 0.7549, 0.0895, -0.4287, 0.7549, 0.0895, 0.3782, 0.7549, 0.68, 0.3782, 0.7549, 0.68, -0.4287, 1, 0.68, -0.4287, 0.7549, 0.0895, -0.4287, 0.7549, 0.68, -0.4287, 1, 0.68, -0.4287, 1, 0.0895, -0.4287, 0.7549, 0.0895, -0.4287, 1, 0.0895, 0.3782, 0.7549, 0.68, 0.3782, 0.7549, 0.0895, 0.3782, 1, 0.0895, 0.3782, 1, 0.68, 0.3782, 0.7549, 0.68, 0.3782, 0.7549, 0.0895, -0.4287, 1, 0.0895, 0.3782, 0.7549, 0.0895, 0.3782, 0.7549, 0.0895, -0.4287, 1, 0.0895, -0.4287, 1, 0.0895, 0.3782, 0.7549, 0.68, 0.3782, 1, 0.68, -0.4287, 0.7549, 0.68, -0.4287, 0.7549, 0.68, 0.3782, 1, 0.68, 0.3782, 1, 0.68, -0.4287, 0.1275, -0.0319, -0.7858, -0.4586, 0.5586, -0.7858, -0.4586, -0.0319, -0.7858, 0.1275, -0.0319, -0.7858, 0.1275, 0.5586, -0.7858, -0.4586, 0.5586, -0.7858, -0.4586, 0.5586, -1, -0.4586, -0.0319, -0.7858, -0.4586, 0.5586, -0.7858, -0.4586, 0.5586, -1, -0.4586, -0.0319, -1, -0.4586, -0.0319, -0.7858, 0.1275, -0.0319, -1, 0.1275, 0.5586, -0.7858, 0.1275, -0.0319, -0.7858, 0.1275, -0.0319, -1, 0.1275, 0.5586, -1, 0.1275, 0.5586, -0.7858, -0.4586, -0.0319, -1, 0.1275, -0.0319, -0.7858, -0.4586, -0.0319, -0.7858, -0.4586, -0.0319, -1, 0.1275, -0.0319, -1, 0.1275, -0.0319, -0.7858, 0.1275, 0.5586, -0.7858, -0.4586, 0.5586, -1, -0.4586, 0.5586, -0.7858, 0.1275, 0.5586, -0.7858, 0.1275, 0.5586, -1, -0.4586, 0.5586, -1) data = PackedVector3Array(-1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, 0.892, 0.4187, -1, 1, -1, -1, 1, 1, -1, 0.892, 0.4187, -1, 0.892, -0.4971, -1, 1, -1, -1, 0.6246, -0.4971, -1, 1, -1, -1, 0.892, -0.4971, -1, -1, 1, -1, 0.892, 0.4187, -1, 1, 1, -1, 0.892, 0.4187, -1, 0.1275, 0.5586, -1, 0.6246, 0.4187, -1, -1, 1, -1, 0.1275, 0.5586, -1, 0.892, 0.4187, -1, 0.6246, -0.4971, -1, -1, -1, -1, 1, -1, -1, -0.4586, -0.0319, -1, 0.6246, -0.4971, -1, 0.1275, -0.0319, -1, -1, 1, -1, -0.4586, 0.5586, -1, 0.1275, 0.5586, -1, -0.4586, -0.0319, -1, -1, -1, -1, 0.6246, -0.4971, -1, -1, 1, -1, -0.4586, -0.0319, -1, -0.4586, 0.5586, -1, -1, -1, -1, -0.4586, -0.0319, -1, -1, 1, -1, 0.6246, 0.4187, -1, 0.1275, -0.0319, -1, 0.6246, -0.4971, -1, 0.6246, 0.4187, -1, 0.1275, 0.5586, -1, 0.1275, -0.0319, -1, 1, 0.0895, 0.3782, 1, 1, 1, 1, 0.68, 0.3782, 1, -1, -1, 1, 0.68, -0.4287, 1, 1, -1, 1, -1, -1, 1, 0.0895, -0.4287, 1, 0.68, -0.4287, 1, 0.0895, 0.3782, 1, -1, 1, 1, 1, 1, 1, -1, -1, 1, 0.0895, 0.3782, 1, 0.0895, -0.4287, 1, -1, 1, 1, 0.0895, 0.3782, 1, -1, -1, 1, 0.68, -0.4287, 1, 1, 1, 1, 1, -1, 1, 0.68, -0.4287, 1, 0.68, 0.3782, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, 1, 1, 1, -1, 1, 1, 0.6246, 0.4187, -1, 0.6246, -0.4971, -0.6517, 0.6246, 0.4187, -0.6517, 0.6246, 0.4187, -1, 0.6246, -0.4971, -1, 0.6246, -0.4971, -0.6517, 0.892, -0.4971, -1, 0.892, 0.4187, -0.6517, 0.892, -0.4971, -0.6517, 0.892, -0.4971, -1, 0.892, 0.4187, -1, 0.892, 0.4187, -0.6517, 0.892, -0.4971, -0.6517, 0.6246, 0.4187, -0.6517, 0.6246, -0.4971, -0.6517, 0.892, -0.4971, -0.6517, 0.892, 0.4187, -0.6517, 0.6246, 0.4187, -0.6517, 0.6246, -0.4971, -1, 0.892, -0.4971, -0.6517, 0.6246, -0.4971, -0.6517, 0.6246, -0.4971, -1, 0.892, -0.4971, -1, 0.892, -0.4971, -0.6517, 0.892, 0.4187, -0.6517, 0.6246, 0.4187, -1, 0.6246, 0.4187, -0.6517, 0.892, 0.4187, -0.6517, 0.892, 0.4187, -1, 0.6246, 0.4187, -1, 0.7549, 0.0895, 0.3782, 0.7549, 0.68, -0.4287, 0.7549, 0.0895, -0.4287, 0.7549, 0.0895, 0.3782, 0.7549, 0.68, 0.3782, 0.7549, 0.68, -0.4287, 1, 0.68, -0.4287, 0.7549, 0.0895, -0.4287, 0.7549, 0.68, -0.4287, 1, 0.68, -0.4287, 1, 0.0895, -0.4287, 0.7549, 0.0895, -0.4287, 1, 0.0895, 0.3782, 0.7549, 0.68, 0.3782, 0.7549, 0.0895, 0.3782, 1, 0.0895, 0.3782, 1, 0.68, 0.3782, 0.7549, 0.68, 0.3782, 0.7549, 0.0895, -0.4287, 1, 0.0895, 0.3782, 0.7549, 0.0895, 0.3782, 0.7549, 0.0895, -0.4287, 1, 0.0895, -0.4287, 1, 0.0895, 0.3782, 0.7549, 0.68, 0.3782, 1, 0.68, -0.4287, 0.7549, 0.68, -0.4287, 0.7549, 0.68, 0.3782, 1, 0.68, 0.3782, 1, 0.68, -0.4287, 0.1275, -0.0319, -0.7858, -0.4586, 0.5586, -0.7858, -0.4586, -0.0319, -0.7858, 0.1275, -0.0319, -0.7858, 0.1275, 0.5586, -0.7858, -0.4586, 0.5586, -0.7858, -0.4586, 0.5586, -1, -0.4586, -0.0319, -0.7858, -0.4586, 0.5586, -0.7858, -0.4586, 0.5586, -1, -0.4586, -0.0319, -1, -0.4586, -0.0319, -0.7858, 0.1275, -0.0319, -1, 0.1275, 0.5586, -0.7858, 0.1275, -0.0319, -0.7858, 0.1275, -0.0319, -1, 0.1275, 0.5586, -1, 0.1275, 0.5586, -0.7858, -0.4586, -0.0319, -1, 0.1275, -0.0319, -0.7858, -0.4586, -0.0319, -0.7858, -0.4586, -0.0319, -1, 0.1275, -0.0319, -1, 0.1275, -0.0319, -0.7858, 0.1275, 0.5586, -0.7858, -0.4586, 0.5586, -1, -0.4586, 0.5586, -0.7858, 0.1275, 0.5586, -0.7858, 0.1275, 0.5586, -1, -0.4586, 0.5586, -1)
@ -1667,3 +1669,9 @@ shape = SubResource("ConcavePolygonShape3D_vkxvi")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Tree/StaticBody3D" index="0"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Tree/StaticBody3D" index="0"]
shape = SubResource("ConcavePolygonShape3D_oav6p") shape = SubResource("ConcavePolygonShape3D_oav6p")
[node name="WaterPlane" parent="." index="208" instance=ExtResource("2_snr1c")]
transform = Transform3D(8.14113, 0, 0, 0, 8.14113, 0, 0, 0, 8.14113, 11.1618, -0.767609, 13.9014)
[node name="death_collider" parent="." index="209" instance=ExtResource("3_f02uo")]
transform = Transform3D(8.14354, 0, 0, 0, 2.04505, 0, 0, 0, 11.0468, 11.1763, -1.74844, 13.5309)

695
scenes/islands-map.tscn
View file

File diff suppressed because one or more lines are too long

23
scenes/mainmenu.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=3 uid="uid://cyiyctp6y3n3x"] [gd_scene load_steps=12 format=3 uid="uid://cyiyctp6y3n3x"]
[ext_resource type="Script" path="res://scripts/mainmenu.gd" id="1_w5lhm"] [ext_resource type="Script" path="res://scripts/mainmenu.gd" id="1_w5lhm"]
[ext_resource type="Texture2D" uid="uid://gt440iakn1t5" path="res://2DArt/Main Menu/ProjectTeddyFULLLogo.png" id="3_kac7j"] [ext_resource type="Texture2D" uid="uid://gt440iakn1t5" path="res://2DArt/Main Menu/ProjectTeddyFULLLogo.png" id="3_kac7j"]
@ -9,6 +9,7 @@
[ext_resource type="Texture2D" uid="uid://c8q2aon4qw0xp" path="res://2DArt/Main Menu/CreditUnselected.png" id="8_h20ni"] [ext_resource type="Texture2D" uid="uid://c8q2aon4qw0xp" path="res://2DArt/Main Menu/CreditUnselected.png" id="8_h20ni"]
[ext_resource type="Texture2D" uid="uid://ds6ymkq367mdi" path="res://2DArt/Main Menu/CreditSelected.png" id="8_plwex"] [ext_resource type="Texture2D" uid="uid://ds6ymkq367mdi" path="res://2DArt/Main Menu/CreditSelected.png" id="8_plwex"]
[ext_resource type="Texture2D" uid="uid://deqe3xaqpv1xf" path="res://splashes/OurTimeIsNow_Solo.png" id="10_oafyi"] [ext_resource type="Texture2D" uid="uid://deqe3xaqpv1xf" path="res://splashes/OurTimeIsNow_Solo.png" id="10_oafyi"]
[ext_resource type="Texture2D" uid="uid://bhe2kvpsn0yci" path="res://2DArt/tutorial/music.webp" id="11_1ejug"]
[ext_resource type="AudioStream" uid="uid://ccbshroalxbnl" path="res://music/Fall-From-Grace.mp3" id="11_6irkm"] [ext_resource type="AudioStream" uid="uid://ccbshroalxbnl" path="res://music/Fall-From-Grace.mp3" id="11_6irkm"]
[node name="mainmenu" type="Control"] [node name="mainmenu" type="Control"]
@ -165,6 +166,26 @@ offset_right = 252.0
offset_bottom = 81.0 offset_bottom = 81.0
horizontal_alignment = 1 horizontal_alignment = 1
[node name="Music" type="Sprite2D" parent="musicPanel"]
position = Vector2(16, 15)
scale = Vector2(0.112694, 0.112694)
texture = ExtResource("11_1ejug")
[node name="Music2" type="Sprite2D" parent="musicPanel"]
position = Vector2(236, 15)
scale = Vector2(0.112694, 0.112694)
texture = ExtResource("11_1ejug")
[node name="Music3" type="Sprite2D" parent="musicPanel"]
position = Vector2(236, 80)
scale = Vector2(0.112694, 0.112694)
texture = ExtResource("11_1ejug")
[node name="Music4" type="Sprite2D" parent="musicPanel"]
position = Vector2(16, 80)
scale = Vector2(0.112694, 0.112694)
texture = ExtResource("11_1ejug")
[connection signal="pressed" from="Button" to="." method="_on_button_pressed"] [connection signal="pressed" from="Button" to="." method="_on_button_pressed"]
[connection signal="mouse_entered" from="playButton" to="." method="_on_play_button_mouse_entered"] [connection signal="mouse_entered" from="playButton" to="." method="_on_play_button_mouse_entered"]
[connection signal="mouse_exited" from="playButton" to="." method="_on_play_button_mouse_exited"] [connection signal="mouse_exited" from="playButton" to="." method="_on_play_button_mouse_exited"]

11
scenes/tutorial.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=3 uid="uid://dkokyp5lwhks4"] [gd_scene load_steps=10 format=3 uid="uid://dkokyp5lwhks4"]
[ext_resource type="Script" path="res://scripts/maps/tutorial.gd" id="1_40ws8"] [ext_resource type="Script" path="res://scripts/maps/tutorial.gd" id="1_40ws8"]
[ext_resource type="PackedScene" uid="uid://dp1q51kvd8uow" path="res://scenes/Teddy.tscn" id="1_081si"] [ext_resource type="PackedScene" uid="uid://dp1q51kvd8uow" path="res://scenes/Teddy.tscn" id="1_081si"]
@ -21,9 +21,6 @@ sky = SubResource("Sky_74emm")
tonemap_mode = 2 tonemap_mode = 2
glow_enabled = true glow_enabled = true
[sub_resource type="BoxShape3D" id="BoxShape3D_rdgne"]
size = Vector3(7.87666, 0.125057, 6.86207)
[node name="tutorial" type="Node3D"] [node name="tutorial" type="Node3D"]
script = ExtResource("1_40ws8") script = ExtResource("1_40ws8")
@ -45,9 +42,3 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.21775, 1.22338, -28.4151)
[node name="Farmland" parent="." instance=ExtResource("5_imhi6")] [node name="Farmland" parent="." instance=ExtResource("5_imhi6")]
[node name="Virtual joystick" parent="." instance=ExtResource("6_p8th3")] [node name="Virtual joystick" parent="." instance=ExtResource("6_p8th3")]
[node name="well-collider" type="StaticBody3D" parent="."]
[node name="CollisionShape3D" type="CollisionShape3D" parent="well-collider"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.2551, 1.29865, 14.0777)
shape = SubResource("BoxShape3D_rdgne")