Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions .github/workflows/godot-build-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
32 changes: 1 addition & 31 deletions .github/workflows/godot-build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
43 changes: 19 additions & 24 deletions Scripts/DiscordSDK.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
8 changes: 1 addition & 7 deletions Scripts/Globals.gd
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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
Expand All @@ -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))

Expand Down
78 changes: 0 additions & 78 deletions Scripts/LevelEditorManager.gd

This file was deleted.

1 change: 0 additions & 1 deletion Scripts/options.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file modified addons/bin/win32/avcodec-58.dll
Binary file not shown.
Binary file modified addons/bin/win32/avdevice-58.dll
Binary file not shown.
Binary file modified addons/bin/win32/avfilter-7.dll
Binary file not shown.
Binary file modified addons/bin/win32/avformat-58.dll
Binary file not shown.
Binary file modified addons/bin/win32/avutil-56.dll
Binary file not shown.
Binary file modified addons/bin/win32/libgdnative_videodecoder.dll
Binary file not shown.
Binary file modified addons/bin/win32/swresample-3.dll
Binary file not shown.
Binary file modified addons/bin/win32/swscale-5.dll
Binary file not shown.
Binary file modified addons/bin/win64/avcodec-58.dll
Binary file not shown.
Binary file modified addons/bin/win64/avdevice-58.dll
Binary file not shown.
Binary file modified addons/bin/win64/avfilter-7.dll
Binary file not shown.
Binary file modified addons/bin/win64/avformat-58.dll
Binary file not shown.
Binary file modified addons/bin/win64/avutil-56.dll
Binary file not shown.
Binary file modified addons/bin/win64/libgdnative_videodecoder.dll
Binary file not shown.
Binary file added addons/bin/win64/postproc-55.dll
Binary file not shown.
Binary file modified addons/bin/win64/swresample-3.dll
Binary file not shown.
Binary file modified addons/bin/win64/swscale-5.dll
Binary file not shown.
Binary file modified addons/bin/x11/libavcodec.so.58
Binary file not shown.
Binary file modified addons/bin/x11/libavdevice.so.58
Binary file not shown.
Binary file modified addons/bin/x11/libavfilter.so.7
Binary file not shown.
Binary file modified addons/bin/x11/libavformat.so.58
Binary file not shown.
Binary file modified addons/bin/x11/libavutil.so.56
Binary file not shown.
Binary file added addons/bin/x11/libpostproc.so.55
Binary file not shown.
Binary file modified addons/bin/x11/libswresample.so.3
Binary file not shown.
Binary file modified addons/bin/x11/libswscale.so.5
Binary file not shown.
Binary file modified addons/bin/x11_32/libavcodec.so.58
Binary file not shown.
Binary file modified addons/bin/x11_32/libavdevice.so.58
Binary file not shown.
Binary file modified addons/bin/x11_32/libavfilter.so.7
Binary file not shown.
Binary file modified addons/bin/x11_32/libavformat.so.58
Binary file not shown.
Binary file modified addons/bin/x11_32/libavutil.so.56
Binary file not shown.
Binary file modified addons/bin/x11_32/libswresample.so.3
Binary file not shown.
Binary file modified addons/bin/x11_32/libswscale.so.5
Binary file not shown.
8 changes: 2 additions & 6 deletions addons/videodecoder.gdnlib
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Binary file removed bin/discord_server/win32/libdiscord_server.dll
Binary file not shown.
Binary file removed bin/discord_server/x11_32/libdiscord_server.so
Binary file not shown.
Binary file removed bin/gdsdk/linux-32/libdiscord_game_sdk.so
Binary file not shown.
Binary file removed bin/gdsdk/linux-32/libgdsdk.so
Binary file not shown.
Binary file removed bin/gdsdk/osx-32/libdiscord_game_sdk.dylib
Binary file not shown.
Binary file removed bin/gdsdk/osx-32/libgdsdk.dylib
Binary file not shown.
Binary file removed bin/gdsdk/windows-32/discord_game_sdk.dll
Binary file not shown.
Binary file removed bin/gdsdk/windows-32/gdsdk.dll
Binary file not shown.
Binary file removed bin/gdsdk/windows-32/gdsdk.exp
Binary file not shown.
Binary file removed bin/gdsdk/windows-32/gdsdk.lib
Binary file not shown.
Binary file removed bin/webhook_err/win32/libwebhook_err.dll
Binary file not shown.
Binary file removed bin/webhook_err/x11_32/libwebhook_err.so
Binary file not shown.
Binary file removed bin/webhook_feedback/win32/libwebhook_feedback.dll
Binary file not shown.
Binary file removed bin/webhook_feedback/x11_32/libwebhook_feedback.so
Binary file not shown.
Binary file removed bin/website_dl/win32/libwebsite_dl.dll
Binary file not shown.
Binary file removed bin/website_dl/x11_32/libwebsite_dl.so
Binary file not shown.
Binary file removed bin/website_faq/win32/libwebsite_faq.dll
Binary file not shown.
Binary file removed bin/website_faq/x11_32/libwebsite_faq.so
Binary file not shown.
Binary file removed bin/website_gallery/win32/libwebsite_gallery.dll
Binary file not shown.
Binary file removed bin/website_gallery/x11_32/libwebsite_gallery.so
Binary file not shown.
Binary file removed bin/website_main/win32/libwebsite_main.dll
Binary file not shown.
Binary file removed bin/website_main/x11_32/libwebsite_main.so
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/website_project/win32/libwebsite_project.dll
Binary file not shown.
Binary file removed bin/website_project/x11_32/libwebsite_project.so
Binary file not shown.
Loading