From 724455b2322ca279e2886c030c6943c6634565a7 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 10 Sep 2023 22:37:57 +0200 Subject: [PATCH] Added hopping between songs. Added settings menu, not finished. --- .gitignore | 3 + MainWindow.gd | 169 +++++++++++++++++++++++++++++++++++++------- MainWindow.tscn | 82 ++++++++++++++------- Settings.gd | 16 ++++- SettingsWindow.gd | 65 +++++++++++++++++ SettingsWindow.tscn | 80 +++++++++++++++++++++ export_presets.cfg | 88 ++++++----------------- 7 files changed, 386 insertions(+), 117 deletions(-) create mode 100644 SettingsWindow.gd create mode 100644 SettingsWindow.tscn diff --git a/.gitignore b/.gitignore index 4709183..e6e57d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ # Godot 4+ specific ignores .godot/ +/web/ +*.exe +*.dmg \ No newline at end of file diff --git a/MainWindow.gd b/MainWindow.gd index 331e2d4..dfcb15c 100644 --- a/MainWindow.gd +++ b/MainWindow.gd @@ -4,13 +4,13 @@ extends Control # 2. Fix reset buttons # 3. Fix settings # 9. Fix winner -# 10. Fix jump between songs # 11. Refactor components # 13. Fix graphics in lists # 14. Fix layout # 15. Fix for local play # 16. Change all calls to make_request and function in function # 17. Change some buttons to icons +# 18. Fix shortcuts @onready var open_button := $Open @@ -34,7 +34,7 @@ var song_label := $VBoxContainer/SongLabel var play_button := $PanelContainer/HBoxContainer/PlayButton @onready -var stop_button := $PanelContainer/HBoxContainer/StopButton +var restart_button := $PanelContainer/HBoxContainer/RestartButton @onready var audio := $AudioStreamPlayer @@ -64,7 +64,13 @@ var sound_test_button := $SoundTestButton var sync_button := $SyncButton @onready -var sync_popup := $PopupPanel +var sync_popup := $SyncPopupPanel + +@onready +var settings_button := $SettingsButton + +@onready +var settings_popup := $SettingsPopupPanel @onready var statistics_button := $StatisticsButton @@ -105,6 +111,15 @@ var search_button := $SearchButton @onready var search_view := $Search +@onready +var version_label := $AboutPopupPanel/VBoxContainer/VersionLabel + +@onready +var new_label := $AboutPopupPanel/VBoxContainer/HBoxContainer/NewLabel + +@onready +var comming_label := $AboutPopupPanel/VBoxContainer/HBoxContainer/CommingLabel + var Player := preload("res://Player.tscn") @onready @@ -114,13 +129,14 @@ var path = '/Users/sebastian/ResilioSync/Sorterat_test/Metal Gear Solid 4 - Guns func _ready(): next_button.pressed.connect(fetch_next_song) play_button.pressed.connect(play_or_pause) - stop_button.pressed.connect(stop) + restart_button.pressed.connect(restart) show_answer_button.pressed.connect(show_answer) search_button.pressed.connect(show_search) sync_button.pressed.connect(sync_games) sound_test_button.pressed.connect(get_sound_test_song) statistics_button.pressed.connect(get_statistics) about_button.pressed.connect(show_about) + settings_button.pressed.connect(show_settings) progress.drag_started.connect(_on_drag_started) progress.drag_ended.connect(_on_drag_ended) @@ -131,9 +147,16 @@ func _ready(): open_button.pressed.connect(open) get_suggestion_list() + fetch_full_music_list_at_start() func show_about(): about_popup.visible = true + version_label.text = Settings.version + new_label.text = Settings.whats_new + comming_label.text = Settings.whats_left + +func show_settings(): + settings_popup.visible = true func get_statistics(): statistic_popup.visible = true @@ -235,7 +258,80 @@ func show_answer(): var error = http_request.request(Settings.default_path + "/music/info") if error != OK: push_error("An error occurred in the HTTP request.") + +func fetch_full_music_list_at_start(): + var show_fetched_list = func(result, response_code, headers, body): + var json = JSON.new() + var error = json.parse(body.get_string_from_utf8()) + if error == OK: + var data_received = json.get_data() + if typeof(data_received) == TYPE_ARRAY: + song_list = [] + song_list.append_array(data_received) + for song in song_list: + var label := Label.new() + var format_string = "%d. %s - %s" + var actual_string = format_string % [(song.SongNo+1), song.Game, song.Song] + label.text = actual_string + label.mouse_filter = Control.MOUSE_FILTER_PASS + label.gui_input.connect(song_clicked.bind(label, song.SongNo)) + music_list.add_child(label) + else: + print("Unexpected data") + make_request(Settings.default_path + "/music/list", show_fetched_list) + +func fetch_full_music_list(event, song_no: int): + if (event is InputEventMouseButton && event.pressed && event.button_index == MOUSE_BUTTON_LEFT): + var show_fetched_list = func(result, response_code, headers, body): + var json = JSON.new() + var error = json.parse(body.get_string_from_utf8()) + + if error == OK: + var data_received = json.get_data() + if typeof(data_received) == TYPE_ARRAY: + song_list = [] + song_list.append_array(data_received) + delete_children(music_list) + for song in song_list: + var label := Label.new() + game_label.text = song.Game + song_label.text = song.Song + var format_string = "%d. %s - %s" + var actual_string = format_string % [(song.SongNo+1), song.Game, song.Song] + label.text = actual_string + label.mouse_filter = Control.MOUSE_FILTER_PASS + label.gui_input.connect(song_clicked.bind(label, song.SongNo)) + print(str(music_list.get_child_count()) + " | " + str(song_list.size() - 1)) + if music_list.get_child_count() == song_list.size() - 1: + label.add_theme_color_override("font_color", Color(1, 0.5, 0)) + music_list.add_child(label) + else: + print("Unexpected data") + make_request(Settings.default_path + "/music/list", show_fetched_list) + var play_clicked_song = func(result, response_code, headers, body): + if result != HTTPRequest.RESULT_SUCCESS: + push_error("Song couldn't be downloaded. Try a different song.") + var sound = AudioStreamMP3.new() + sound.data = body + audio.stream = sound + audio.play() + play_button.text = "Pause" + stream = audio.stream + progress.max_value = round(stream.get_length()) + progress.tick_count = round(stream.get_length() / 60) + make_request(Settings.default_path + "/music?song=" + str(song_no), play_clicked_song) + var show_answer = func(result, response_code, headers, body): + var json = JSON.new() + var error = json.parse(body.get_string_from_utf8()) + + if error == OK: + var data_received = json.get_data() + game_label.text = data_received.Game + song_label.text = data_received.Song + make_request(Settings.default_path + "/music/info", show_answer) + + func fetched(): var http_request2 = HTTPRequest.new() add_child(http_request2) @@ -279,21 +375,50 @@ func show_fetched_list(result, response_code, headers, body) -> void: var actual_string = format_string % [(song.SongNo+1), song.Game, song.Song] label.text = actual_string label.mouse_filter = Control.MOUSE_FILTER_PASS - label.gui_input.connect(song_clicked.bind(song.SongNo)) + label.gui_input.connect(song_clicked.bind(label, song.SongNo)) music_list.add_child(label) - + + var songs := music_list.get_children() + for song in songs: + song.remove_theme_color_override("font_color") next_label = Label.new() + next_label.add_theme_color_override("font_color", Color(1, 0.5, 0)) next_label.text = "??? - ???" next_label.mouse_filter = Control.MOUSE_FILTER_PASS - next_label.gui_input.connect(show_fetched) + next_label.gui_input.connect(fetch_full_music_list.bind(songs.size())) music_list.add_child(next_label) else: print("Unexpected data") -func song_clicked(event, song_no): +func song_clicked(event, label: Label, song_no: int): if (event is InputEventMouseButton && event.pressed && event.button_index == MOUSE_BUTTON_LEFT): - print("Clicked: " + str(song_no)) + print("Song Clicked: " + str(song_no)) + var songs := music_list.get_children() + for song in songs: + song.remove_theme_color_override("font_color") + label.add_theme_color_override("font_color", Color(1, 0.5, 0)) + var play_clicked_song = func(result, response_code, headers, body): + if result != HTTPRequest.RESULT_SUCCESS: + push_error("Song couldn't be downloaded. Try a different song.") + var sound = AudioStreamMP3.new() + sound.data = body + audio.stream = sound + audio.play() + play_button.text = "Pause" + stream = audio.stream + progress.max_value = round(stream.get_length()) + progress.tick_count = round(stream.get_length() / 60) + make_request(Settings.default_path + "/music?song=" + str(song_no), play_clicked_song) + var show_answer = func(result, response_code, headers, body): + var json = JSON.new() + var error = json.parse(body.get_string_from_utf8()) + + if error == OK: + var data_received = json.get_data() + game_label.text = data_received.Game + song_label.text = data_received.Song + make_request(Settings.default_path + "/music/info", show_answer) # Called when the HTTP request is completed. func _http_request_completed(result, response_code, headers, body): @@ -433,31 +558,27 @@ func play_local_song(song) -> void: progress.max_value = round(stream.get_length()) progress.tick_count = round(stream.get_length() / 60) -var is_paused: bool = true func play_or_pause(): - if is_paused: - is_paused = false + if audio.stream_paused: play_button.text = "Pause" - if audio.stream_paused: - audio.stream_paused = false - audio.seek(playback_position) - print("continue") - progress.max_value = round(stream.get_length()) - progress.tick_count = round(stream.get_length() / 60) - else: - fetch_next_song() + audio.stream_paused = false + audio.seek(playback_position) + print("continue") + progress.max_value = round(stream.get_length()) + progress.tick_count = round(stream.get_length() / 60) else: audio.stream_paused = true playback_position = audio.get_playback_position() - is_paused = true play_button.text = "Play" -func stop() -> void: +func restart() -> void: audio.stop() audio.stream_paused = false progress.value = 0 - is_paused = true - play_button.text = "Play" + playback_position = audio.get_playback_position() + audio.seek(playback_position) + play_button.text = "Pause" + audio.play() func _on_drag_started() -> void: is_changing = true diff --git a/MainWindow.tscn b/MainWindow.tscn index c99bc0a..33d3c9e 100644 --- a/MainWindow.tscn +++ b/MainWindow.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://xwq863o6uvsu"] +[gd_scene load_steps=19 format=3 uid="uid://xwq863o6uvsu"] [ext_resource type="Script" path="res://MainWindow.gd" id="1_eu0t5"] [ext_resource type="PackedScene" uid="uid://b16on0oscg1bv" path="res://CharacterSelect.tscn" id="2_76kf4"] @@ -10,6 +10,7 @@ [ext_resource type="Script" path="res://PlayerNameField.gd" id="7_qsdfy"] [ext_resource type="Theme" uid="uid://rxexo3ur85as" path="res://LightGrayTheme.tres" id="7_wxbv6"] [ext_resource type="PackedScene" uid="uid://bxydgil1yifps" path="res://SearchWindow.tscn" id="9_5ijvr"] +[ext_resource type="PackedScene" uid="uid://dldpeo5y3l5hq" path="res://SettingsWindow.tscn" id="11_k62u5"] [sub_resource type="LabelSettings" id="LabelSettings_ychxr"] font_size = 25 @@ -81,6 +82,7 @@ offset_top = 95.0 offset_right = 1845.0 offset_bottom = 465.0 horizontal_scroll_mode = 0 +vertical_scroll_mode = 3 script = ExtResource("2_gxtxm") [node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer"] @@ -88,15 +90,6 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="Label" type="Label" parent="ScrollContainer/VBoxContainer"] -layout_mode = 2 -text = "Test -" - -[node name="Label2" type="Label" parent="ScrollContainer/VBoxContainer"] -layout_mode = 2 -text = "Test2" - [node name="VBoxContainer" type="VBoxContainer" parent="."] layout_mode = 0 offset_left = 52.0 @@ -106,14 +99,12 @@ offset_bottom = 368.0 [node name="GameLabel" type="Label" parent="VBoxContainer"] layout_mode = 2 -text = "????????" label_settings = SubResource("LabelSettings_qspbu") horizontal_alignment = 1 autowrap_mode = 2 [node name="SongLabel" type="Label" parent="VBoxContainer"] layout_mode = 2 -text = "??????" label_settings = SubResource("LabelSettings_3m52w") horizontal_alignment = 1 autowrap_mode = 2 @@ -136,9 +127,9 @@ size_flags_vertical = 4 layout_mode = 2 text = "Play" -[node name="StopButton" type="Button" parent="PanelContainer/HBoxContainer"] +[node name="RestartButton" type="Button" parent="PanelContainer/HBoxContainer"] layout_mode = 2 -text = "Stop" +text = "Restart" [node name="HSlider" type="HSlider" parent="PanelContainer/HBoxContainer"] layout_mode = 2 @@ -313,11 +304,11 @@ offset_top = 81.2367 offset_right = 349.196 offset_bottom = 81.2367 -[node name="PopupPanel" type="PopupPanel" parent="."] +[node name="SyncPopupPanel" type="PopupPanel" parent="."] initial_position = 2 size = Vector2i(140, 70) -[node name="Label" type="Label" parent="PopupPanel"] +[node name="Label" type="Label" parent="SyncPopupPanel"] offset_left = 4.0 offset_top = 4.0 offset_right = 136.0 @@ -349,24 +340,61 @@ vertical_alignment = 1 [node name="AboutPopupPanel" type="PopupPanel" parent="."] initial_position = 2 -size = Vector2i(450, 100) +size = Vector2i(848, 272) -[node name="Label" type="Label" parent="AboutPopupPanel"] +[node name="VBoxContainer" type="VBoxContainer" parent="AboutPopupPanel"] offset_left = 4.0 offset_top = 4.0 -offset_right = 446.0 -offset_bottom = 96.0 -text = "Music Player Randomizer v0.6" +offset_right = 844.0 +offset_bottom = 268.0 + +[node name="Label" type="Label" parent="AboutPopupPanel/VBoxContainer"] +layout_mode = 2 +text = "Music Player Randomizer" horizontal_alignment = 1 -[node name="AboutLabel" type="Label" parent="AboutPopupPanel"] -offset_left = 4.0 -offset_top = 4.0 -offset_right = 446.0 -offset_bottom = 96.0 +[node name="VersionLabel" type="Label" parent="AboutPopupPanel/VBoxContainer"] +layout_mode = 2 +horizontal_alignment = 1 + +[node name="AboutLabel" type="Label" parent="AboutPopupPanel/VBoxContainer"] +layout_mode = 2 text = "Try your video game music knowledge with this VGM randomizer, invite your friends and see who is the best." horizontal_alignment = 1 -vertical_alignment = 1 + +[node name="HBoxContainer" type="HBoxContainer" parent="AboutPopupPanel/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 3 + +[node name="NewLabel" type="Label" parent="AboutPopupPanel/VBoxContainer/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 0 +text = "0.7-Beta: Can now hop between songs" autowrap_mode = 2 +[node name="CommingLabel" type="Label" parent="AboutPopupPanel/VBoxContainer/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 0 +text = "Fix reset buttons +Fix settings +Fix winner +Fix graphics in lists +Fix layout +Fix for local play +Change some buttons to icons +Add shortcuts" +autowrap_mode = 2 + +[node name="SettingsPopupPanel" type="PopupPanel" parent="."] +initial_position = 2 +size = Vector2i(268, 233) + +[node name="VBoxContainer" parent="SettingsPopupPanel" instance=ExtResource("11_k62u5")] +offset_left = 4.0 +offset_top = 4.0 +offset_right = -4.0 +offset_bottom = 19.0 + [connection signal="dir_selected" from="FileDialog" to="." method="_on_file_dialog_dir_selected"] diff --git a/Settings.gd b/Settings.gd index 4e954f8..aeaff1e 100644 --- a/Settings.gd +++ b/Settings.gd @@ -1,7 +1,9 @@ extends Node #var default_path: String = "http://192.168.86.100:8085" -var default_path: String = "https://music.sanplex.tech" +#var default_path: String = "https://music.sanplex.tech" +var default_path: String = "https://tmusic.sanplex.tech" +var selected_server = 0 var is_local: bool = false @@ -11,6 +13,18 @@ var add_to_stats: bool = false var use_low_played_mode: bool = false var winning_score: int = 20 +var version: String = "0.7.5-Beta" +var whats_new: String = "0.7.5-Beta: Added settings menu, most things don't do anythig yet +0.7-Beta: Can now hop between songs" +var whats_left: String = "Fix reset buttons +Fix settings +Fix winner +Fix graphics in lists +Fix layout +Fix for local play +Change some buttons to icons +Add shortcuts" + #play = X #nästa = c diff --git a/SettingsWindow.gd b/SettingsWindow.gd new file mode 100644 index 0000000..cfa486a --- /dev/null +++ b/SettingsWindow.gd @@ -0,0 +1,65 @@ +extends VBoxContainer + +@onready +var stop_after_current_button := $StopAfterCurrentCheckButton + +@onready +var hide_next_track_button := $HideNextTrackCheckButton + +@onready +var add_to_database_button := $AddToDatabaseCheckButton + +@onready +var low_played_button := $LowPlayedCheckButton + +@onready +var score_label := $HBoxContainer/ScoreLabel + +@onready +var lower_winning_score_button := $HBoxContainer/LowerButton + +@onready +var increase_winning_score_button := $HBoxContainer/IncreaseButton + +@onready +var select_server_button := $SelectServerButton + +# Called when the node enters the scene tree for the first time. +func _ready(): + stop_after_current_button.pressed.connect(stop_after_current) + hide_next_track_button.pressed.connect(hide_next_track) + add_to_database_button.pressed.connect(add_to_database) + low_played_button.pressed.connect(low_played) + lower_winning_score_button.pressed.connect(lower_winning_score) + increase_winning_score_button.pressed.connect(increase_winning_score) + select_server_button.pressed.connect(select_server) + + stop_after_current_button.button_pressed = Settings.stop_after_current + hide_next_track_button.button_pressed = Settings.hide_next_track + add_to_database_button.button_pressed = Settings.add_to_stats + low_played_button.button_pressed = Settings.use_low_played_mode + select_server_button.select(Settings.selected_server) + +func stop_after_current(): + Settings.stop_after_current = !Settings.stop_after_current + +func hide_next_track(): + Settings.hide_next_track = !Settings.hide_next_track + +func add_to_database(): + Settings.add_to_stats = !Settings.add_to_stats + +func low_played(): + Settings.use_low_played_mode = !Settings.use_low_played_mode + +func lower_winning_score(): + Settings.winning_score -= 1 + score_label.text = str(Settings.winning_score) + +func increase_winning_score(): + Settings.winning_score += 1 + score_label.text = str(Settings.winning_score) + +func select_server() -> void: + Settings.default_path = select_server_button.get_item_text(select_server_button.selected) + Settings.selected_server = select_server_button.selected diff --git a/SettingsWindow.tscn b/SettingsWindow.tscn new file mode 100644 index 0000000..51f7a5d --- /dev/null +++ b/SettingsWindow.tscn @@ -0,0 +1,80 @@ +[gd_scene load_steps=3 format=3 uid="uid://dldpeo5y3l5hq"] + +[ext_resource type="Script" path="res://SettingsWindow.gd" id="1_bt55j"] + +[sub_resource type="LabelSettings" id="LabelSettings_3xrlm"] +font_size = 25 + +[node name="VBoxContainer" type="VBoxContainer"] +clip_contents = true +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +script = ExtResource("1_bt55j") + +[node name="Label" type="Label" parent="."] +layout_mode = 2 +size_flags_vertical = 0 +text = "Settings" +label_settings = SubResource("LabelSettings_3xrlm") +horizontal_alignment = 1 + +[node name="StopAfterCurrentCheckButton" type="CheckButton" parent="."] +layout_mode = 2 +size_flags_horizontal = 0 +action_mode = 0 +text = "Stop after current" + +[node name="HideNextTrackCheckButton" type="CheckButton" parent="."] +layout_mode = 2 +size_flags_horizontal = 0 +action_mode = 0 +text = "Hide next track" + +[node name="AddToDatabaseCheckButton" type="CheckButton" parent="."] +layout_mode = 2 +size_flags_horizontal = 0 +action_mode = 0 +text = "Turn on played to database" + +[node name="LowPlayedCheckButton" type="CheckButton" parent="."] +layout_mode = 2 +size_flags_horizontal = 0 +action_mode = 0 +text = "Use low played mode" + +[node name="HBoxContainer" type="HBoxContainer" parent="."] +layout_mode = 2 + +[node name="Label2" type="Label" parent="HBoxContainer"] +layout_mode = 2 +text = "Winning Score: " + +[node name="ScoreLabel" type="Label" parent="HBoxContainer"] +layout_mode = 2 +text = "20" + +[node name="LowerButton" type="Button" parent="HBoxContainer"] +custom_minimum_size = Vector2(30, 2.08165e-12) +layout_mode = 2 +text = "-1" + +[node name="IncreaseButton" type="Button" parent="HBoxContainer"] +custom_minimum_size = Vector2(30, 2.08165e-12) +layout_mode = 2 +text = "+1" + +[node name="SelectServerButton" type="OptionButton" parent="."] +layout_mode = 2 +item_count = 3 +selected = 0 +popup/item_0/text = "https://tmusic.sanplex.tech" +popup/item_0/id = 0 +popup/item_1/text = "https://music.sanplex.tech" +popup/item_1/id = 1 +popup/item_2/text = "http://192.168.86.100:8085" +popup/item_2/id = 2 diff --git a/export_presets.cfg b/export_presets.cfg index 89dcd54..3155ad7 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -8,28 +8,24 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="" +export_path="./MusicPlayer_0.7.5_Beta.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" [preset.0.options] custom_template/debug="" custom_template/release="" -debug/export_console_script=1 -binary_format/embed_pck=false +debug/export_console_wrapper=1 +binary_format/embed_pck=true 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/identity_type=0 -codesign/identity="" -codesign/password="" codesign/timestamp=true codesign/timestamp_server_url="" codesign/digest_algorithm=1 @@ -63,6 +59,7 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi 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}'" +debug/export_console_script=1 [preset.1] @@ -74,33 +71,40 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="" +export_path="./MusicPlayer_0.6_Beta.dmg" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" [preset.1.options] +export/distribution_type=1 binary_format/architecture="universal" custom_template/debug="" custom_template/release="" -debug/export_console_script=1 +debug/export_console_wrapper=0 application/icon="" application/icon_interpolation=4 -application/bundle_identifier="" +application/bundle_identifier="tech.sanplex.musicplayer" application/signature="" -application/app_category="Games" +application/app_category="Music-games" application/short_version="1.0" application/version="1.0" application/copyright="" application/copyright_localized={} +application/min_macos_version="10.12" display/high_res=true +xcode/platform_build="14C18" +xcode/sdk_version="13.1" +xcode/sdk_build="22C55" +xcode/sdk_name="macosx13.1" +xcode/xcode_version="1420" +xcode/xcode_build="14C18" codesign/codesign=3 +codesign/installer_identity="" +codesign/apple_team_id="" codesign/identity="" -codesign/certificate_file="" -codesign/certificate_password="" codesign/entitlements/custom_file="" codesign/entitlements/allow_jit_code_execution=false codesign/entitlements/allow_unsigned_executable_memory=false @@ -126,12 +130,6 @@ codesign/entitlements/app_sandbox/files_movies=0 codesign/entitlements/app_sandbox/helper_executables=[] codesign/custom_options=PackedStringArray() notarization/notarization=0 -notarization/apple_id_name="" -notarization/apple_id_password="" -notarization/apple_team_id="" -notarization/api_uuid="" -notarization/api_key="" -notarization/api_key_id="" privacy/microphone_usage_description="" privacy/microphone_usage_description_localized={} privacy/camera_usage_description="" @@ -165,66 +163,26 @@ open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}" ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\") rm -rf \"{temp_dir}\"" +debug/export_console_script=1 +notarization/apple_team_id="" [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 -script_encryption_key="" - -[preset.2.options] - -custom_template/debug="" -custom_template/release="" -debug/export_console_script=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}\"" - -[preset.3] - name="Web" platform="Web" -runnable=true +runnable=false dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="" +export_path="web/index.html" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" -[preset.3.options] +[preset.2.options] custom_template/debug="" custom_template/release=""