diff --git a/HEADS b/HEADS index 92f49f2c..a628bf14 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "cc3c671f3b636cbfac9fc74095d5bee753e71ed5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "805928da1872cf803a14c34c95fc5de9b0996ee6"}, "entity_spell_system": {"master": "52cd322c8859ce9eba64e0c9e4819417783c3086"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "9a151ffc6ce719bc6c3e4b529196b212d67eb340"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "b852ab0e525addbd11ebcdd7d16b7536171837be"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "ab36f527d77a76fd525687dd4b92d8f22810d5c9"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "bc0d2f6debd23fe7112f2aab21efb66414eb4670"}} \ No newline at end of file +{"engine": {"3.2": "803f6d2388f64d069810554ab1b0a57d6a5a8087", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "805928da1872cf803a14c34c95fc5de9b0996ee6"}, "entity_spell_system": {"master": "52cd322c8859ce9eba64e0c9e4819417783c3086"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "fd464c042c0d862da994bc5f721a7315bf555c9a"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "b852ab0e525addbd11ebcdd7d16b7536171837be"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "ab36f527d77a76fd525687dd4b92d8f22810d5c9"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "bc0d2f6debd23fe7112f2aab21efb66414eb4670"}} \ No newline at end of file diff --git a/game/menu/Menu.tscn b/game/menu/Menu.tscn index a89d9532..68b69e07 100644 --- a/game/menu/Menu.tscn +++ b/game/menu/Menu.tscn @@ -25,7 +25,7 @@ [sub_resource type="VoxelmanLevelGenerator" id=1] script = ExtResource( 18 ) _force_planet = -1 -_level_seed = 0 +_level_seed = 4 _spawn_mobs = false planet = ExtResource( 21 ) @@ -563,7 +563,10 @@ margin_bottom = 127.5 visible = false [node name="Char" type="Spatial" parent="."] -transform = Transform( 0.359313, 0, 0.933217, 0, 1, 0, -0.933217, 0, 0.359313, -2.44425, 0.926699, 0 ) +transform = Transform( -0.999545, 0, 0.0301548, 0, 1, 0, -0.0301548, 0, -0.999545, 1.59087, 0.958899, 3.64338 ) +__meta__ = { +"_editor_description_": "" +} [node name="CharacterDisplay" type="Spatial" parent="Char"] transform = Transform( 1, 1.49012e-08, 0, 0, 0.990268, -0.139173, -2.98023e-08, 0.139173, 0.990268, -5.96046e-08, 0.578123, 0.08125 ) @@ -577,7 +580,6 @@ current = true ]] data_margin_end = 2 use_threads = false -max_concurrent_generations = 1 library = ExtResource( 17 ) level_generator = SubResource( 1 ) voxel_scale = 1.6 @@ -604,6 +606,7 @@ light_energy = 0.87 light_specular = 0.65 shadow_bias = 0.07 script = ExtResource( 19 ) + [connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/VBoxContainer/CharacterSelector/VBoxContainer/Load" to="CharacterSelectorMenu" method="load_character"] [connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/VBoxContainer/CharacterSelector/VBoxContainer/New" to="." method="switch_to_menu" binds= [ 1 ]] [connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/VBoxContainer/CharacterSelector/VBoxContainer/Delete" to="CharacterSelectorMenu" method="renounce_character"]