diff --git a/credits.toml b/credits.toml index a34106b..769502d 100644 --- a/credits.toml +++ b/credits.toml @@ -101,6 +101,8 @@ name = "ViRiX" credit = "UI and Item sound effect Jingles Sample 2" link = "https://opengameart.org/content/ui-and-item-sound-effect-jingles-sample-2" - - - +[[people]] +name = "TMPxyz" +[[people.credits]] +credit = "Low-poly Skeleton head" +link = "https://opengameart.org/content/low-poly-skeleton-head" diff --git a/godot/assets/SkeletonHead.fbx b/godot/assets/SkeletonHead.fbx new file mode 100644 index 0000000..d1b2878 Binary files /dev/null and b/godot/assets/SkeletonHead.fbx differ diff --git a/godot/assets/SkeletonHead.fbx.import b/godot/assets/SkeletonHead.fbx.import new file mode 100644 index 0000000..ee1e5ca --- /dev/null +++ b/godot/assets/SkeletonHead.fbx.import @@ -0,0 +1,46 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bv3681lscxq1u" +path="res://.godot/imported/SkeletonHead.fbx-4f3a70ba53ff7da3827cd5b36ecbce58.scn" + +[deps] + +source_file="res://assets/SkeletonHead.fbx" +dest_files=["res://.godot/imported/SkeletonHead.fbx-4f3a70ba53ff7da3827cd5b36ecbce58.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=true +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +fbx/importer=0 +fbx/allow_geometry_helper_nodes=false +fbx/embedded_image_handling=1 +fbx/naming_version=2 diff --git a/godot/mesh/ball_mesh.tscn b/godot/mesh/ball_mesh.tscn deleted file mode 100644 index 13b9975..0000000 --- a/godot/mesh/ball_mesh.tscn +++ /dev/null @@ -1,17 +0,0 @@ -[gd_scene format=3 uid="uid://r13poamopmnv"] - -[sub_resource type="FastNoiseLite" id="FastNoiseLite_yxhor"] -noise_type = 2 - -[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_yli5f"] -noise = SubResource("FastNoiseLite_yxhor") - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3g557"] -albedo_color = Color(0, 1, 0, 1) -albedo_texture = SubResource("NoiseTexture2D_yli5f") - -[sub_resource type="SphereMesh" id="SphereMesh_1cgct"] -material = SubResource("StandardMaterial3D_3g557") - -[node name="mesh_instance_3d" type="MeshInstance3D" unique_id=37904686] -mesh = SubResource("SphereMesh_1cgct") diff --git a/godot/mesh/skeleton_head.tscn b/godot/mesh/skeleton_head.tscn new file mode 100644 index 0000000..c73da47 --- /dev/null +++ b/godot/mesh/skeleton_head.tscn @@ -0,0 +1,12 @@ +[gd_scene format=3 uid="uid://b6yn1s4i4l1kn"] + +[ext_resource type="PackedScene" uid="uid://bv3681lscxq1u" path="res://assets/SkeletonHead.fbx" id="1_63jjb"] +[ext_resource type="Texture2D" uid="uid://pc11ed28u88f" path="res://raw_assets/Skull/SkeletonHead_D.png" id="2_xx7r6"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_63jjb"] +albedo_texture = ExtResource("2_xx7r6") + +[node name="SkeletonHead" unique_id=1848024401 instance=ExtResource("1_63jjb")] + +[node name="Sphere" parent="." index="0" unique_id=1577758116] +surface_material_override/0 = SubResource("StandardMaterial3D_63jjb") diff --git a/godot/raw_assets/McGuffin/Telly.blend b/godot/raw_assets/McGuffin/Telly.blend deleted file mode 100644 index e9b4375..0000000 Binary files a/godot/raw_assets/McGuffin/Telly.blend and /dev/null differ diff --git a/godot/raw_assets/Skull/SkeletonHead.blend b/godot/raw_assets/Skull/SkeletonHead.blend new file mode 100644 index 0000000..09a9a2d Binary files /dev/null and b/godot/raw_assets/Skull/SkeletonHead.blend differ diff --git a/godot/raw_assets/Skull/SkeletonHead.blend1 b/godot/raw_assets/Skull/SkeletonHead.blend1 new file mode 100644 index 0000000..8c46d97 Binary files /dev/null and b/godot/raw_assets/Skull/SkeletonHead.blend1 differ diff --git a/godot/raw_assets/Skull/SkeletonHead_D.png b/godot/raw_assets/Skull/SkeletonHead_D.png new file mode 100644 index 0000000..cff5ad7 Binary files /dev/null and b/godot/raw_assets/Skull/SkeletonHead_D.png differ diff --git a/godot/raw_assets/Skull/SkeletonHead_D.png.import b/godot/raw_assets/Skull/SkeletonHead_D.png.import new file mode 100644 index 0000000..a900e1a --- /dev/null +++ b/godot/raw_assets/Skull/SkeletonHead_D.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://pc11ed28u88f" +path.s3tc="res://.godot/imported/SkeletonHead_D.png-58ebd8f6b3c7e09f462bc12d3730413c.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://raw_assets/Skull/SkeletonHead_D.png" +dest_files=["res://.godot/imported/SkeletonHead_D.png-58ebd8f6b3c7e09f462bc12d3730413c.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/godot/scenes/misc/ball.tscn b/godot/scenes/misc/ball.tscn index 99c1495..2d115d3 100644 --- a/godot/scenes/misc/ball.tscn +++ b/godot/scenes/misc/ball.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://dfnbc8sbufa4j"] -[ext_resource type="PackedScene" uid="uid://r13poamopmnv" path="res://mesh/ball_mesh.tscn" id="1_texud"] [ext_resource type="AudioStream" uid="uid://gpx6c15g3151" path="res://raw_assets/sfx/ball/zapsplat_sport_basketball_single_bounce_on_court_003_71655.mp3" id="2_xt7sd"] +[ext_resource type="PackedScene" uid="uid://b6yn1s4i4l1kn" path="res://mesh/skeleton_head.tscn" id="3_thun5"] [sub_resource type="SphereShape3D" id="SphereShape3D_1cgct"] @@ -12,11 +12,12 @@ collision_mask = 7 contact_monitor = true max_contacts_reported = 10 -[node name="mesh_instance_3d" parent="." unique_id=37904686 instance=ExtResource("1_texud")] - [node name="collision_shape_3d" type="CollisionShape3D" parent="." unique_id=1408432914] shape = SubResource("SphereShape3D_1cgct") [node name="bounce_sfx" type="AudioStreamPlayer3D" parent="." unique_id=929128469] stream = ExtResource("2_xt7sd") bus = &"SFX" + +[node name="SkeletonHead" parent="." unique_id=1848024401 instance=ExtResource("3_thun5")] +transform = Transform3D(0.45, 0, 0, 0, 0.45, 0, 0, 0, 0.45, 0, 0, -0.046112746) diff --git a/godot/scenes/misc/replay_ball.tscn b/godot/scenes/misc/replay_ball.tscn index 4e1e498..cf4682e 100644 --- a/godot/scenes/misc/replay_ball.tscn +++ b/godot/scenes/misc/replay_ball.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://dc17w5n6y1an"] -[ext_resource type="PackedScene" uid="uid://r13poamopmnv" path="res://mesh/ball_mesh.tscn" id="1_ishne"] +[ext_resource type="PackedScene" uid="uid://b6yn1s4i4l1kn" path="res://mesh/skeleton_head.tscn" id="1_ishne"] [sub_resource type="SphereShape3D" id="SphereShape3D_1cgct"] @@ -10,7 +10,8 @@ collision_mask = 4 contact_monitor = true max_contacts_reported = 10 -[node name="mesh_instance_3d" parent="." unique_id=37904686 instance=ExtResource("1_ishne")] - [node name="collision_shape_3d" type="CollisionShape3D" parent="." unique_id=1408432914] shape = SubResource("SphereShape3D_1cgct") + +[node name="SkeletonHead" parent="." unique_id=1848024401 instance=ExtResource("1_ishne")] +transform = Transform3D(0.45, 0, 0, 0, 0.45, 0, 0, 0, 0.45, 0, 0, -0.046112746) diff --git a/godot/scenes/player/ball_weapon.tscn b/godot/scenes/player/ball_weapon.tscn index caaec23..d0dad01 100644 --- a/godot/scenes/player/ball_weapon.tscn +++ b/godot/scenes/player/ball_weapon.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://ci8r4lgijtalh"] -[ext_resource type="PackedScene" uid="uid://r13poamopmnv" path="res://mesh/ball_mesh.tscn" id="1_5wscr"] +[ext_resource type="PackedScene" uid="uid://b6yn1s4i4l1kn" path="res://mesh/skeleton_head.tscn" id="1_5wscr"] [node name="ball_weapon" type="BallWeapon" unique_id=53185750] -[node name="mesh_instance_3d" parent="." unique_id=37904686 instance=ExtResource("1_5wscr")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.29060435) +[node name="SkeletonHead" parent="." unique_id=1848024401 instance=ExtResource("1_5wscr")] +transform = Transform3D(0.27947488, 0, -0.109058715, 0.03355545, 0.28544673, 0.08598952, 0.10376818, -0.09230474, 0.2659173, 0.1697936, 0.19336164, -0.40600848)