sjkillen
/
SlimeoosOdyssey
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sjkillen:bcb99f5ebd62f60daae3930f87b6b74bbadc7686
Branches Tags
sjkillen:master
sjkillen:NoahBackup-08-20-1.22PM
sjkillen:soundboard
sjkillen:NoahBackup
sjkillen:Player
sjkillen:stable2
sjkillen:premerge
sjkillen:stable
..
compare: sjkillen:d67300d8b870586221a94b8a50e4cefd118c15e4
Branches Tags
sjkillen:master
sjkillen:NoahBackup-08-20-1.22PM
sjkillen:soundboard
sjkillen:NoahBackup
sjkillen:Player
sjkillen:stable2
sjkillen:premerge
sjkillen:stable

No commits in common. "bcb99f5ebd62f60daae3930f87b6b74bbadc7686" and "d67300d8b870586221a94b8a50e4cefd118c15e4" have entirely different histories.
bcb99f5ebd ... d67300d8b8

7 changed files with 7 additions and 107 deletions
Show Stats Expand all files Collapse all files

94
godot/Level/Island.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=26 format=3 uid="uid://3d51hjh2st8a"]
[gd_scene load_steps=24 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"]
@ -20,9 +20,7 @@
[ext_resource type="Script" path="res://Level/Music.gd" id="22_2pcqg"]
[ext_resource type="AudioStream" uid="uid://mvyk5xpf0f55" path="res://Sounds/beachquiet.ogg" id="22_4tylf"]
[ext_resource type="PackedScene" uid="uid://7utef1nnena8" path="res://player.tscn" id="22_cuxj6"]
[ext_resource type="PackedScene" uid="uid://c4s6y758n77lw" path="res://villager_shared.tscn" id="24_ddfvk"]
[ext_resource type="PackedScene" uid="uid://b3aus2kigf8xt" path="res://Models/beach_decor/cooler.tscn" id="24_sl7ne"]
[ext_resource type="PackedScene" uid="uid://cft26nug7kyqb" path="res://ambient_light_1.tscn" id="25_novxt"]
[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"]
@ -272,96 +270,6 @@ one_shot = true
[node name="Tween" type="Timer" parent="Music"]
one_shot = true
[node name="villager" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.32051, 2.42874, -0.151928)
[node name="villager2" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.344183, 2.49657, 0.497255)
[node name="villager3" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.1756, 2.30817, -0.040845)
[node name="villager4" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.13518, 2.24888, -4.00956)
[node name="villager5" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.124053, 2.37507, -4.54257)
[node name="villager6" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0673849, 3.01779, -4.0846)
[node name="villager7" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.124385, 2.04828, -5.05899)
[node name="villager8" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.31916, 2.22662, -3.08429)
[node name="villager9" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.57973, 2.33972, -3.67175)
[node name="villager10" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.91611, 2.37549, -1.0799)
[node name="villager11" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.643094, 2.19164, 1.15459)
[node name="villager12" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.982957, 2.26155, 0.763667)
[node name="villager13" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.33971, 2.12543, 0.623835)
[node name="villager14" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.11141, 2.26718, 0.608947)
[node name="villager15" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.01736, 2.38815, -1.81019)
[node name="villager16" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.89617, 2.21949, -3.20033)
[node name="villager17" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.20015, 2.4323, -3.35734)
[node name="villager18" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.22409, 2.20857, -4.4881)
[node name="villager19" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.709331, 2.50856, -1.84133)
[node name="villager20" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.75547, 2.33257, -1.63179)
[node name="villager21" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.43468, 2.35865, -0.0161896)
[node name="villager22" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.348403, 2.35328, -0.838555)
[node name="villager23" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.743449, 2.39485, -1.09457)
[node name="villager24" parent="." instance=ExtResource("24_ddfvk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.11439, 2.14828, -1.28646)
[node name="OmniLight3D" parent="." instance=ExtResource("25_novxt")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.13746, 2.69992, -0.435097)
[node name="OmniLight3D2" parent="." instance=ExtResource("25_novxt")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.22669, 2.84986, -2.06954)
[node name="OmniLight3D3" parent="." instance=ExtResource("25_novxt")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.76529, 2.60448, -0.160995)
[node name="OmniLight3D4" parent="." instance=ExtResource("25_novxt")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.57077, 2.69259, -2.05053)
[node name="OmniLight3D5" parent="." instance=ExtResource("25_novxt")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.41671, 2.76416, -1.32509)
[node name="OmniLight3D6" parent="." instance=ExtResource("25_novxt")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.19657, 2.76902, -1.46035)
[connection signal="finished" from="Music" to="Music" method="_on_finished"]
[connection signal="timeout" from="Music/Transition" to="Music" method="_on_transition_timer_timeout"]
[connection signal="timeout" from="Music/Tween" to="Music" method="_on_tween_timer_timeout"]

2
godot/Models/slime.gd
View File

@ -5,8 +5,6 @@ extends Node3D
func _ready():
var color = colors[randi() % colors.size()]
var mat = $Armature/Skeleton3D/Slime.get_active_material(3).duplicate()
$Armature/Skeleton3D/Slime.set_surface_override_material(3, mat)
$Armature/Skeleton3D/Slime.get_active_material(3).albedo_color = color
func walk():

10
godot/Models/slime.tscn
View File

@ -33,13 +33,13 @@ colors = Array[Color]([Color(0, 0.113725, 0.905882, 1), Color(0.592157, 0, 0.243
transform = Transform3D(0.859505, 0, -0.511128, 0, 1, 0, 0.511128, 0, 0.859505, 0, 0, 0)
[node name="Skeleton3D" parent="Armature" index="0"]
bones/1/position = Vector3(0, 0.532995, 0)
bones/1/position = Vector3(0, 0.426907, 0)
bones/2/rotation = Quaternion(-0.0627444, 0.00212883, -0.213248, 0.974979)
bones/3/rotation = Quaternion(0.100834, -0.698956, 0.0125015, 0.707911)
bones/7/rotation = Quaternion(-0.129267, 2.66294e-09, 2.4271e-09, 0.99161)
bones/8/rotation = Quaternion(0.591049, -1.01643e-09, -4.6686e-11, 0.806635)
bones/10/rotation = Quaternion(0.085015, -4.52807e-08, -6.64593e-08, 0.99638)
bones/11/rotation = Quaternion(-0.613365, 5.48373e-08, 5.89338e-08, 0.789799)
bones/7/rotation = Quaternion(-0.258758, 2.37407e-09, 2.7412e-09, 0.965942)
bones/8/rotation = Quaternion(0.188737, -8.6127e-10, -4.72466e-10, 0.982028)
bones/10/rotation = Quaternion(0.253668, -5.6372e-08, -4.28241e-09, 0.967291)
bones/11/rotation = Quaternion(-0.191712, 1.11242e-07, 9.37652e-08, 0.981451)
[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
tree_root = SubResource("AnimationNodeStateMachine_prt7l")

3
godot/ambient_light_1.tscn
View File

@ -1,3 +0,0 @@
[gd_scene format=3 uid="uid://cft26nug7kyqb"]
[node name="OmniLight3D" type="OmniLight3D"]

1
godot/slime_shared.gd
View File

@ -4,6 +4,7 @@ class_name SharedSlime
var is_holdable: bool = true
func _ready():
$slime.foo()
$slime.idle()
func walk():

1
godot/slime_shared.tscn
View File

@ -10,7 +10,6 @@ radius = 0.05
script = ExtResource("1_gmj2r")
[node name="slime" parent="." instance=ExtResource("2_6u4ex")]
transform = Transform3D(0.035, 0, 0, 0, 0.035, 0, 0, 0, 0.035, 0, 0, 0)
[node name="slime_collision" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0408143, 0)

3
godot/tests/test_pickup_slimes.tscn
View File

@ -24,6 +24,3 @@ shape = SubResource("ConcavePolygonShape3D_x4p8c")
[node name="villager" parent="." instance=ExtResource("2_oxniy")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.513896)
[node name="villager2" parent="." instance=ExtResource("2_oxniy")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.543042, 0, 0)