diff --git a/export_presets.cfg b/export_presets.cfg index a61ee13..a112b59 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -1,6 +1,6 @@ [preset.0] -name="x86_64" +name="Windows x86_64" platform="Windows Desktop" runnable=true advanced_options=false @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="build/desktop/x86_64.exe" +export_path="build/win/claustrophemia.x86_64.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -65,7 +65,7 @@ Remove-Item -Recurse -Force '{temp_dir}'" [preset.1] -name="x86_32" +name="Windows x86_32" platform="Windows Desktop" runnable=false advanced_options=false @@ -74,7 +74,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="build/desktop/x86_32.exe" +export_path="build/win/claustrophemia.x86_32.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -130,7 +130,7 @@ Remove-Item -Recurse -Force '{temp_dir}'" [preset.2] -name="arm64" +name="Windows arm64" platform="Windows Desktop" runnable=false advanced_options=false @@ -139,7 +139,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="build/desktop/arm64.exe" +export_path="build/win/claustrophemia.arm64.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -195,6 +195,206 @@ Remove-Item -Recurse -Force '{temp_dir}'" [preset.3] +name="Linux x86_64" +platform="Linux" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="build/linux/claustrophemia.x86_64" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.3.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=0 +binary_format/embed_pck=true +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="x86_64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" + +[preset.4] + +name="Linux x86_32" +platform="Linux" +runnable=false +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="build/linux/claustrophemia.x86_32" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.4.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=0 +binary_format/embed_pck=true +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="x86_32" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" + +[preset.5] + +name="Linux arm64" +platform="Linux" +runnable=false +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="build/linux/claustrophemia.arm64" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.5.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=0 +binary_format/embed_pck=true +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="arm64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" + +[preset.6] + +name="Linux arm32" +platform="Linux" +runnable=false +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="build/linux/claustrophemia.arm32" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.6.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=0 +binary_format/embed_pck=true +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="arm32" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" + +[preset.7] + +name="Linux arm32 (copy)" +platform="Linux" +runnable=false +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.7.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=0 +binary_format/embed_pck=true +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="rv64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" + +[preset.8] + name="Web" platform="Web" runnable=true @@ -211,7 +411,7 @@ encrypt_pck=false encrypt_directory=false script_export_mode=2 -[preset.3.options] +[preset.8.options] custom_template/debug="" custom_template/release="" @@ -235,167 +435,7 @@ progressive_web_app/icon_180x180="" progressive_web_app/icon_512x512="" progressive_web_app/background_color=Color(0, 0, 0, 1) -[preset.4] - -name="x86_64" -platform="Linux" -runnable=true -advanced_options=false -dedicated_server=false -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="build/linux/claustrophemia.x86_64" -encryption_include_filters="" -encryption_exclude_filters="" -encrypt_pck=false -encrypt_directory=false -script_export_mode=2 - -[preset.4.options] - -custom_template/debug="" -custom_template/release="" -debug/export_console_wrapper=0 -binary_format/embed_pck=true -texture_format/s3tc_bptc=true -texture_format/etc2_astc=false -binary_format/architecture="x86_64" -ssh_remote_deploy/enabled=false -ssh_remote_deploy/host="user@host_ip" -ssh_remote_deploy/port="22" -ssh_remote_deploy/extra_args_ssh="" -ssh_remote_deploy/extra_args_scp="" -ssh_remote_deploy/run_script="#!/usr/bin/env bash -export DISPLAY=:0 -unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" -\"{temp_dir}/{exe_name}\" {cmd_args}" -ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash -kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") -rm -rf \"{temp_dir}\"" - -[preset.5] - -name="x86_32" -platform="Linux" -runnable=false -advanced_options=false -dedicated_server=false -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="build/linux/claustrophemia.x86_32" -encryption_include_filters="" -encryption_exclude_filters="" -encrypt_pck=false -encrypt_directory=false -script_export_mode=2 - -[preset.5.options] - -custom_template/debug="" -custom_template/release="" -debug/export_console_wrapper=0 -binary_format/embed_pck=true -texture_format/s3tc_bptc=true -texture_format/etc2_astc=false -binary_format/architecture="x86_32" -ssh_remote_deploy/enabled=false -ssh_remote_deploy/host="user@host_ip" -ssh_remote_deploy/port="22" -ssh_remote_deploy/extra_args_ssh="" -ssh_remote_deploy/extra_args_scp="" -ssh_remote_deploy/run_script="#!/usr/bin/env bash -export DISPLAY=:0 -unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" -\"{temp_dir}/{exe_name}\" {cmd_args}" -ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash -kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") -rm -rf \"{temp_dir}\"" - -[preset.6] - -name="arm64" -platform="Linux" -runnable=false -advanced_options=false -dedicated_server=false -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="build/linux/claustrophemia.arm64" -encryption_include_filters="" -encryption_exclude_filters="" -encrypt_pck=false -encrypt_directory=false -script_export_mode=2 - -[preset.6.options] - -custom_template/debug="" -custom_template/release="" -debug/export_console_wrapper=0 -binary_format/embed_pck=true -texture_format/s3tc_bptc=true -texture_format/etc2_astc=false -binary_format/architecture="arm64" -ssh_remote_deploy/enabled=false -ssh_remote_deploy/host="user@host_ip" -ssh_remote_deploy/port="22" -ssh_remote_deploy/extra_args_ssh="" -ssh_remote_deploy/extra_args_scp="" -ssh_remote_deploy/run_script="#!/usr/bin/env bash -export DISPLAY=:0 -unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" -\"{temp_dir}/{exe_name}\" {cmd_args}" -ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash -kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") -rm -rf \"{temp_dir}\"" - -[preset.7] - -name="arm32" -platform="Linux" -runnable=false -advanced_options=false -dedicated_server=false -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="build/linux/claustrophemia.arm32" -encryption_include_filters="" -encryption_exclude_filters="" -encrypt_pck=false -encrypt_directory=false -script_export_mode=2 - -[preset.7.options] - -custom_template/debug="" -custom_template/release="" -debug/export_console_wrapper=0 -binary_format/embed_pck=true -texture_format/s3tc_bptc=true -texture_format/etc2_astc=false -binary_format/architecture="arm32" -ssh_remote_deploy/enabled=false -ssh_remote_deploy/host="user@host_ip" -ssh_remote_deploy/port="22" -ssh_remote_deploy/extra_args_ssh="" -ssh_remote_deploy/extra_args_scp="" -ssh_remote_deploy/run_script="#!/usr/bin/env bash -export DISPLAY=:0 -unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" -\"{temp_dir}/{exe_name}\" {cmd_args}" -ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash -kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") -rm -rf \"{temp_dir}\"" - -[preset.8] +[preset.9] name="macOS" platform="macOS" @@ -406,14 +446,14 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="build/mac.zip" +export_path="build/claustrophemia.mac.zip" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false script_export_mode=2 -[preset.8.options] +[preset.9.options] export/distribution_type=1 binary_format/architecture="universal" diff --git a/ui/Settings.tscn b/ui/Settings.tscn index 3f2801d..1beafc8 100644 --- a/ui/Settings.tscn +++ b/ui/Settings.tscn @@ -25,6 +25,7 @@ offset_right = 40.0 offset_bottom = 40.0 [node name="Label" type="RichTextLabel" parent="Bars"] +layout_mode = 0 offset_left = 204.0 offset_top = 133.0 offset_right = 252.0 @@ -32,6 +33,7 @@ offset_bottom = 157.0 text = "Bars" [node name="Select" type="OptionButton" parent="Bars"] +layout_mode = 0 offset_left = 272.0 offset_top = 128.0 offset_right = 375.0 @@ -42,3 +44,10 @@ popup/item_1/text = "Stone" popup/item_1/id = 1 popup/item_2/text = "Crystal" popup/item_2/id = 2 + +[node name="BackButton" type="Button" parent="."] +offset_left = 40.0 +offset_top = 272.0 +offset_right = 168.0 +offset_bottom = 320.0 +text = "Back" diff --git a/ui/settings.gd b/ui/settings.gd index 3d2ffa8..6f38d7d 100644 --- a/ui/settings.gd +++ b/ui/settings.gd @@ -1,10 +1,15 @@ extends ColorRect @onready var bar_option = $Bars/Select +@onready var back_button = $BackButton func _ready() -> void: bar_option.selected = ConfigManager.get_setting("bars") bar_option.item_selected.connect(change_bar_selection) + back_button.button_down.connect(main_menu) func change_bar_selection(index: int) -> void: ConfigManager.set_setting("bars", index) + +func main_menu() -> void: + get_tree().change_scene_to_file("res://ui/MainMenu.tscn")