diff --git a/assets/props/book/materials/MAT_book.material b/assets/props/book/materials/MAT_book.material deleted file mode 100644 index e57288a..0000000 Binary files a/assets/props/book/materials/MAT_book.material and /dev/null differ diff --git a/assets/props/book/materials/MA_book.material b/assets/props/book/materials/MA_book.material new file mode 100644 index 0000000..cfd4671 Binary files /dev/null and b/assets/props/book/materials/MA_book.material differ diff --git a/assets/props/book/sm_book.mesh b/assets/props/book/sm_book.mesh index 250f4e2..b39fa6f 100644 Binary files a/assets/props/book/sm_book.mesh and b/assets/props/book/sm_book.mesh differ diff --git a/assets/props/candle/sm_candle_a.mesh b/assets/props/candle/sm_candle_a.mesh index fa630de..a8b2624 100644 Binary files a/assets/props/candle/sm_candle_a.mesh and b/assets/props/candle/sm_candle_a.mesh differ diff --git a/assets/props/candle/sm_candle_c.mesh b/assets/props/candle/sm_candle_c.mesh index 1b74b91..1fb1071 100644 Binary files a/assets/props/candle/sm_candle_c.mesh and b/assets/props/candle/sm_candle_c.mesh differ diff --git a/assets/props/fiole/materials/MA_fiole_green.material b/assets/props/fiole/materials/MA_fiole_green.material index cf1cc52..cab6334 100644 Binary files a/assets/props/fiole/materials/MA_fiole_green.material and b/assets/props/fiole/materials/MA_fiole_green.material differ diff --git a/assets/props/godet/materials/MA_godet.material b/assets/props/godet/materials/MA_godet.material new file mode 100644 index 0000000..86ad657 Binary files /dev/null and b/assets/props/godet/materials/MA_godet.material differ diff --git a/assets/props/godet/materials/godet.material b/assets/props/godet/materials/godet.material deleted file mode 100644 index 8a5bff8..0000000 Binary files a/assets/props/godet/materials/godet.material and /dev/null differ diff --git a/assets/props/godet/sm_godet.mesh b/assets/props/godet/sm_godet.mesh index ba54bb4..f048674 100644 Binary files a/assets/props/godet/sm_godet.mesh and b/assets/props/godet/sm_godet.mesh differ diff --git a/assets/props/growler/sm_growler.mesh b/assets/props/growler/sm_growler.mesh index 2310d74..281bbd7 100644 Binary files a/assets/props/growler/sm_growler.mesh and b/assets/props/growler/sm_growler.mesh differ diff --git a/assets/props/parchment/materials/MA_PaperParchment.material b/assets/props/parchment/materials/MA_PaperParchment.material new file mode 100644 index 0000000..72b2a65 Binary files /dev/null and b/assets/props/parchment/materials/MA_PaperParchment.material differ diff --git a/assets/props/parchment/materials/MA_WoodParchment.material b/assets/props/parchment/materials/MA_WoodParchment.material new file mode 100644 index 0000000..d34b26c Binary files /dev/null and b/assets/props/parchment/materials/MA_WoodParchment.material differ diff --git a/assets/props/parchment/materials/PaperParchment.material b/assets/props/parchment/materials/PaperParchment.material deleted file mode 100644 index aba90ab..0000000 Binary files a/assets/props/parchment/materials/PaperParchment.material and /dev/null differ diff --git a/assets/props/parchment/materials/WoodParchment.material b/assets/props/parchment/materials/WoodParchment.material deleted file mode 100644 index c827fb5..0000000 Binary files a/assets/props/parchment/materials/WoodParchment.material and /dev/null differ diff --git a/assets/props/parchment/sm_paper_parchment.mesh b/assets/props/parchment/sm_paper_parchment.mesh new file mode 100644 index 0000000..396927e Binary files /dev/null and b/assets/props/parchment/sm_paper_parchment.mesh differ diff --git a/assets/props/parchment/sm_paper_parcment.mesh b/assets/props/parchment/sm_paper_parcment.mesh deleted file mode 100644 index 16dc11c..0000000 Binary files a/assets/props/parchment/sm_paper_parcment.mesh and /dev/null differ diff --git a/assets/props/parchment/sm_wood_parchment.mesh b/assets/props/parchment/sm_wood_parchment.mesh index 6422094..2463acd 100644 Binary files a/assets/props/parchment/sm_wood_parchment.mesh and b/assets/props/parchment/sm_wood_parchment.mesh differ diff --git a/assets/props/rock floor/ground_library.tres b/assets/props/rock floor/ground_library.tres index bb776a8..10182a9 100644 --- a/assets/props/rock floor/ground_library.tres +++ b/assets/props/rock floor/ground_library.tres @@ -1,9 +1,9 @@ [gd_resource type="MeshLibrary" load_steps=17 format=2] [ext_resource path="res://assets/materials/gray.tres" type="Material" id=1] -[ext_resource path="res://assets/props/book/materials/MAT_book.material" type="Material" id=2] -[ext_resource path="res://assets/props/table/materials/table.material" type="Material" id=3] -[ext_resource path="res://assets/props/rock floor/materials/rock_floor.material" type="Material" id=4] +[ext_resource path="res://assets/props/book/materials/MA_book.material" type="Material" id=2] +[ext_resource path="res://assets/props/table/materials/MA_table.material" type="Material" id=3] +[ext_resource path="res://assets/props/rock floor/materials/MA_rock_floor.material" type="Material" id=4] [sub_resource type="CubeMesh" id=1] material = ExtResource( 1 ) diff --git a/assets/props/rock floor/materials/rock_floor.material b/assets/props/rock floor/materials/MA_rock_floor.material similarity index 100% rename from assets/props/rock floor/materials/rock_floor.material rename to assets/props/rock floor/materials/MA_rock_floor.material diff --git a/assets/props/rock floor/sm_floor.mesh b/assets/props/rock floor/sm_floor.mesh index e0feee1..02b64ce 100644 Binary files a/assets/props/rock floor/sm_floor.mesh and b/assets/props/rock floor/sm_floor.mesh differ diff --git a/assets/props/stool b/materials/stool_b.material b/assets/props/stool b/materials/MA_stool_b.material similarity index 100% rename from assets/props/stool b/materials/stool_b.material rename to assets/props/stool b/materials/MA_stool_b.material diff --git a/assets/props/stool b/sm_stool_b.mesh b/assets/props/stool b/sm_stool_b.mesh index 2fd8750..c8086e4 100644 Binary files a/assets/props/stool b/sm_stool_b.mesh and b/assets/props/stool b/sm_stool_b.mesh differ diff --git a/assets/props/table/materials/MA_table.material b/assets/props/table/materials/MA_table.material new file mode 100644 index 0000000..711b4c5 Binary files /dev/null and b/assets/props/table/materials/MA_table.material differ diff --git a/assets/props/table/materials/table.material b/assets/props/table/materials/table.material deleted file mode 100644 index 0c9a7af..0000000 Binary files a/assets/props/table/materials/table.material and /dev/null differ diff --git a/assets/props/table/sm_table.mesh b/assets/props/table/sm_table.mesh index 8031168..9c311e9 100644 Binary files a/assets/props/table/sm_table.mesh and b/assets/props/table/sm_table.mesh differ diff --git a/developers/aurelien/CheckLightmap.tscn b/developers/aurelien/CheckLightmap.tscn index 0dad5aa..e24f807 100644 --- a/developers/aurelien/CheckLightmap.tscn +++ b/developers/aurelien/CheckLightmap.tscn @@ -13,7 +13,7 @@ [ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=12] [ext_resource path="res://assets/props/godet/sm_godet.mesh" type="ArrayMesh" id=13] [ext_resource path="res://assets/props/growler/sm_growler.mesh" type="ArrayMesh" id=14] -[ext_resource path="res://assets/props/parchment/sm_paper_parcment.mesh" type="ArrayMesh" id=15] +[ext_resource path="res://assets/props/parchment/sm_paper_parchment.mesh" type="ArrayMesh" id=15] [ext_resource path="res://assets/props/parchment/sm_wood_parchment.mesh" type="ArrayMesh" id=16] [ext_resource path="res://assets/props/rock floor/sm_floor.mesh" type="ArrayMesh" id=17] [ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=18] diff --git a/scenes/levels/warcraft/WarCraft.tscn b/scenes/levels/warcraft/WarCraft.tscn index b31373e..5ed2600 100644 --- a/scenes/levels/warcraft/WarCraft.tscn +++ b/scenes/levels/warcraft/WarCraft.tscn @@ -4,9 +4,9 @@ [ext_resource path="res://scenes/levels/warcraft/WarCraft.gd" type="Script" id=2] [ext_resource path="res://assets/props/godet/sm_godet.mesh" type="ArrayMesh" id=3] [ext_resource path="res://assets/props/candle/sm_candlestick.mesh" type="ArrayMesh" id=4] -[ext_resource path="res://assets/props/rock floor/materials/rock_floor.material" type="Material" id=5] +[ext_resource path="res://assets/props/rock floor/materials/MA_rock_floor.material" type="Material" id=5] [ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=6] -[ext_resource path="res://assets/props/parchment/sm_paper_parcment.mesh" type="ArrayMesh" id=7] +[ext_resource path="res://assets/props/parchment/sm_paper_parchment.mesh" type="ArrayMesh" id=7] [ext_resource path="res://assets/materials/gray.tres" type="Material" id=8] [ext_resource path="res://assets/props/candle/sm_candle_b.mesh" type="ArrayMesh" id=9] [ext_resource path="res://assets/props/growler/sm_growler.mesh" type="ArrayMesh" id=10] @@ -53,12 +53,12 @@ surfaces/0 = { "vertex_count": 66436 } -[sub_resource type="PanoramaSky" id=4] +[sub_resource type="PanoramaSky" id=3] panorama = ExtResource( 11 ) -[sub_resource type="Environment" id=5] +[sub_resource type="Environment" id=4] background_mode = 3 -background_sky = SubResource( 4 ) +background_sky = SubResource( 3 ) background_color = Color( 0.188235, 0.133333, 0.133333, 1 ) background_energy = 0.6 ambient_light_color = Color( 0.694118, 0.168627, 0.67451, 1 ) @@ -78,54 +78,54 @@ ss_reflections_enabled = true dof_blur_far_distance = 2.0 glow_enabled = true -[sub_resource type="CapsuleShape" id=9] +[sub_resource type="CapsuleShape" id=5] radius = 0.130821 height = 0.168171 -[sub_resource type="CapsuleShape" id=10] +[sub_resource type="CapsuleShape" id=6] radius = 0.129956 height = 0.149993 -[sub_resource type="CapsuleShape" id=11] +[sub_resource type="CapsuleShape" id=7] radius = 0.124344 height = 0.123496 -[sub_resource type="CapsuleShape" id=12] +[sub_resource type="CapsuleShape" id=8] radius = 0.0500489 height = 0.330211 -[sub_resource type="CapsuleShape" id=13] +[sub_resource type="CapsuleShape" id=9] radius = 0.0995524 height = 0.748899 -[sub_resource type="CapsuleShape" id=14] +[sub_resource type="CapsuleShape" id=10] radius = 0.114536 height = 0.236295 -[sub_resource type="CapsuleShape" id=15] +[sub_resource type="CapsuleShape" id=11] radius = 0.0911443 height = 0.831942 -[sub_resource type="SphereShape" id=16] +[sub_resource type="SphereShape" id=12] radius = 0.0777453 -[sub_resource type="SphereShape" id=17] +[sub_resource type="SphereShape" id=13] radius = 0.0939276 -[sub_resource type="SphereShape" id=18] +[sub_resource type="SphereShape" id=14] radius = 0.0872712 -[sub_resource type="SphereShape" id=19] +[sub_resource type="SphereShape" id=15] radius = 0.0817803 -[sub_resource type="BoxShape" id=20] +[sub_resource type="BoxShape" id=16] extents = Vector3( 0.075969, 0.0690835, 0.0842404 ) -[sub_resource type="CylinderShape" id=21] +[sub_resource type="CylinderShape" id=17] radius = 0.0715322 height = 0.169626 -[sub_resource type="CylinderShape" id=22] +[sub_resource type="CylinderShape" id=18] radius = 0.0931278 height = 0.171908 @@ -141,7 +141,7 @@ environment_mode = 1 light_data = ExtResource( 16 ) [node name="Main Camera" type="Camera" parent="."] -transform = Transform( 0.160708, -0.339306, 0.926846, 0, 0.939052, 0.343774, -0.987002, -0.0552473, 0.150913, 1.62519, 1.61928, 0.658554 ) +transform = Transform( 0.160708, -0.300656, 0.940095, 0, 0.952476, 0.304615, -0.987002, -0.0489541, 0.15307, 1.62519, 1.61928, 0.658554 ) fov = 38.5632 far = 60.0 @@ -387,6 +387,7 @@ material/0 = null transform = Transform( 0.999247, -0.0387791, 0.000939459, 0.0387899, 0.999067, -0.0189805, -0.000202596, 0.0190026, 0.999819, -0.259066, -0.0579576, 0.0227574 ) use_in_baked_light = true mesh = ExtResource( 7 ) +skeleton = NodePath("") material/0 = null [node name="sm_wood_parchment3" type="MeshInstance" parent="Main Scene Props"] @@ -458,7 +459,7 @@ shadow_enabled = true shadow_contact = 0.3 [node name="WorldEnvironment" type="WorldEnvironment" parent="Lighting"] -environment = SubResource( 5 ) +environment = SubResource( 4 ) [node name="Dialog" type="Control" parent="."] margin_right = 40.0 @@ -496,7 +497,7 @@ material/0 = ExtResource( 26 ) [node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/Fioles x3/sm_fiole1/AreaFiole1"] transform = Transform( 1, 2.98023e-08, -8.9407e-08, 0, -1.19209e-07, 1, -8.9407e-08, -1, 2.98023e-08, -5.96046e-08, 0.0801149, 0 ) -shape = SubResource( 9 ) +shape = SubResource( 5 ) [node name="sm_fiole2" type="MeshInstance" parent="Hidden Objects Items/Fioles x3"] transform = Transform( 0.655275, 0.636944, -0.4061, 0.670978, -0.243833, 0.700239, 0.346993, -0.731333, -0.587153, -4.19531, -0.894133, 2.66915 ) @@ -508,7 +509,7 @@ transform = Transform( 1, -2.98023e-08, 0, -2.98023e-08, 1, 0, 1.49012e-08, -1.1 [node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/Fioles x3/sm_fiole2/AreaFiole2"] transform = Transform( 1, 5.96046e-08, -8.9407e-08, 2.98023e-08, -8.9407e-08, 1, -8.9407e-08, -1, 0, 2.38419e-07, 0.0823998, -1.19209e-07 ) -shape = SubResource( 10 ) +shape = SubResource( 6 ) [node name="sm_fiole_socle" type="MeshInstance" parent="Hidden Objects Items/Fioles x3"] transform = Transform( 0.6773, -1.86265e-09, 0.735707, -0.0293841, 0.999202, 0.0270513, -0.73512, -0.03994, 0.67676, -2.27881, -0.11528, -1.23929 ) @@ -524,7 +525,7 @@ material/0 = ExtResource( 28 ) [node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/Fioles x3/sm_fiole_socle/sm_fiole3/AreaFiole3"] transform = Transform( 1, 2.08616e-07, -7.45058e-08, -5.96046e-08, -1.49012e-07, 1, 5.96046e-08, -1, -1.04308e-07, -1.78814e-07, 0.0560231, 0 ) -shape = SubResource( 11 ) +shape = SubResource( 7 ) [node name="dagger" type="MeshInstance" parent="Hidden Objects Items"] transform = Transform( -0.625025, -0.77987, 0.0338859, 0, 0.0434097, 0.999058, -0.780606, 0.624436, -0.0271321, 0.697412, -0.0996332, 0.822543 ) @@ -535,7 +536,7 @@ material/0 = ExtResource( 19 ) [node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/dagger/Area"] transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0.0802139, 0 ) -shape = SubResource( 12 ) +shape = SubResource( 8 ) [node name="sm_spyglass" type="MeshInstance" parent="Hidden Objects Items"] transform = Transform( 0.665919, -0.0332091, 0.63579, 1.34429e-08, 0.920039, 0.0480562, -0.636656, -0.0347355, 0.665013, -2.88265, -0.329537, -0.428369 ) @@ -543,11 +544,10 @@ mesh = ExtResource( 29 ) material/0 = ExtResource( 31 ) [node name="Area2" type="Area" parent="Hidden Objects Items/sm_spyglass"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) [node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/sm_spyglass/Area2"] transform = Transform( 1, 0, 0, 1.86265e-09, 1, 3.72529e-09, -2.98023e-08, 3.72529e-09, 1, 2.38419e-07, -1.19209e-07, 0.0177534 ) -shape = SubResource( 13 ) +shape = SubResource( 9 ) [node name="sm_pinte_beer" type="MeshInstance" parent="Hidden Objects Items"] transform = Transform( 0.996658, -0.053142, 0.0620432, 0.0548108, 0.998171, -0.0255105, -0.060574, 0.0288258, 0.997748, -2.8842, 0.173697, 1.98168 ) @@ -559,7 +559,7 @@ transform = Transform( 1, 0, 7.45058e-09, -1.16415e-10, 1, -1.86265e-09, 0, 0, 1 [node name="CollisionShapeBeer" type="CollisionShape" parent="Hidden Objects Items/sm_pinte_beer/Area3"] transform = Transform( 1, 0, -1.61817e-08, 1.83936e-08, -4.28408e-08, 1, 0, -1, -4.65661e-08, 9.53674e-07, 0.0746492, 2.38419e-07 ) -shape = SubResource( 14 ) +shape = SubResource( 10 ) [node name="sm_weapon_gun" type="MeshInstance" parent="Hidden Objects Items"] transform = Transform( 0.540284, -0.813497, 0.215212, -0.009216, 0.250018, 0.968198, -0.841432, -0.525085, 0.127583, -2.7508, -0.359206, 1.19589 ) @@ -570,7 +570,7 @@ material/0 = ExtResource( 34 ) [node name="CollisionShapeWeapon" type="CollisionShape" parent="Hidden Objects Items/sm_weapon_gun/Area4"] transform = Transform( -1.49012e-07, 0, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -5.21541e-08, 0.0388942, 0.0484145, -8.19564e-08 ) -shape = SubResource( 15 ) +shape = SubResource( 11 ) [node name="apples" type="Spatial" parent="Hidden Objects Items"] @@ -583,7 +583,7 @@ material/0 = ExtResource( 35 ) [node name="CollisionShapeApple" type="CollisionShape" parent="Hidden Objects Items/apples/sm_apple_1/Area5"] transform = Transform( -1.45286e-07, -2.98023e-08, 1, -1, -1.11759e-08, 0, 1.86265e-08, -1, -8.9407e-08, -1.90735e-06, 0.00575864, 0 ) -shape = SubResource( 16 ) +shape = SubResource( 12 ) [node name="sm_apple_2" type="MeshInstance" parent="Hidden Objects Items/apples"] transform = Transform( -0.190449, 0, 0.981697, 0, 1, 0, -0.981697, 0, -0.190449, -1.71166, -0.0869397, -1.29534 ) @@ -594,7 +594,7 @@ material/0 = ExtResource( 35 ) [node name="CollisionShapeApple2" type="CollisionShape" parent="Hidden Objects Items/apples/sm_apple_2/Area6"] transform = Transform( -1.49012e-07, 4.47035e-08, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -1.49012e-08, -4.76837e-07, -0.00566041, 0 ) -shape = SubResource( 17 ) +shape = SubResource( 13 ) [node name="sm_apple_3" type="MeshInstance" parent="Hidden Objects Items/apples"] transform = Transform( 0.823731, 0.226496, -0.519776, -0.248954, 0.96813, 0.0273319, 0.509401, 0.106886, 0.853865, -0.718663, -0.36046, 1.92043 ) @@ -605,7 +605,7 @@ material/0 = ExtResource( 35 ) [node name="CollisionShapeApple3" type="CollisionShape" parent="Hidden Objects Items/apples/sm_apple_3/Area7"] transform = Transform( -1.71363e-07, 0, 1, -1, -3.72529e-08, 1.49012e-08, 2.98023e-08, -1, -1.19209e-07, -3.57628e-07, 0.0142345, 2.38419e-07 ) -shape = SubResource( 18 ) +shape = SubResource( 14 ) [node name="sm_apple_4" type="MeshInstance" parent="Hidden Objects Items/apples"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.97752, -0.491035, 0.41055 ) @@ -616,7 +616,7 @@ material/0 = ExtResource( 35 ) [node name="CollisionShapeApple4" type="CollisionShape" parent="Hidden Objects Items/apples/sm_apple_4/Area8"] transform = Transform( -1.49012e-07, 0, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -5.21541e-08, -4.76837e-07, 0.00115258, -1.17347e-07 ) -shape = SubResource( 19 ) +shape = SubResource( 15 ) [node name="golds" type="Spatial" parent="Hidden Objects Items"] @@ -629,7 +629,7 @@ material/0 = ExtResource( 32 ) [node name="CollisionShapeGold1" type="CollisionShape" parent="Hidden Objects Items/golds/sm_stackgold_1/Area9"] transform = Transform( 1, -4.65661e-08, 0, -1.38185e-07, 0.999999, 3.14321e-08, 4.17233e-07, -4.19095e-09, 1, 0.0276761, 0.00212932, 0.0336302 ) -shape = SubResource( 20 ) +shape = SubResource( 16 ) [node name="sm_stackgold_2" type="MeshInstance" parent="Hidden Objects Items/golds"] transform = Transform( 0.250245, 2.79397e-09, -0.968183, 0.0456076, 0.99889, 0.0117882, 0.967108, -0.0471065, 0.249967, 0.752443, -0.0417374, 1.3694 ) @@ -640,7 +640,7 @@ material/0 = ExtResource( 32 ) [node name="CollisionShapeGold2" type="CollisionShape" parent="Hidden Objects Items/golds/sm_stackgold_2/Area10"] transform = Transform( 1, 0, 2.98023e-08, 7.45058e-09, 1, -9.31323e-10, 5.96046e-08, 0, 1, 0.0499306, 1.19209e-07, 0.0191208 ) -shape = SubResource( 21 ) +shape = SubResource( 17 ) [node name="sm_stackgold_3" type="MeshInstance" parent="Hidden Objects Items/golds"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.74641, -0.885448, -0.198129 ) @@ -651,7 +651,7 @@ material/0 = ExtResource( 32 ) [node name="CollisionShapeGold3" type="CollisionShape" parent="Hidden Objects Items/golds/sm_stackgold_3/Area11"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0358186, 0, 0.0109152 ) -shape = SubResource( 22 ) +shape = SubResource( 18 ) [connection signal="confirmed" from="Dialog/ConfirmEscape" to="." method="_on_ConfirmEscape_confirmed"] [connection signal="input_event" from="Hidden Objects Items/Fioles x3/sm_fiole1/AreaFiole1" to="." method="_on_fiole1_input_event"]