diff --git a/export_presets.cfg b/export_presets.cfg index 99aaf85..7ce858b 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -3,94 +3,80 @@ name="Linux" platform="Linux/X11" runnable=true +dedicated_server=false custom_features="" export_filter="all_resources" include_filter="levels/*, scripts/*, resources/*, cards/*" exclude_filter="dependencies/*, cache/*" export_path="" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false [preset.0.options] +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false texture_format/bptc=false 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}\"" texture_format/no_bptc_fallbacks=true binary_format/64_bits=true -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" [preset.1] -name="Mac OS" -platform="Mac OSX" +name="Windows" +platform="Windows Desktop" runnable=true +dedicated_server=false custom_features="" export_filter="all_resources" include_filter="levels/*, scripts/*, resources/*, cards/*" exclude_filter="dependencies/*, cache/*" export_path="" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false [preset.1.options] custom_template/debug="" custom_template/release="" -application/name="Oh My Git!" -application/info="" -application/icon="" -application/identifier="" -application/signature="" -application/short_version="1.0" -application/version="1.0" -application/copyright="" -display/high_res=false -privacy/camera_usage_description="" -privacy/microphone_usage_description="" -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false - -[preset.2] - -name="Windows" -platform="Windows Desktop" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="levels/*, scripts/*, resources/*, cards/*" -exclude_filter="dependencies/*, cache/*" -export_path="" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.2.options] - +debug/export_console_wrapper=1 +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false -texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" +binary_format/architecture="x86_64" codesign/enable=false -codesign/identity="" -codesign/password="" codesign/timestamp=true codesign/timestamp_server_url="" codesign/digest_algorithm=1 codesign/description="" -codesign/custom_options=PoolStringArray( ) +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="" @@ -98,26 +84,60 @@ 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}'" +texture_format/no_bptc_fallbacks=true +binary_format/64_bits=true -[preset.3] +[preset.2] -name="HTML5" -platform="HTML5" +name="Web" +platform="Web" runnable=true +dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="levels/*, scripts/*, resources/*" -exclude_filter="dependencies/*, cache/*" -export_path="" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" +include_filter="levels/*, scripts/*" +exclude_filter="" +export_path="build/oh-my-git-web/index.html" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false -[preset.3.options] +[preset.2.options] +custom_template/debug="" +custom_template/release="" +variant/extensions_support=false vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=false +html/export_icon=true html/custom_html_shell="" -html/head_include="" -custom_template/release="" -custom_template/debug="" +html/head_include="" +html/canvas_resize_policy=2 +html/focus_canvas_on_start=true +html/experimental_virtual_keyboard=false +progressive_web_app/enabled=false +progressive_web_app/offline_page="" +progressive_web_app/display=1 +progressive_web_app/orientation=0 +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) diff --git a/project.godot b/project.godot index 2ae9df7..c2d425b 100644 --- a/project.godot +++ b/project.godot @@ -111,4 +111,5 @@ limits/debugger/max_warnings_per_second=1000 [rendering] +renderer/rendering_method="mobile" environment/defaults/default_clear_color=Color(0, 0, 0, 1) diff --git a/scenes/game.gd b/scenes/game.gd index 613e036..4d1642b 100644 --- a/scenes/game.gd +++ b/scenes/game.gd @@ -94,7 +94,7 @@ func save_state(): func load_state(): var savegame = FileAccess.open(_file,FileAccess.READ) - if not savegame.file_exists(_file): + if not savegame: save_state() #savegame.open(_file, File.READ) diff --git a/scenes/shell.gd b/scenes/shell.gd index 39b19b5..6e25bd9 100644 --- a/scenes/shell.gd +++ b/scenes/shell.gd @@ -83,6 +83,16 @@ func run_async_thread(shell_command): var script_path = game.tmp_prefix + "command" + str(randi()) helpers.write_file(script_path, hacky_command) result = helpers.exec(_shell_binary(), [script_path], crash_on_fail) + elif _os == "Web": + hacky_command = hacky_command.replace("\\", "\\\\").replace("'", "\\'").replace("\n", "\\n") + var js_code = "console.log('" + hacky_command + "')" + print(js_code) + print(shell_command) + JavaScriptBridge.eval(js_code) + #JavaScriptBridge.eval("test('blubb')") + result = {} + result["output"] = "Hi!" + result["exit_code"] = 0 else: helpers.crash("Unimplemented OS: %s" % _os) diff --git a/scenes/title.tscn b/scenes/title.tscn index 7478300..5f1a3c0 100644 --- a/scenes/title.tscn +++ b/scenes/title.tscn @@ -10,6 +10,8 @@ layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 theme = ExtResource("1") script = ExtResource("3")