Merge pull request #6 from Frakif91/Combat-System

Hammer WIP & Luigi OW WIP

Assets/3D/Blocks/Mario Block.fbx.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bsw2e45bvt6m3"
+path="res://.godot/imported/Mario Block.fbx-c4c09f4ab810c950d8cfe398c7b55db8.scn"
+
+[deps]
+
+source_file="res://Assets/3D/Blocks/Mario Block.fbx"
+dest_files=["res://.godot/imported/Mario Block.fbx-c4c09f4ab810c950d8cfe398c7b55db8.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+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=""
+_subresources={}
+fbx/importer=0
+fbx/allow_geometry_helper_nodes=false
+fbx/embedded_image_handling=1

Assets/3D/Blocks/Question Block.fbx.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dxio2tgsy1w36"
+path="res://.godot/imported/Question Block.fbx-482f92ad987b432fed16e068aa7984f9.scn"
+
+[deps]
+
+source_file="res://Assets/3D/Blocks/Question Block.fbx"
+dest_files=["res://.godot/imported/Question Block.fbx-482f92ad987b432fed16e068aa7984f9.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+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=""
+_subresources={}
+fbx/importer=0
+fbx/allow_geometry_helper_nodes=false
+fbx/embedded_image_handling=1

Assets/3D/Blocks/Used Block 1.fbx.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dqk03uracp0p8"
+path="res://.godot/imported/Used Block 1.fbx-7e5dfe9ca374be56f579a9cb12bd8b45.scn"
+
+[deps]
+
+source_file="res://Assets/3D/Blocks/Used Block 1.fbx"
+dest_files=["res://.godot/imported/Used Block 1.fbx-7e5dfe9ca374be56f579a9cb12bd8b45.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+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=""
+_subresources={}
+fbx/importer=0
+fbx/allow_geometry_helper_nodes=false
+fbx/embedded_image_handling=1

Assets/3D/Blocks/mario_block.tscn

@@ -0,0 +1,34 @@
+[gd_scene load_steps=8 format=3 uid="uid://b66mg7qjtcc0w"]
+
+[ext_resource type="PackedScene" uid="uid://bsw2e45bvt6m3" path="res://Assets/3D/Blocks/Mario Block.fbx" id="1_rrlyi"]
+[ext_resource type="Script" path="res://Godot/Scripts/overworld_block.gd" id="1_uv5s0"]
+[ext_resource type="PackedScene" uid="uid://dxio2tgsy1w36" path="res://Assets/3D/Blocks/Question Block.fbx" id="3_sgjht"]
+[ext_resource type="PackedScene" uid="uid://dqk03uracp0p8" path="res://Assets/3D/Blocks/Used Block 1.fbx" id="4_74jft"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_n8uu1"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ojsf2"]
+
+[sub_resource type="BoxMesh" id="BoxMesh_jtbtj"]
+material = SubResource("StandardMaterial3D_ojsf2")
+
+[node name="Node3D" type="StaticBody3D"]
+script = ExtResource("1_uv5s0")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("BoxShape3D_n8uu1")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+visible = false
+mesh = SubResource("BoxMesh_jtbtj")
+
+[node name="Mario Block" parent="." instance=ExtResource("1_rrlyi")]
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
+visible = false
+
+[node name="Question Block" parent="." instance=ExtResource("3_sgjht")]
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
+
+[node name="Used Block 1" parent="." instance=ExtResource("4_74jft")]
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
+visible = false

Assets/3D/Nouveau dossier/Furniture.glb.import

@@ -17,6 +17,7 @@ nodes/root_type=""
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

Assets/Sprites/LuigiOverworld.png.import

@@ -15,13 +15,13 @@ dest_files=["res://.godot/imported/LuigiOverworld.png-fbbe60479255356bfa1299eb4b
 
 [params]
 
-compress/mode=3
+compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,4 +31,4 @@ process/normal_map_invert_y=false
 process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
-detect_3d/compress_to=1
+detect_3d/compress_to=0

Assets/texture_ml.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c7of4gepgelob"
+path="res://.godot/imported/texture_ml.png-ff4820471b750fc1e5fb717fe375751a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/texture_ml.png"
+dest_files=["res://.godot/imported/texture_ml.png-ff4820471b750fc1e5fb717fe375751a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+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=1

Assets/texture_ml_little.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://chwn1br1jchb"
+path="res://.godot/imported/texture_ml_little.png-b2ba67577628e5fbe1a438e4fa91a1e9.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/texture_ml_little.png"
+dest_files=["res://.godot/imported/texture_ml_little.png-b2ba67577628e5fbe1a438e4fa91a1e9.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+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=1

Fonts/04B_30__.TTF.import

@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/04B_30__.TTF-b9a746bac1059642c3e5c5ef7e5ef580
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48

Fonts/Daydream-short.ttf.import

@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/Daydream-short.ttf-0624f9d91978424c0d7851d20d
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48

Fonts/Daydream.ttf.import

@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/Daydream.ttf-727c999d345777972a95d9602fd47f52
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48

Fonts/MarioLuigi2.ttf.import

@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/MarioLuigi2.ttf-033a8a7fc7b2c9088ef716a09ac46
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48

Fonts/SuperMario256.ttf.import

@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/SuperMario256.ttf-c6700db31acb6f396e94d4268e8
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48