diff --git a/.github/workflows/godot-build-artifact.yml b/.github/workflows/godot-build-artifact.yml index 930088a53..afe4172ee 100644 --- a/.github/workflows/godot-build-artifact.yml +++ b/.github/workflows/godot-build-artifact.yml @@ -45,19 +45,13 @@ jobs: sudo cp -r $GITHUB_WORKSPACE/templates/* templates/3.2.4.rc1 echo *** Exporting Files *** cd $GITHUB_WORKSPACE - sudo mkdir -p builds/{x11-32-standard,x11-64-standard,win-32-standard,win-64-standard,osx-standard} + sudo mkdir -p builds/{x11-64-standard,win-64-standard,osx-standard} - name: Export x11-64 run: | sudo ./Godot_v3.2.4-rc1_linux_headless.64 --path "." --export "x11-64" $GITHUB_WORKSPACE/builds/x11-64-standard/FoxyAdventure.x86_64 - - name: Export x11-32 - run: | - sudo ./Godot_v3.2.4-rc1_linux_headless.64 --path "." --export "x11-32" $GITHUB_WORKSPACE/builds/x11-32-standard/FoxyAdventure.x86 - name: Export osx run: | sudo ./Godot_v3.2.4-rc1_linux_headless.64 --path "." --export "osx" $GITHUB_WORKSPACE/builds/osx-standard/FoxyAdventure.zip - - name: Export win-32 - run: | - sudo ./Godot_v3.2.4-rc1_linux_headless.64 --path "." --export "win-32" $GITHUB_WORKSPACE/builds/win-32-standard/FoxyAdventure.exe - name: Export win-64 run: | sudo ./Godot_v3.2.4-rc1_linux_headless.64 --path "." --export "win-64" $GITHUB_WORKSPACE/builds/win-64-standard/FoxyAdventure.exe @@ -67,21 +61,11 @@ jobs: with: name: build-x11-64 path: builds/x11-64-standard - - name: Upload a Build Artifact x11-32 - uses: actions/upload-artifact@v2.2.2 - with: - name: build-x11-32 - path: builds/x11-32 - name: Upload a Build Artifact osx-64 uses: actions/upload-artifact@v2.2.2 with: name: build-osx-64 path: builds/osx-standard - - name: Upload a Build Artifact win-32 - uses: actions/upload-artifact@v2.2.2 - with: - name: build-win-32 - path: builds/win-32-standard - name: Upload a Build Artifact win-64 uses: actions/upload-artifact@v2.2.2 with: diff --git a/.github/workflows/godot-build-release.yml b/.github/workflows/godot-build-release.yml index b6569ea87..cb59abb54 100644 --- a/.github/workflows/godot-build-release.yml +++ b/.github/workflows/godot-build-release.yml @@ -50,19 +50,13 @@ jobs: sudo cp -r $GITHUB_WORKSPACE/templates/* templates/3.2.4.rc1 echo *** Exporting Files *** cd $GITHUB_WORKSPACE - sudo mkdir -p builds/{x11-32-standard,x11-64-standard,win-32-standard,win-64-standard,osx-standard} + sudo mkdir -p builds/{x11-64-standard,win-64-standard,osx-standard} - name: Export x11-64 run: | sudo ./Godot_v3.2.4-rc1_linux_headless.64 --path "." --export "x11-64" $GITHUB_WORKSPACE/builds/x11-64-standard/FoxyAdventure.x86_64 - - name: Export x11-32 - run: | - sudo ./Godot_v3.2.4-rc1_linux_headless.64 --path "." --export "x11-32" $GITHUB_WORKSPACE/builds/x11-32-standard/FoxyAdventure.x86 - name: Export osx run: | sudo ./Godot_v3.2.4-rc1_linux_headless.64 --path "." --export "osx" $GITHUB_WORKSPACE/builds/osx-standard/FoxyAdventure.zip - - name: Export win-32 - run: | - sudo ./Godot_v3.2.4-rc1_linux_headless.64 --path "." --export "win-32" $GITHUB_WORKSPACE/builds/win-32-standard/FoxyAdventure.exe - name: Export win-64 run: | sudo ./Godot_v3.2.4-rc1_linux_headless.64 --path "." --export "win-64" $GITHUB_WORKSPACE/builds/win-64-standard/FoxyAdventure.exe @@ -71,12 +65,8 @@ jobs: run: | cd $GITHUB_WORKSPACE/builds/win-64-standard sudo zip build-win-64.zip * - cd $GITHUB_WORKSPACE/builds/win-32-standard - sudo zip build-win-32.zip * cd $GITHUB_WORKSPACE/builds/x11-64-standard sudo zip build-x11-64.zip * - cd $GITHUB_WORKSPACE/builds/x11-32-standard - sudo zip build-x11-32.zip * cd $GITHUB_WORKSPACE/builds/osx-standard sudo zip build-osx-64.zip * - name: Create Release @@ -99,16 +89,6 @@ jobs: asset_path: builds/x11-64-standard/build-x11-64.zip asset_name: build-x11-64.zip asset_content_type: application/zip - - name: Upload Release Asset - x11-32 - id: upload-release-asset-x1132 - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: builds/x11-32-standard/build-x11-32.zip - asset_name: build-x11-32.zip - asset_content_type: application/zip - name: Upload Release Asset - osx-64 id: upload-release-asset-osx64 uses: actions/upload-release-asset@v1 @@ -119,16 +99,6 @@ jobs: asset_path: builds/osx-standard/build-osx-64.zip asset_name: build-osx-64.zip asset_content_type: application/zip - - name: Upload Release Asset - win-32 - id: upload-release-asset-win32 - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: builds/win-32-standard/build-win-32.zip - asset_name: build-win-32.zip - asset_content_type: application/zip - name: Upload Release Asset - win-64 id: upload-release-asset-win64 uses: actions/upload-release-asset@v1 diff --git a/Scripts/DiscordSDK.gd b/Scripts/DiscordSDK.gd index 1e0d57759..9ec0fd191 100644 --- a/Scripts/DiscordSDK.gd +++ b/Scripts/DiscordSDK.gd @@ -2,7 +2,6 @@ extends Node var activities: Discord.ActivityManager var users: Discord.UserManager var images: Discord.ImageManager -var os_rpc = ["Windows_32", "Windows_64", "X11_32", "OSX_32"] var core: Discord.Core var discord_user_img = null signal user_avatar_loaded @@ -195,28 +194,24 @@ func get_current_user_premium_type_callback( func run_rpc(developer, display_stage, character="Tails", is_in_menu=false): if Discord.Core != null: - if os_rpc.has(OS.get_name() + "_" + Globals.bits): - print("Starting RPC...") - var activity: = Discord.Activity.new() - if not developer and not is_in_menu: - activity.details = "Playing as %s" % [character] - if display_stage: - activity.state = "At %s" % [Globals.stage_names[str(Globals.current_stage)]] - elif developer: - activity.details = "I'm making the game for You now" - elif is_in_menu: - activity.details = "At main menu" - activity.assets.large_image = "icon" - - activity.timestamps.start = OS.get_unix_time() - - activities.update_activity(activity, self, "update_activity_callback") - if not developer: - print("RPC started as %s" % [character]) - else: - print("RPC started as mysterious developer") - else: - print("Can not start Discord Core") - + print("Starting RPC...") + var activity: = Discord.Activity.new() + if not developer and not is_in_menu: + activity.details = "Playing as %s" % [character] + if display_stage: + activity.state = "At %s" % [Globals.stage_names[str(Globals.current_stage)]] + elif developer: + activity.details = "I'm making the game for You now" + elif is_in_menu: + activity.details = "At main menu" + activity.assets.large_image = "icon" + + activity.timestamps.start = OS.get_unix_time() + + activities.update_activity(activity, self, "update_activity_callback") + if not developer: + print("RPC started as %s" % [character]) + else: + print("RPC started as mysterious developer") func kill_rpc(): activities.clear_activity() diff --git a/Scripts/Globals.gd b/Scripts/Globals.gd index d7b1cdf37..01a929494 100644 --- a/Scripts/Globals.gd +++ b/Scripts/Globals.gd @@ -1,7 +1,5 @@ extends Node #var project_root_dir = get_project_root_dir() -var bits = "32" -signal user_avatar_loaded var stage_list = { "0": "res://Scenes/Stages/poziom_1.tscn", @@ -96,10 +94,6 @@ func add_custom_world_scan_path(path:String): func _ready(): # execute_debugging_tools() - if OS.has_feature("64") or OS.has_feature("x86_64"): - bits == "64" - elif OS.has_feature("32") or OS.has_feature("x86"): - bits == "32" # print("Project root dir is at: " + project_root_dir) ##LOAD DLCS #Tails.exe @@ -126,7 +120,7 @@ func set_variable(variable, value): set(variable, value) func _notification(what: int) -> void: if what == MainLoop.NOTIFICATION_CRASH: - OS.alert("App crashed. Error log was sent to Developers!", "Error!") + OS.alert("App crashed!", "Error!") func apply_custom_resolution(): OS.set_window_size(Vector2(window_x_resolution, window_y_resolution)) diff --git a/Scripts/LevelEditorManager.gd b/Scripts/LevelEditorManager.gd deleted file mode 100644 index b6083b1da..000000000 --- a/Scripts/LevelEditorManager.gd +++ /dev/null @@ -1,78 +0,0 @@ -extends HTTPRequest - -class_name LevelEditorManager -signal editor_installed -signal file_downloaded -var dir = Directory.new() -var f = File.new() -var temp_download_path = "user://temp/" -func generate_download_link() -> String: - var tag = "" - var os_shorts = { - "Windows": "win", - "X11": "x11" - } - var os_short - if os_shorts.has(OS.get_name()): - os_short = os_shorts[OS.get_name()] - var bits = Globals.bits - download_file = temp_download_path + "editor_version.txt" - request("https://newdev-github.github.io/Foxy-Adventure-Level-Editor/editor_version.txt") - yield(self, "request_completed") - f.open(temp_download_path + "editor_version.txt", File.READ) - var release_tag = f.get_line() - var request_url = "https://github.com/NewDEV-github/Foxy-Adventure/releases/download/%s/build-%s-%s.zip" % [release_tag, os_short, bits] - print(request_url) - return request_url -func execute_editor(): - var file = File.new() - if file.file_exists(Globals.install_base_path + "editor.exe") && OS.get_name() == "Windows": - OS.execute(Globals.install_base_path + "editor.exe", [], false) - return true - elif file.file_exists(Globals.install_base_path + "editor.%s" % [Globals.bits]) && OS.get_name() == "X11": - OS.execute(Globals.install_base_path + "editor.%s" % [Globals.bits], [], false) - return true - else: - return false -func _init(): - dir.open("user://") - dir.make_dir("temp") - -func download_editor(auto_install:bool = true): - download_file = temp_download_path + generate_download_link().get_basename() + ".zip" - request(generate_download_link()) - if auto_install: - install_editor() -func install_editor(download_path:String = temp_download_path, install_path:String = Globals.install_base_path, clear_cache:bool = true): - unzip(download_path, install_path) - if clear_cache: - var dir = Directory.new() - dir.remove(download_path) -var storage_path -var zip_file -func unzip(sourceFile,destination): - zip_file = sourceFile - storage_path = destination - var gdunzip = load('res://Scripts/gdunzip.gd').new() - var loaded = gdunzip.load(zip_file) - if !loaded: - print('- Failed loading zip file') - return false - #ProjectSettings.load_resource_pack(zip_file) - var i = 0 - for f in gdunzip.files: - unzip_file(f) -func unzip_file(fileName): - var readFile = File.new() - if readFile.file_exists("res://"+fileName): - readFile.open(("res://"+fileName), File.READ) - var content = readFile.get_buffer(readFile.get_len()) - readFile.close() - var base_dir = storage_path + fileName.get_base_dir() - var dir = Directory.new() - dir.make_dir(base_dir) - var writeFile = File.new() - writeFile.open(storage_path + fileName, File.WRITE) - writeFile.store_buffer(content) - writeFile.close() - emit_signal("editor_installed", true) diff --git a/Scripts/options.gd b/Scripts/options.gd index ea52e4bcb..080a60a45 100644 --- a/Scripts/options.gd +++ b/Scripts/options.gd @@ -264,7 +264,6 @@ func _on_Licenses_pressed(): func _on_minimap_toggled(button_pressed): Globals.set_minimap_enabled(button_pressed) - func _on_show_fps_toggled(button_pressed: bool) -> void: Globals.fps_visible = button_pressed diff --git a/addons/bin/win32/avcodec-58.dll b/addons/bin/win32/avcodec-58.dll index 181863cc8..6b3a1929e 100755 Binary files a/addons/bin/win32/avcodec-58.dll and b/addons/bin/win32/avcodec-58.dll differ diff --git a/addons/bin/win32/avdevice-58.dll b/addons/bin/win32/avdevice-58.dll index 187e5b0f4..c1363c827 100755 Binary files a/addons/bin/win32/avdevice-58.dll and b/addons/bin/win32/avdevice-58.dll differ diff --git a/addons/bin/win32/avfilter-7.dll b/addons/bin/win32/avfilter-7.dll index 1105a6395..f068711f7 100755 Binary files a/addons/bin/win32/avfilter-7.dll and b/addons/bin/win32/avfilter-7.dll differ diff --git a/addons/bin/win32/avformat-58.dll b/addons/bin/win32/avformat-58.dll index 1757b4e44..576e4e2a5 100755 Binary files a/addons/bin/win32/avformat-58.dll and b/addons/bin/win32/avformat-58.dll differ diff --git a/addons/bin/win32/avutil-56.dll b/addons/bin/win32/avutil-56.dll index d5ce9c0b5..3c357e9cf 100755 Binary files a/addons/bin/win32/avutil-56.dll and b/addons/bin/win32/avutil-56.dll differ diff --git a/addons/bin/win32/libgdnative_videodecoder.dll b/addons/bin/win32/libgdnative_videodecoder.dll index 15fe19beb..750413361 100755 Binary files a/addons/bin/win32/libgdnative_videodecoder.dll and b/addons/bin/win32/libgdnative_videodecoder.dll differ diff --git a/addons/bin/win32/swresample-3.dll b/addons/bin/win32/swresample-3.dll index 0244d6ee9..c8a30adfc 100755 Binary files a/addons/bin/win32/swresample-3.dll and b/addons/bin/win32/swresample-3.dll differ diff --git a/addons/bin/win32/swscale-5.dll b/addons/bin/win32/swscale-5.dll index f63af4a78..1709f2b38 100755 Binary files a/addons/bin/win32/swscale-5.dll and b/addons/bin/win32/swscale-5.dll differ diff --git a/addons/bin/win64/avcodec-58.dll b/addons/bin/win64/avcodec-58.dll index 2c82d8784..1d45cb416 100755 Binary files a/addons/bin/win64/avcodec-58.dll and b/addons/bin/win64/avcodec-58.dll differ diff --git a/addons/bin/win64/avdevice-58.dll b/addons/bin/win64/avdevice-58.dll index fdc7887c5..d944b8c33 100755 Binary files a/addons/bin/win64/avdevice-58.dll and b/addons/bin/win64/avdevice-58.dll differ diff --git a/addons/bin/win64/avfilter-7.dll b/addons/bin/win64/avfilter-7.dll index 183b7d598..0125d149c 100755 Binary files a/addons/bin/win64/avfilter-7.dll and b/addons/bin/win64/avfilter-7.dll differ diff --git a/addons/bin/win64/avformat-58.dll b/addons/bin/win64/avformat-58.dll index dab4dc953..04d055094 100755 Binary files a/addons/bin/win64/avformat-58.dll and b/addons/bin/win64/avformat-58.dll differ diff --git a/addons/bin/win64/avutil-56.dll b/addons/bin/win64/avutil-56.dll index 8fb9d655a..7d72981b8 100755 Binary files a/addons/bin/win64/avutil-56.dll and b/addons/bin/win64/avutil-56.dll differ diff --git a/addons/bin/win64/libgdnative_videodecoder.dll b/addons/bin/win64/libgdnative_videodecoder.dll index 6154d6bac..25e39e1c5 100755 Binary files a/addons/bin/win64/libgdnative_videodecoder.dll and b/addons/bin/win64/libgdnative_videodecoder.dll differ diff --git a/addons/bin/win64/postproc-55.dll b/addons/bin/win64/postproc-55.dll new file mode 100644 index 000000000..9f73dd183 Binary files /dev/null and b/addons/bin/win64/postproc-55.dll differ diff --git a/addons/bin/win64/swresample-3.dll b/addons/bin/win64/swresample-3.dll index 25f613397..c5d3c8e7d 100755 Binary files a/addons/bin/win64/swresample-3.dll and b/addons/bin/win64/swresample-3.dll differ diff --git a/addons/bin/win64/swscale-5.dll b/addons/bin/win64/swscale-5.dll index 40be84c46..4e00093f7 100755 Binary files a/addons/bin/win64/swscale-5.dll and b/addons/bin/win64/swscale-5.dll differ diff --git a/addons/bin/x11/libavcodec.so.58 b/addons/bin/x11/libavcodec.so.58 index ceba3a642..0105b09fa 100755 Binary files a/addons/bin/x11/libavcodec.so.58 and b/addons/bin/x11/libavcodec.so.58 differ diff --git a/addons/bin/x11/libavdevice.so.58 b/addons/bin/x11/libavdevice.so.58 index 1fc6364e4..03299ac9a 100755 Binary files a/addons/bin/x11/libavdevice.so.58 and b/addons/bin/x11/libavdevice.so.58 differ diff --git a/addons/bin/x11/libavfilter.so.7 b/addons/bin/x11/libavfilter.so.7 index 1511945ee..d1451d7ae 100755 Binary files a/addons/bin/x11/libavfilter.so.7 and b/addons/bin/x11/libavfilter.so.7 differ diff --git a/addons/bin/x11/libavformat.so.58 b/addons/bin/x11/libavformat.so.58 index 56b9f7753..9a9d9f27d 100755 Binary files a/addons/bin/x11/libavformat.so.58 and b/addons/bin/x11/libavformat.so.58 differ diff --git a/addons/bin/x11/libavutil.so.56 b/addons/bin/x11/libavutil.so.56 index a7da4e6ee..07950caa3 100755 Binary files a/addons/bin/x11/libavutil.so.56 and b/addons/bin/x11/libavutil.so.56 differ diff --git a/addons/bin/x11/libpostproc.so.55 b/addons/bin/x11/libpostproc.so.55 new file mode 100644 index 000000000..97af1b267 Binary files /dev/null and b/addons/bin/x11/libpostproc.so.55 differ diff --git a/addons/bin/x11/libswresample.so.3 b/addons/bin/x11/libswresample.so.3 index 786c6c11d..eaf366f19 100755 Binary files a/addons/bin/x11/libswresample.so.3 and b/addons/bin/x11/libswresample.so.3 differ diff --git a/addons/bin/x11/libswscale.so.5 b/addons/bin/x11/libswscale.so.5 index 18626ebf2..cf08a6910 100755 Binary files a/addons/bin/x11/libswscale.so.5 and b/addons/bin/x11/libswscale.so.5 differ diff --git a/addons/bin/x11_32/libavcodec.so.58 b/addons/bin/x11_32/libavcodec.so.58 index 6bc09cbf2..1ac08e651 100755 Binary files a/addons/bin/x11_32/libavcodec.so.58 and b/addons/bin/x11_32/libavcodec.so.58 differ diff --git a/addons/bin/x11_32/libavdevice.so.58 b/addons/bin/x11_32/libavdevice.so.58 index b97191004..ff2dd24ff 100755 Binary files a/addons/bin/x11_32/libavdevice.so.58 and b/addons/bin/x11_32/libavdevice.so.58 differ diff --git a/addons/bin/x11_32/libavfilter.so.7 b/addons/bin/x11_32/libavfilter.so.7 index 21716cd60..bc3601860 100755 Binary files a/addons/bin/x11_32/libavfilter.so.7 and b/addons/bin/x11_32/libavfilter.so.7 differ diff --git a/addons/bin/x11_32/libavformat.so.58 b/addons/bin/x11_32/libavformat.so.58 index f7f69910f..e89981bd8 100755 Binary files a/addons/bin/x11_32/libavformat.so.58 and b/addons/bin/x11_32/libavformat.so.58 differ diff --git a/addons/bin/x11_32/libavutil.so.56 b/addons/bin/x11_32/libavutil.so.56 index 30e48ff2d..52fa3f464 100755 Binary files a/addons/bin/x11_32/libavutil.so.56 and b/addons/bin/x11_32/libavutil.so.56 differ diff --git a/addons/bin/x11_32/libswresample.so.3 b/addons/bin/x11_32/libswresample.so.3 index 898e1a1c2..896361a8e 100755 Binary files a/addons/bin/x11_32/libswresample.so.3 and b/addons/bin/x11_32/libswresample.so.3 differ diff --git a/addons/bin/x11_32/libswscale.so.5 b/addons/bin/x11_32/libswscale.so.5 index 98933b5ba..9d52d6d73 100755 Binary files a/addons/bin/x11_32/libswscale.so.5 and b/addons/bin/x11_32/libswscale.so.5 differ diff --git a/addons/videodecoder.gdnlib b/addons/videodecoder.gdnlib index 9c0a1cfd0..16bde8c1e 100644 --- a/addons/videodecoder.gdnlib +++ b/addons/videodecoder.gdnlib @@ -9,14 +9,10 @@ reloadable=false OSX.64="res://addons/bin/osx/libgdnative_videodecoder.dylib" Windows.64="res://addons/bin/win64/libgdnative_videodecoder.dll" -Windows.32="res://addons/bin/win32/libgdnative_videodecoder.dll" X11.64="res://addons/bin/x11/libgdnative_videodecoder.so" -X11.32="res://addons/bin/x11_32/libgdnative_videodecoder.so" [dependencies] OSX.64=[ "res://addons/bin/osx/libavformat.58.dylib", "res://addons/bin/osx/libavutil.56.dylib", "res://addons/bin/osx/libavcodec.58.dylib", "res://addons/bin/osx/libswscale.5.dylib", "res://addons/bin/osx/libswresample.3.dylib" ] -Windows.64=[ "res://addons/bin/win64/avformat-58.dll", "res://addons/bin/win64/avutil-56.dll", "res://addons/bin/win64/avcodec-58.dll", "res://addons/bin/win64/swscale-5.dll", "res://addons/bin/win64/swresample-3.dll", "res://addons/bin/win64/libwinpthread-1.dll" ] -Windows.32=[ "res://addons/bin/win32/avformat-58.dll", "res://addons/bin/win32/avutil-56.dll", "res://addons/bin/win32/avcodec-58.dll", "res://addons/bin/win32/swscale-5.dll", "res://addons/bin/win32/swresample-3.dll", "res://addons/bin/win32/libwinpthread-1.dll" ] -X11.64=[ "res://addons/bin/x11/libavformat.so.58", "res://addons/bin/x11/libavutil.so.56", "res://addons/bin/x11/libavcodec.so.58", "res://addons/bin/x11/libswscale.so.5", "res://addons/bin/x11/libswresample.so.3" ] -X11.32=[ "res://addons/bin/x11_32/libavformat.so.58", "res://addons/bin/x11_32/libavutil.so.56", "res://addons/bin/x11_32/libavcodec.so.58", "res://addons/bin/x11_32/libswscale.so.5", "res://addons/bin/x11_32/libswresample.so.3" ] +Windows.64=[ "res://addons/bin/win64/avcodec-58.dll", "res://addons/bin/win64/avdevice-58.dll", "res://addons/bin/win64/avfilter-7.dll", "res://addons/bin/win64/avformat-58.dll", "res://addons/bin/win64/avutil-56.dll", "res://addons/bin/win64/libwinpthread-1.dll", "res://addons/bin/win64/postproc-55.dll", "res://addons/bin/win64/swresample-3.dll", "res://addons/bin/win64/swscale-5.dll" ] +X11.64=[ "res://addons/bin/x11/libavcodec.so.58", "res://addons/bin/x11/libavdevice.so.58", "res://addons/bin/x11/libavfilter.so.7", "res://addons/bin/x11/libavformat.so.58", "res://addons/bin/x11/libavutil.so.56", "res://addons/bin/x11/libpostproc.so.55", "res://addons/bin/x11/libswresample.so.3", "res://addons/bin/x11/libswscale.so.5" ] diff --git a/bin/discord_server/win32/libdiscord_server.dll b/bin/discord_server/win32/libdiscord_server.dll deleted file mode 100644 index 991d58c20..000000000 Binary files a/bin/discord_server/win32/libdiscord_server.dll and /dev/null differ diff --git a/bin/discord_server/x11_32/libdiscord_server.so b/bin/discord_server/x11_32/libdiscord_server.so deleted file mode 100644 index 68c570e7c..000000000 Binary files a/bin/discord_server/x11_32/libdiscord_server.so and /dev/null differ diff --git a/bin/gdsdk/linux-32/libdiscord_game_sdk.so b/bin/gdsdk/linux-32/libdiscord_game_sdk.so deleted file mode 100644 index e46576062..000000000 Binary files a/bin/gdsdk/linux-32/libdiscord_game_sdk.so and /dev/null differ diff --git a/bin/gdsdk/linux-32/libgdsdk.so b/bin/gdsdk/linux-32/libgdsdk.so deleted file mode 100644 index f3d80b50e..000000000 Binary files a/bin/gdsdk/linux-32/libgdsdk.so and /dev/null differ diff --git a/bin/gdsdk/osx-32/libdiscord_game_sdk.dylib b/bin/gdsdk/osx-32/libdiscord_game_sdk.dylib deleted file mode 100644 index 24045f792..000000000 Binary files a/bin/gdsdk/osx-32/libdiscord_game_sdk.dylib and /dev/null differ diff --git a/bin/gdsdk/osx-32/libgdsdk.dylib b/bin/gdsdk/osx-32/libgdsdk.dylib deleted file mode 100644 index f64dfd909..000000000 Binary files a/bin/gdsdk/osx-32/libgdsdk.dylib and /dev/null differ diff --git a/bin/gdsdk/windows-32/discord_game_sdk.dll b/bin/gdsdk/windows-32/discord_game_sdk.dll deleted file mode 100644 index 8f1ee0a65..000000000 Binary files a/bin/gdsdk/windows-32/discord_game_sdk.dll and /dev/null differ diff --git a/bin/gdsdk/windows-32/gdsdk.dll b/bin/gdsdk/windows-32/gdsdk.dll deleted file mode 100644 index 087e39d1c..000000000 Binary files a/bin/gdsdk/windows-32/gdsdk.dll and /dev/null differ diff --git a/bin/gdsdk/windows-32/gdsdk.exp b/bin/gdsdk/windows-32/gdsdk.exp deleted file mode 100644 index b7963db51..000000000 Binary files a/bin/gdsdk/windows-32/gdsdk.exp and /dev/null differ diff --git a/bin/gdsdk/windows-32/gdsdk.lib b/bin/gdsdk/windows-32/gdsdk.lib deleted file mode 100644 index 7aa11e882..000000000 Binary files a/bin/gdsdk/windows-32/gdsdk.lib and /dev/null differ diff --git a/bin/webhook_err/win32/libwebhook_err.dll b/bin/webhook_err/win32/libwebhook_err.dll deleted file mode 100644 index b3a8c2966..000000000 Binary files a/bin/webhook_err/win32/libwebhook_err.dll and /dev/null differ diff --git a/bin/webhook_err/x11_32/libwebhook_err.so b/bin/webhook_err/x11_32/libwebhook_err.so deleted file mode 100644 index 43e3b204b..000000000 Binary files a/bin/webhook_err/x11_32/libwebhook_err.so and /dev/null differ diff --git a/bin/webhook_feedback/win32/libwebhook_feedback.dll b/bin/webhook_feedback/win32/libwebhook_feedback.dll deleted file mode 100644 index 930e9df36..000000000 Binary files a/bin/webhook_feedback/win32/libwebhook_feedback.dll and /dev/null differ diff --git a/bin/webhook_feedback/x11_32/libwebhook_feedback.so b/bin/webhook_feedback/x11_32/libwebhook_feedback.so deleted file mode 100644 index d2b844eaf..000000000 Binary files a/bin/webhook_feedback/x11_32/libwebhook_feedback.so and /dev/null differ diff --git a/bin/website_dl/win32/libwebsite_dl.dll b/bin/website_dl/win32/libwebsite_dl.dll deleted file mode 100644 index 654149644..000000000 Binary files a/bin/website_dl/win32/libwebsite_dl.dll and /dev/null differ diff --git a/bin/website_dl/x11_32/libwebsite_dl.so b/bin/website_dl/x11_32/libwebsite_dl.so deleted file mode 100644 index 8f32aa217..000000000 Binary files a/bin/website_dl/x11_32/libwebsite_dl.so and /dev/null differ diff --git a/bin/website_faq/win32/libwebsite_faq.dll b/bin/website_faq/win32/libwebsite_faq.dll deleted file mode 100644 index ffc283388..000000000 Binary files a/bin/website_faq/win32/libwebsite_faq.dll and /dev/null differ diff --git a/bin/website_faq/x11_32/libwebsite_faq.so b/bin/website_faq/x11_32/libwebsite_faq.so deleted file mode 100644 index 61751fdd6..000000000 Binary files a/bin/website_faq/x11_32/libwebsite_faq.so and /dev/null differ diff --git a/bin/website_gallery/win32/libwebsite_gallery.dll b/bin/website_gallery/win32/libwebsite_gallery.dll deleted file mode 100644 index 14e3dca5b..000000000 Binary files a/bin/website_gallery/win32/libwebsite_gallery.dll and /dev/null differ diff --git a/bin/website_gallery/x11_32/libwebsite_gallery.so b/bin/website_gallery/x11_32/libwebsite_gallery.so deleted file mode 100644 index 98c3f88f9..000000000 Binary files a/bin/website_gallery/x11_32/libwebsite_gallery.so and /dev/null differ diff --git a/bin/website_main/win32/libwebsite_main.dll b/bin/website_main/win32/libwebsite_main.dll deleted file mode 100644 index fa2c7e262..000000000 Binary files a/bin/website_main/win32/libwebsite_main.dll and /dev/null differ diff --git a/bin/website_main/x11_32/libwebsite_main.so b/bin/website_main/x11_32/libwebsite_main.so deleted file mode 100644 index 5c33a0193..000000000 Binary files a/bin/website_main/x11_32/libwebsite_main.so and /dev/null differ diff --git a/bin/website_privacy_policy/win32/libwebsite_privacy_policy.dll b/bin/website_privacy_policy/win32/libwebsite_privacy_policy.dll deleted file mode 100644 index d46fdbf27..000000000 Binary files a/bin/website_privacy_policy/win32/libwebsite_privacy_policy.dll and /dev/null differ diff --git a/bin/website_privacy_policy/x11_32/libwebsite_privacy_policy.so b/bin/website_privacy_policy/x11_32/libwebsite_privacy_policy.so deleted file mode 100644 index 328cef23d..000000000 Binary files a/bin/website_privacy_policy/x11_32/libwebsite_privacy_policy.so and /dev/null differ diff --git a/bin/website_project/win32/libwebsite_project.dll b/bin/website_project/win32/libwebsite_project.dll deleted file mode 100644 index dc6040c85..000000000 Binary files a/bin/website_project/win32/libwebsite_project.dll and /dev/null differ diff --git a/bin/website_project/x11_32/libwebsite_project.so b/bin/website_project/x11_32/libwebsite_project.so deleted file mode 100644 index 6c1a9cf99..000000000 Binary files a/bin/website_project/x11_32/libwebsite_project.so and /dev/null differ diff --git a/export_presets.cfg b/export_presets.cfg index 1ccfa00de..347d54ac5 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -8,66 +8,22 @@ export_filter="all_resources" include_filter="" exclude_filter="" export_path="../exports/foxyadventrue-v0.0.1.2/x11/Foxy Adventure.x86_64" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.0.options] -texture_format/bptc=false -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false -texture_format/no_bptc_fallbacks=true +custom_template/debug="" +custom_template/release="" binary_format/64_bits=true binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" - -[preset.1] - -name="win-32" -platform="Windows Desktop" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="../exports/foxyadventrue-v0.0.1.2/windows/FoxyAdventure.exe" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.1.options] - 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=false -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" -codesign/enable=false -codesign/identity_type=1 -codesign/identity="C:/Users/karol/OneDrive/Dokumenty/GitHub/Foxy-Adventure/foxyadventure.p12" -codesign/password="foxyadventure" -codesign/timestamp=false -codesign/timestamp_server_url="" -codesign/digest_algorithm=1 -codesign/description="" -codesign/custom_options=PoolStringArray( ) -application/icon="res://assets/Graphics/icon.ico" -application/file_version="" -application/product_version="" -application/company_name="New DEV" -application/product_name="Foxy Adventure" -application/file_description="" -application/copyright="" -application/trademarks="" -[preset.2] +[preset.1] name="Android" platform="Android" @@ -77,50 +33,49 @@ export_filter="all_resources" include_filter="" exclude_filter="" export_path="../foxy-adv.apk" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" -[preset.2.options] +[preset.1.options] -graphics/32_bits_framebuffer=true -xr_features/xr_mode=0 -xr_features/degrees_of_freedom=0 -xr_features/hand_tracking=0 -xr_features/focus_awareness=false -one_click_deploy/clear_previous_install=false custom_template/debug="" custom_template/release="" custom_template/use_custom_build=false -command_line/extra_args="" +custom_template/export_format=0 +architectures/armeabi-v7a=true +architectures/arm64-v8a=true +architectures/x86=false +architectures/x86_64=false +keystore/debug="C:/Users/karol/OneDrive/Dokumenty/GitHub/Foxy-Adventure/debugpkcs12.keystore" +keystore/debug_user="androiddebugkey" +keystore/debug_password="android" +keystore/release="C:/Users/karol/OneDrive/Dokumenty/GitHub/Foxy-Adventure/foxyadventure.keystore" +keystore/release_user="foxyadventure" +keystore/release_password="foxyadventure" +one_click_deploy/clear_previous_install=false version/code=10 version/name="1.4" package/unique_name="org.godotengine.$genname" package/name="" package/signed=true +launcher_icons/main_192x192="res://icon.png" +launcher_icons/adaptive_foreground_432x432="res://icon.png" +launcher_icons/adaptive_background_432x432="res://icon.png" +graphics/32_bits_framebuffer=true +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/degrees_of_freedom=0 +xr_features/hand_tracking=0 +xr_features/focus_awareness=false screen/immersive_mode=true -screen/orientation=0 screen/support_small=true screen/support_normal=true screen/support_large=true screen/support_xlarge=true -screen/opengl_debug=false -launcher_icons/main_192x192="res://icon.png" -launcher_icons/adaptive_foreground_432x432="res://icon.png" -launcher_icons/adaptive_background_432x432="res://icon.png" -keystore/debug="C:/Users/karol/OneDrive/Dokumenty/GitHub/Foxy-Adventure/debugpkcs12.keystore" -keystore/debug_user="androiddebugkey" -keystore/debug_password="android" -keystore/release="C:/Users/karol/OneDrive/Dokumenty/GitHub/Foxy-Adventure/foxyadventure.keystore" -keystore/release_user="foxyadventure" -keystore/release_password="foxyadventure" +command_line/extra_args="" apk_expansion/enable=false apk_expansion/SALT="" apk_expansion/public_key="" -architectures/armeabi-v7a=true -architectures/arm64-v8a=true -architectures/x86=false -architectures/x86_64=false permissions/custom_permissions=PoolStringArray( ) permissions/access_checkin_properties=false permissions/access_coarse_location=false @@ -268,7 +223,7 @@ permissions/write_social_stream=false permissions/write_sync_settings=false permissions/write_user_dictionary=true -[preset.3] +[preset.2] name="osx" platform="Mac OSX" @@ -278,11 +233,10 @@ export_filter="all_resources" include_filter="" exclude_filter="" export_path="../exports/0.0.1.1-alpha/Sonadow RPG.zip" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" -[preset.3.options] +[preset.2.options] custom_template/debug="" custom_template/release="" @@ -301,7 +255,7 @@ texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false -[preset.4] +[preset.3] name="win-64" platform="Windows Desktop" @@ -311,21 +265,20 @@ export_filter="all_resources" include_filter="" exclude_filter="" export_path="../../export test/Foxy Adventure.exe" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" -[preset.4.options] +[preset.3.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +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="" codesign/enable=true codesign/identity_type=1 codesign/identity="C:/Users/karol/OneDrive/Dokumenty/GitHub/Foxy-Adventure/foxyadventure.p12" @@ -343,29 +296,3 @@ application/product_name="Foxy Adventure" application/file_description="Foxy Adventure" application/copyright="New DEV" application/trademarks="New DEV, SEGA, Firelight Technologies" - -[preset.5] - -name="x11-32" -platform="Linux/X11" -runnable=false -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="../install_test/foxy-adv.x86" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.5.options] - -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=false -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" diff --git a/project.godot b/project.godot index 6330ac20a..c3768d1d7 100644 --- a/project.godot +++ b/project.godot @@ -38,11 +38,6 @@ _global_script_classes=[ { "class": "GitAPI", "language": "NativeScript", "path": "res://bin/gitapi/git_api.gdns" -}, { -"base": "HTTPRequest", -"class": "LevelEditorManager", -"language": "GDScript", -"path": "res://Scripts/LevelEditorManager.gd" } ] _global_script_class_icons={ "AudioPlayer": "", @@ -50,8 +45,7 @@ _global_script_class_icons={ "CutsceneVideoPlayer": "", "Discord": "", "Enemy": "", -"GitAPI": "", -"LevelEditorManager": "" +"GitAPI": "" } [application] @@ -76,10 +70,6 @@ ErrorCodeServer="*res://Scripts/ErrorCodeServer.gd" BackgroundLoad="*res://Scenes/background_load.tscn" DiscordSDK="*res://Scripts/DiscordSDK.gd" -[config] - -project_creator="" - [debug] settings/crash_handler/message="Please include this when reporting the bug on https://github.com/NewDEv-github/Foxy-Adventure/issues"