diff --git a/Level_Core.tscn b/Level_Core.tscn index 3d109f3..b8a2562 100644 --- a/Level_Core.tscn +++ b/Level_Core.tscn @@ -272,6 +272,16 @@ skeleton = NodePath("../MeshInstance3D") [node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D13/StaticBody3D"] shape = ExtResource("3_n0qnv") +[node name="MeshInstance3D48" type="MeshInstance3D" parent="."] +transform = Transform3D(2, 0, 0, 0, 1, 0, 0, 0, 2, 5, 20, -5) +mesh = SubResource("PlaneMesh_rv2mx") +skeleton = NodePath("../MeshInstance3D") + +[node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D48"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D48/StaticBody3D"] +shape = ExtResource("3_n0qnv") + [node name="MeshInstance3D6" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 0, -10) material_override = SubResource("StandardMaterial3D_2uy0w") @@ -520,6 +530,24 @@ outline_modulate = Color(0.00803253, 9.36218e-06, 0.0382829, 1) text = "Algebra and wall jumps" font = ExtResource("2_fq2vn") +[node name="Label3D20" type="Label3D" parent="."] +transform = Transform3D(0.031202, 0, 0.999515, 0, 0.999999, 0, -0.999512, 0, 0.0312013, 1.9461, 22.9463, -5.57596) +offset = Vector2(1, 0) +modulate = Color(0.943031, 0.787658, 0.994854, 1) +outline_modulate = Color(0.00803253, 9.36218e-06, 0.0382829, 1) +text = "station 2" +font = ExtResource("8_o5bhp") +font_size = 512 +outline_size = 127 + +[node name="Label3D21" type="Label3D" parent="."] +transform = Transform3D(0.031202, 0, 0.999515, 0, 0.999999, 0, -0.999512, 0, 0.0312013, 1.9461, 21.4724, -5.57596) +offset = Vector2(1, 0) +modulate = Color(0.943031, 0.787658, 0.994854, 1) +outline_modulate = Color(0.00803253, 9.36218e-06, 0.0382829, 1) +text = "Wall traps" +font = ExtResource("2_fq2vn") + [node name="Label3D13" type="Label3D" parent="."] transform = Transform3D(-4.37113e-08, 0, -1, 0, 1, 0, 0.999999, 0, -4.37115e-08, -31.08, 12, 10) offset = Vector2(1, 0) @@ -599,7 +627,7 @@ shape = ExtResource("3_n0qnv") disabled = true [node name="MeshInstance3D38" type="MeshInstance3D" parent="."] -transform = Transform3D(0.763728, -0.456464, -0.228232, 2.54865e-08, 0.707107, -0.353553, 0.645538, 0.540038, 0.270019, 8.91585, 12.3777, -7.36637) +transform = Transform3D(0.763728, -0.456464, -0.228232, 2.54865e-08, 0.707107, -0.353553, 0.645538, 0.540038, 0.270019, 8.91585, 11.7936, -7.36637) mesh = SubResource("PlaneMesh_rv2mx") skeleton = NodePath("../MeshInstance3D") @@ -610,7 +638,7 @@ visible = false shape = ExtResource("2_7sds5") [node name="MeshInstance3D44" type="MeshInstance3D" parent="."] -transform = Transform3D(0.754492, 0.464081, 0.23204, 8.73835e-08, 0.707107, -0.353553, -0.656309, 0.533507, 0.266753, 2.45832, 14.7269, -8.55205) +transform = Transform3D(0.754492, 0.464081, 0.23204, 8.73835e-08, 0.707107, -0.353553, -0.656309, 0.533507, 0.266753, 2.45832, 14.1428, -8.55205) mesh = SubResource("PlaneMesh_rv2mx") skeleton = NodePath("../MeshInstance3D") @@ -621,7 +649,7 @@ visible = false shape = ExtResource("2_7sds5") [node name="MeshInstance3D45" type="MeshInstance3D" parent="."] -transform = Transform3D(-0.463172, 0.626687, 0.313343, 9.71029e-08, 0.707107, -0.353553, -0.886268, -0.327512, -0.163756, 1.19951, 16.5658, -3.4252) +transform = Transform3D(-0.463172, 0.626687, 0.313343, 9.71029e-08, 0.707107, -0.353553, -0.886268, -0.327512, -0.163756, 1.19951, 15.9817, -3.4252) mesh = SubResource("PlaneMesh_rv2mx") skeleton = NodePath("../MeshInstance3D") @@ -632,7 +660,7 @@ visible = false shape = ExtResource("2_7sds5") [node name="MeshInstance3D46" type="MeshInstance3D" parent="."] -transform = Transform3D(0.512627, -0.60713, -0.303565, 1.10309e-07, 0.707107, -0.353553, 0.858611, 0.362482, 0.181241, 4.44251, 16.5658, -3.4252) +transform = Transform3D(-0.809376, -0.415277, -0.207639, 1.10309e-07, 0.707107, -0.353553, 0.58729, -0.572315, -0.286158, 6.41857, 18.3823, -0.432703) mesh = SubResource("PlaneMesh_rv2mx") skeleton = NodePath("../MeshInstance3D") @@ -642,6 +670,17 @@ skeleton = NodePath("../MeshInstance3D") visible = false shape = ExtResource("2_7sds5") +[node name="MeshInstance3D47" type="MeshInstance3D" parent="."] +transform = Transform3D(0.596294, -0.567641, -0.283821, 9.28064e-08, 0.707107, -0.353553, 0.802765, 0.421644, 0.210822, 8.25709, 20.518, -5.72058) +mesh = SubResource("PlaneMesh_rv2mx") +skeleton = NodePath("../MeshInstance3D") + +[node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D47"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D47/StaticBody3D"] +visible = false +shape = ExtResource("2_7sds5") + [node name="Label3D17" type="Label3D" parent="."] transform = Transform3D(-3.87981e-08, 0.887598, -0.460619, -2.01342e-08, 0.460618, 0.8876, 0.999999, 4.37113e-08, 1.91069e-15, -4.8723, 11, 10) offset = Vector2(1, 0) diff --git a/discord_krisp.log b/discord_krisp.log new file mode 100644 index 0000000..8fa1212 --- /dev/null +++ b/discord_krisp.log @@ -0,0 +1,10 @@ +[2025-May-04 19:32:10.004 +02:00][102245:102245][info ] Logging initialized +[2025-May-04 19:32:10.004 +02:00][102245:102245][info ] Initializing krisp SDK... +[2025-May-04 19:32:10.004 +02:00][102245:102245][info ] DoKrispInitialize +[2025-May-04 19:32:10.328 +02:00][102245:102245][info ] LoadDynamicKrisp +[2025-May-04 19:32:10.328 +02:00][102245:102245][info ] Did not find KRISP_DYLIB_PATH, skipping dynamic loading +[2025-May-04 19:32:10.328 +02:00][102245:102245][info ] Initializing Krisp SDK in PID 102245, addr 0x7f6211d90900 +[2025-May-04 19:32:10.481 +02:00][102245:102245][info ] Initialized Krisp SDK successfully +[2025-May-04 19:32:10.481 +02:00][102245:102245][info ] Krisp SDK initialized +[2025-May-04 22:16:26.906 +02:00][102245:102290][info ] KrispVADSetup: sampleRate = 48000, duration = 10 +[2025-May-04 22:16:33.338 +02:00][102245:102283][info ] KrispVADReset diff --git a/discord_utils.log b/discord_utils.log new file mode 100644 index 0000000..62219ce --- /dev/null +++ b/discord_utils.log @@ -0,0 +1 @@ +[2025-May-04 19:32:09.264 +02:00][102245:102245][info ] Logging initialized diff --git a/export_presets.cfg b/export_presets.cfg index 2f1beb6..ea632e0 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="Exports/Linux/2025-05-04/ProjektLuzid.x86_64" +export_path="Exports/Linux/2025-05-04(viewportscaling)/ProjektLuzid.x86_64" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" diff --git a/pause_menu.tscn b/pause_menu.tscn index ebe232f..eea5013 100644 --- a/pause_menu.tscn +++ b/pause_menu.tscn @@ -6,7 +6,7 @@ [sub_resource type="LabelSettings" id="LabelSettings_2nc7s"] font = ExtResource("2_05uyy") -font_size = 25 +font_size = 30 font_color = Color(0.941176, 0.788235, 0.996078, 1) outline_size = 5 outline_color = Color(0, 0, 0, 1) @@ -26,10 +26,16 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_hdmo1") +[node name="ColorRect" type="ColorRect" parent="."] +layout_mode = 0 +offset_right = 1920.0 +offset_bottom = 1080.0 +color = Color(0, 0, 0, 0.309804) + [node name="MarginContainer" type="MarginContainer" parent="."] layout_mode = 0 -offset_right = 1280.0 -offset_bottom = 720.0 +offset_right = 1920.0 +offset_bottom = 1080.0 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] layout_mode = 2 @@ -37,34 +43,55 @@ size_flags_vertical = 8 [node name="ResumeButton" type="Button" parent="MarginContainer/VBoxContainer"] layout_mode = 2 +size_flags_horizontal = 0 +size_flags_vertical = 8 +theme_override_fonts/font = ExtResource("2_05uyy") +theme_override_font_sizes/font_size = 35 text = "resume game | Spiel fortsetzen" [node name="ExitButton" type="Button" parent="MarginContainer/VBoxContainer"] layout_mode = 2 +size_flags_horizontal = 0 +theme_override_fonts/font = ExtResource("2_05uyy") +theme_override_font_sizes/font_size = 35 text = "quit to main menu | zum Hauptmenü zurückkehren" [node name="Label" type="Label" parent="."] -layout_mode = 0 -offset_left = 390.0 -offset_top = 392.0 -offset_right = 859.0 -offset_bottom = 459.0 +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -280.5 +offset_top = 82.5 +offset_right = 280.5 +offset_bottom = 161.5 +grow_horizontal = 2 +grow_vertical = 2 text = "press SHIFT+ENTER to unlock the mouse press SHIFT+G to capture the mouse" label_settings = SubResource("LabelSettings_2nc7s") horizontal_alignment = 1 [node name="Label2" type="Label" parent="."] -layout_mode = 0 -offset_left = 414.0 -offset_top = 232.0 -offset_right = 837.0 -offset_bottom = 397.0 +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -211.5 +offset_top = -82.5 +offset_right = 211.5 +offset_bottom = 82.5 +grow_horizontal = 2 +grow_vertical = 2 text = "paused" label_settings = SubResource("LabelSettings_d3xb4") horizontal_alignment = 1 vertical_alignment = 1 -[connection signal="pressed" from="MarginContainer/VBoxContainer/ResumeButton" to="." method="_on_button_pressed"] [connection signal="pressed" from="MarginContainer/VBoxContainer/ResumeButton" to="." method="_on_resume_button_pressed"] +[connection signal="pressed" from="MarginContainer/VBoxContainer/ResumeButton" to="." method="_on_button_pressed"] [connection signal="pressed" from="MarginContainer/VBoxContainer/ExitButton" to="." method="_on_exit_button_pressed"] diff --git a/pause_menu_itself.gd b/pause_menu_itself.gd index 912f4fa..938c0cb 100644 --- a/pause_menu_itself.gd +++ b/pause_menu_itself.gd @@ -6,4 +6,4 @@ func _on_resume_button_pressed() -> void: main.pauseMenu() func _on_exit_button_pressed() -> void: - get_tree().change_scene_to_file("res://in_game_ui.tscn") + get_tree().change_scene_to_file("res://start.tscn") diff --git a/player.gd b/player.gd index 5890673..6d45934 100644 --- a/player.gd +++ b/player.gd @@ -17,7 +17,8 @@ func _process(delta: float) -> void: input.x = Input.get_axis("move_left", "move_right") input.z = Input.get_axis("move_forward", "move_back") - apply_central_force(twist_pivot.basis * input * 3000.0 * delta) +# apply_central_force(twist_pivot.basis * input * 3000.0 * delta) + apply_central_force(twist_pivot.basis * input * 6000.0 * delta) if Input.is_action_just_pressed("proluz_ui_pause"): Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) diff --git a/project.godot b/project.godot index ead8cd0..4df7f27 100644 --- a/project.godot +++ b/project.godot @@ -14,7 +14,7 @@ config/name="ProjektLuzid" config/name_localized={ "es": "ProyectoLucida" } -run/main_scene="res://in_game_ui.tscn" +run/main_scene="res://start.tscn" config/features=PackedStringArray("4.4", "Forward Plus") config/icon="uid://fad7xr2jj2nu" @@ -24,8 +24,10 @@ DiscordRPCLoader="*res://addons/discord-rpc-gd/nodes/discord_autoload.gd" [display] -window/size/viewport_width=1280 -window/size/viewport_height=720 +window/size/viewport_width=1920 +window/size/viewport_height=1080 +window/stretch/mode="viewport" +window/stretch/aspect="ignore" [editor_plugins] diff --git a/in_game_ui.gd b/start.gd similarity index 100% rename from in_game_ui.gd rename to start.gd diff --git a/in_game_ui.gd.uid b/start.gd.uid similarity index 100% rename from in_game_ui.gd.uid rename to start.gd.uid diff --git a/in_game_ui.tscn b/start.tscn similarity index 87% rename from in_game_ui.tscn rename to start.tscn index b184503..94341ae 100644 --- a/in_game_ui.tscn +++ b/start.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=12 format=3 uid="uid://bciy4rskxlowb"] -[ext_resource type="Script" uid="uid://t2iw8p1c6rq3" path="res://in_game_ui.gd" id="1_4v80v"] -[ext_resource type="Texture2D" uid="uid://btbycsdclf56y" path="res://Screenshot From 2025-03-17 14-25-26.png" id="1_e6quo"] -[ext_resource type="Texture2D" uid="uid://0hcyy1njk5tu" path="res://ProjektLuzidLogo.png" id="1_onc8m"] -[ext_resource type="Script" uid="uid://x6bi0h4rircc" path="res://animation_player.gd" id="2_e6quo"] -[ext_resource type="Script" uid="uid://cax1b0y8uvwj3" path="res://button_2.gd" id="5_4v80v"] -[ext_resource type="Script" uid="uid://dti3q3vy3rysn" path="res://quit_button.gd" id="6_0qsvx"] -[ext_resource type="FontFile" uid="uid://rswq6vrwr2nx" path="res://InstrumentSans-VariableFont_wdth,wght.ttf" id="7_uusyb"] +[ext_resource type="Script" uid="uid://t2iw8p1c6rq3" path="res://start.gd" id="1_g38d0"] +[ext_resource type="Texture2D" uid="uid://dmifch7igyyqd" path="res://Screenshot From 2025-04-21 22-03-57.png" id="2_pob1m"] +[ext_resource type="Texture2D" uid="uid://0hcyy1njk5tu" path="res://ProjektLuzidLogo.png" id="3_gophc"] +[ext_resource type="Script" uid="uid://x6bi0h4rircc" path="res://animation_player.gd" id="4_p0nl4"] +[ext_resource type="FontFile" uid="uid://rswq6vrwr2nx" path="res://InstrumentSans-VariableFont_wdth,wght.ttf" id="5_da165"] +[ext_resource type="Script" uid="uid://cax1b0y8uvwj3" path="res://button_2.gd" id="6_r8ukj"] +[ext_resource type="Script" uid="uid://dti3q3vy3rysn" path="res://quit_button.gd" id="7_1colc"] [sub_resource type="FontFile" id="FontFile_db7xr"] cache/0/16/0/ascent = 0.0 @@ -86,11 +86,11 @@ font_size = 60 shadow_size = 3 [sub_resource type="LabelSettings" id="LabelSettings_onc8m"] -font = ExtResource("7_uusyb") +font = ExtResource("5_da165") font_size = 54 [sub_resource type="LabelSettings" id="LabelSettings_ep3pr"] -font = ExtResource("7_uusyb") +font = ExtResource("5_da165") [node name="inGameUI" type="Control"] layout_mode = 3 @@ -99,18 +99,18 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_4v80v") +script = ExtResource("1_g38d0") [node name="TextureRect" type="TextureRect" parent="."] layout_mode = 0 -offset_right = 1280.0 -offset_bottom = 720.0 -texture = ExtResource("1_e6quo") +offset_right = 1920.0 +offset_bottom = 1080.0 +texture = ExtResource("2_pob1m") [node name="MarginContainer" type="MarginContainer" parent="TextureRect"] layout_mode = 2 -offset_right = 1280.0 -offset_bottom = 720.0 +offset_right = 1920.0 +offset_bottom = 1080.0 [node name="HBoxContainer" type="HBoxContainer" parent="TextureRect/MarginContainer"] layout_mode = 2 @@ -125,11 +125,11 @@ layout_direction = 2 layout_mode = 2 size_flags_horizontal = 0 size_flags_vertical = 0 -texture = ExtResource("1_onc8m") +texture = ExtResource("3_gophc") stretch_mode = 2 [node name="AnimationPlayer" type="AnimationPlayer" parent="TextureRect/MarginContainer/HBoxContainer/VBoxContainer/TextureRect"] -script = ExtResource("2_e6quo") +script = ExtResource("4_p0nl4") [node name="Label" type="Label" parent="TextureRect/MarginContainer/HBoxContainer/VBoxContainer"] visible = false @@ -143,35 +143,42 @@ vertical_alignment = 1 layout_mode = 2 size_flags_horizontal = 0 size_flags_vertical = 4 +theme_override_fonts/font = ExtResource("5_da165") +theme_override_font_sizes/font_size = 30 text = " play" flat = true -script = ExtResource("5_4v80v") +script = ExtResource("6_r8ukj") [node name="QuitButton" type="Button" parent="TextureRect/MarginContainer/HBoxContainer/VBoxContainer"] layout_mode = 2 size_flags_horizontal = 0 size_flags_vertical = 4 +theme_override_fonts/font = ExtResource("5_da165") +theme_override_font_sizes/font_size = 30 text = " quit" flat = true -script = ExtResource("6_0qsvx") +script = ExtResource("7_1colc") [node name="VBoxContainer2" type="VBoxContainer" parent="TextureRect/MarginContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 [node name="Label" type="Label" parent="TextureRect/MarginContainer/HBoxContainer/VBoxContainer2"] +visible = false layout_mode = 2 text = "Notes and bugs:" label_settings = SubResource("LabelSettings_onc8m") horizontal_alignment = 2 [node name="Label2" type="Label" parent="TextureRect/MarginContainer/HBoxContainer/VBoxContainer2"] +visible = false layout_mode = 2 text = "Notizen und bugs" label_settings = SubResource("LabelSettings_onc8m") horizontal_alignment = 2 [node name="Label3" type="Label" parent="TextureRect/MarginContainer/HBoxContainer/VBoxContainer2"] +visible = false layout_mode = 2 text = "- Due to the bugs in the current version of the game, it is recommended to ONLY pause when the player is NOT touching a wall nor stairs/diagonal floors, as there is a very