diff --git a/addons/MiniDemoTools b/addons/MiniDemoTools index f14cd28..9b3d9ce 160000 --- a/addons/MiniDemoTools +++ b/addons/MiniDemoTools @@ -1 +1 @@ -Subproject commit f14cd281b7ecd66acb9022100700c89914fe49c1 +Subproject commit 9b3d9ce95b047b2abdd3444a524683e74df750ea diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..576f54a --- /dev/null +++ b/config.toml @@ -0,0 +1,12 @@ +[window] +width = 1920 +height = 1080 +fullscreen = true +borderless = false +position_x = 0 +position_y = 0 +monitor = 0 +[graphics] +max_framerate = 60 +vertical_sync = true +resolution_scale = 1.0 diff --git a/default_bus_layout.tres b/default_bus_layout.tres new file mode 100644 index 0000000..42006f2 --- /dev/null +++ b/default_bus_layout.tres @@ -0,0 +1,3 @@ +[gd_resource type="AudioBusLayout" format=3 uid="uid://dho4f8hrvnvgj"] + +[resource] diff --git a/entities/config.tscn b/entities/config.tscn new file mode 100644 index 0000000..5af86e8 --- /dev/null +++ b/entities/config.tscn @@ -0,0 +1,3 @@ +[gd_scene format=3 uid="uid://71a38wgmskva"] + +[node name="Config" type="Config"] diff --git a/entities/manager.tscn b/entities/manager.tscn index 72242a5..df7b1bf 100644 --- a/entities/manager.tscn +++ b/entities/manager.tscn @@ -4,7 +4,7 @@ [sub_resource type="Animation" id="Animation_qy15n"] resource_name = "timeline" -length = 30.0 +length = 45.0 tracks/0/type = "method" tracks/0/imported = false tracks/0/enabled = true @@ -12,7 +12,7 @@ tracks/0/path = NodePath(".") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0, 10.0333, 30, 60.0333), +"times": PackedFloat32Array(0, 10.0333, 45, 60.0333), "transitions": PackedFloat32Array(1, 1, 1, 1), "values": [{ "args": [0], diff --git a/export_presets.cfg b/export_presets.cfg index 79b5e08..18d42cf 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -37,3 +37,68 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") rm -rf \"{temp_dir}\"" + +[preset.1] + +name="Windows Desktop" +platform="Windows Desktop" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="output/first-windows-text.exe" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="x86_64" +codesign/enable=false +codesign/timestamp=true +codesign/timestamp_server_url="" +codesign/digest_algorithm=1 +codesign/description="" +codesign/custom_options=PackedStringArray() +application/modify_resources=true +application/icon="" +application/console_wrapper_icon="" +application/icon_interpolation=4 +application/file_version="" +application/product_version="" +application/company_name="Minihakkerit" +application/product_name="AltParty24" +application/file_description="" +application/copyright="" +application/trademarks="" +application/export_angle=0 +application/export_d3d12=0 +application/d3d12_agility_sdk_multiarch=true +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="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}' +$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}' +$trigger = New-ScheduledTaskTrigger -Once -At 00:00 +$settings = New-ScheduledTaskSettingsSet +$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings +Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true +Start-ScheduledTask -TaskName godot_remote_debug +while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 } +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue" +ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue +Remove-Item -Recurse -Force '{temp_dir}'" diff --git a/project.godot b/project.godot index f1639dd..de30466 100644 --- a/project.godot +++ b/project.godot @@ -15,6 +15,10 @@ run/main_scene="res://entities/manager.tscn" config/features=PackedStringArray("4.3", "Forward Plus") config/icon="res://icon.svg" +[autoload] + +GlobalConfig="*res://entities/config.tscn" + [debug] gdscript/warnings/unassigned_variable=2 diff --git a/scripts/manager.gd b/scripts/manager.gd index 34b8457..ee7a2b2 100644 --- a/scripts/manager.gd +++ b/scripts/manager.gd @@ -9,6 +9,7 @@ var credits_scene: PackedScene = preload("res://entities/credits.tscn"); # Called when the node enters the scene tree for the first time. func _ready() -> void: + Input.set_mouse_mode(Input.MOUSE_MODE_HIDDEN); register_scene(scene1); register_scene(scene2); register_scene(scene3);