From f602e04e16780f0d0eb7341b78103954c705375c Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 29 Sep 2023 18:30:24 +0200 Subject: [PATCH] Fix mistake, Rename project, Use Git LFS --- .gitattributes | 7 +++ addons/.gitkeep | 0 export_presets.cfg | 105 ++++++++++++++++++++++++++++++++++++++++++- project.godot | 4 +- src/gui/menu/main.gd | 2 +- 5 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 addons/.gitkeep diff --git a/.gitattributes b/.gitattributes index 8ad74f7..d87dcff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,9 @@ # Normalize EOL for all files that Git considers text files. * text=auto eol=lf + +# Track files for Git LFS +assets/**/*.wav filter=lfs diff=lfs merge=lfs -text +assets/**/*.psd filter=lfs diff=lfs merge=lfs -text +assets/**/*.png filter=lfs diff=lfs merge=lfs -text +assets/**/*.otf filter=lfs diff=lfs merge=lfs -text +assets/**/*.ttf filter=lfs diff=lfs merge=lfs -text diff --git a/addons/.gitkeep b/addons/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/export_presets.cfg b/export_presets.cfg index 4fbb459..73afdf7 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -2,7 +2,7 @@ name="Web" platform="Web" -runnable=true +runnable=false dedicated_server=false custom_features="" export_filter="all_resources" @@ -13,7 +13,6 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" [preset.0.options] @@ -36,3 +35,105 @@ progressive_web_app/icon_144x144="" progressive_web_app/icon_180x180="" progressive_web_app/icon_512x512="" progressive_web_app/background_color=Color(0, 0, 0, 1) + +[preset.1] + +name="Windows Desktop" +platform="Windows Desktop" +runnable=true +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 + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=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="" +application/product_name="" +application/file_description="" +application/copyright="" +application/trademarks="" +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}'" + +[preset.2] + +name="Linux/X11" +platform="Linux/X11" +runnable=true +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 + +[preset.2.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=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}\"" diff --git a/project.godot b/project.godot index b2301d8..fe7f1d1 100644 --- a/project.godot +++ b/project.godot @@ -10,14 +10,14 @@ config_version=5 [application] -config/name="GameJamTemplate" +config/name="LD54" run/main_scene="res://src/gui/menu/main.tscn" config/features=PackedStringArray("4.1", "Forward Plus") config/icon="res://icon.svg" [dotnet] -project/assembly_name="GameJamTemplate" +project/assembly_name="LD54" [editor] diff --git a/src/gui/menu/main.gd b/src/gui/menu/main.gd index 689d218..8672252 100644 --- a/src/gui/menu/main.gd +++ b/src/gui/menu/main.gd @@ -11,7 +11,7 @@ func _process(delta): pass -func _on_start_button_pressed():util +func _on_start_button_pressed(): get_tree().change_scene("res://game/main.tscn")