From 459db2dbdcda10bb1250a3939d20bf18ec527abb Mon Sep 17 00:00:00 2001 From: JezSonic Date: Mon, 8 Mar 2021 08:48:13 +0100 Subject: [PATCH 1/8] fix From 4568ce6d127be9dac522d2ab7d8c9e7eed80d9e5 Mon Sep 17 00:00:00 2001 From: JezSonic Date: Wed, 10 Mar 2021 08:49:30 +0100 Subject: [PATCH 2/8] Update godot-build-artifact.yml --- .github/workflows/godot-build-artifact.yml | 37 +++------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/.github/workflows/godot-build-artifact.yml b/.github/workflows/godot-build-artifact.yml index 4ef8d4b81..4240c3364 100644 --- a/.github/workflows/godot-build-artifact.yml +++ b/.github/workflows/godot-build-artifact.yml @@ -6,9 +6,9 @@ name: Godot Build PC Artifact on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master, develop ] + branches: [ master, develop, new-github-actions ] pull_request: - branches: [ master, develop ] + branches: [ master, develop, new-github-actions ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -25,37 +25,10 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 # Runs a set of commands using the runners shell - - name: Download Godot and export templates + - name: Build everything run: | - sudo apt install unzip - sudo apt install tree - echo *** Downloading Godot Binary *** - wget https://downloads.tuxfamily.org/godotengine/3.2.4/rc3/Godot_v3.2.4-rc3_linux_headless.64.zip - echo *** Downloading Godot Server Export Templates *** - wget https://downloads.tuxfamily.org/godotengine/3.2.4/rc3/Godot_v3.2.4-rc3_export_templates.tpz - echo *** Unzipping Godot Binary *** - unzip Godot_v3.2.4-rc3_linux_headless.64.zip - echo *** Unzipping Godot Server Export Templates *** - unzip Godot_v3.2.4-rc3_export_templates.tpz - echo *** Installing Godot Server Export Templates *** - cd /home/runner/ - sudo mkdir -p .local/share/godot - cd .local/share/godot - sudo mkdir -p templates/3.2.4.rc3 - sudo cp -r $GITHUB_WORKSPACE/templates/* templates/3.2.4.rc3 - echo *** Exporting Files *** - cd $GITHUB_WORKSPACE - sudo mkdir -p builds/{x11-64-standard,win-64-standard,osx-standard} - - name: Export x11-64 - run: | - sudo ./Godot_v3.2.4-rc3_linux_headless.64 --path "." --export "x11-64" $GITHUB_WORKSPACE/builds/x11-64-standard/FoxyAdventure.x86_64 - - name: Export osx - run: | - sudo ./Godot_v3.2.4-rc3_linux_headless.64 --path "." --export "osx" $GITHUB_WORKSPACE/builds/osx-standard/FoxyAdventure.zip - - name: Export win-64 - run: | - sudo ./Godot_v3.2.4-rc3_linux_headless.64 --path "." --export "win-64" $GITHUB_WORKSPACE/builds/win-64-standard/FoxyAdventure.exe - tree -a + sudo chmod +x ./build_game.sh + ./build_game.sh - name: Upload a Build Artifact x11-64 uses: actions/upload-artifact@v2.2.2 with: From b1905feb2d26d42d275b5057c2a0558cd356c802 Mon Sep 17 00:00:00 2001 From: JezSonic Date: Wed, 10 Mar 2021 09:02:23 +0100 Subject: [PATCH 3/8] Create build_game.sh --- build_game.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 build_game.sh diff --git a/build_game.sh b/build_game.sh new file mode 100644 index 000000000..7567eecdd --- /dev/null +++ b/build_game.sh @@ -0,0 +1,26 @@ +#!/bin/bash +sudo apt-get install unzip +GODOT_VERSION="3.2.4.rc3" +GODOT_BINARY_DOWNLOAD_LINK="https://downloads.tuxfamily.org/godotengine/3.2.4/rc3/Godot_v3.2.4-rc3_linux_headless.64.zip" +GODOT_EXPORT_TEMPLATES_DOWNLOAD_LINK="https://downloads.tuxfamily.org/godotengine/3.2.4/rc3/Godot_v3.2.4-rc3_export_templates.tpz" + +GODOT_BINARY_FILENAME="$(basename -s .zip $GODOT_BINARY_DOWNLOAD_LINK)" +GODOT_ZIP_FILENAME="$(basename $GODOT_BINARY_DOWNLOAD_LINK)" +GODOT_TPZ_FILENAME="$(basename $GODOT_EXPORT_TEMPLATES_DOWNLOAD_LINK)" +wget $GODOT_BINARY_DOWNLOAD_LINK +wget $GODOT_EXPORT_TEMPLATES_DOWNLOAD_LINK + +unzip $GODOT_ZIP_FILENAME +unzip $GODOT_TPZ_FILENAME + +cd /home/runner/ +sudo mkdir -p .local/share/godot +sudo mkdir -p templates/$GODOT_VERSION +sudo cp -r $GITHUB_WORKSPACE/templates/* templates/$GODOT_VERSION + +cd $GITHUB_WORKSPACE +sudo mkdir -p builds/{x11-64-standard,win-64-standard,osx-standard} + +sudo ./$GODOT_BINARY_FILENAME --path "." --export "x11-64" $GITHUB_WORKSPACE/builds/x11-64-standard/FoxyAdventure.x86_64 +sudo ./$GODOT_BINARY_FILENAME --path "." --export "osx" $GITHUB_WORKSPACE/builds/osx-standard/FoxyAdventure.zip +sudo ./$GODOT_BINARY_FILENAME --path "." --export "win-64" $GITHUB_WORKSPACE/builds/win-64-standard/FoxyAdventure.exe From 72a03df338804097ecfe6711b29e104724056e3a Mon Sep 17 00:00:00 2001 From: JezSonic Date: Wed, 10 Mar 2021 09:08:39 +0100 Subject: [PATCH 4/8] fix --- build_game.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build_game.sh b/build_game.sh index 7567eecdd..a36775005 100644 --- a/build_game.sh +++ b/build_game.sh @@ -15,6 +15,7 @@ unzip $GODOT_TPZ_FILENAME cd /home/runner/ sudo mkdir -p .local/share/godot +cd .local/share/godot sudo mkdir -p templates/$GODOT_VERSION sudo cp -r $GITHUB_WORKSPACE/templates/* templates/$GODOT_VERSION From a5f4258810f4fcb7273335578399fbe5ca901992 Mon Sep 17 00:00:00 2001 From: JezSonic Date: Wed, 10 Mar 2021 09:12:01 +0100 Subject: [PATCH 5/8] Update godot-build-release.yml --- .github/workflows/godot-build-release.yml | 33 +++-------------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/.github/workflows/godot-build-release.yml b/.github/workflows/godot-build-release.yml index 718fba89b..1afdf7540 100644 --- a/.github/workflows/godot-build-release.yml +++ b/.github/workflows/godot-build-release.yml @@ -29,37 +29,10 @@ jobs: run: | echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" - - name: Download Godot and export templates + - name: Build everything run: | - sudo apt install unzip - sudo apt install tree - echo *** Downloading Godot Binary *** - wget https://downloads.tuxfamily.org/godotengine/3.2.4/rc3/Godot_v3.2.4-rc3_linux_headless.64.zip - echo *** Downloading Godot Server Export Templates *** - wget https://downloads.tuxfamily.org/godotengine/3.2.4/rc3/Godot_v3.2.4-rc3_export_templates.tpz - echo *** Unzipping Godot Binary *** - unzip Godot_v3.2.4-rc3_linux_headless.64.zip - echo *** Unzipping Godot Server Export Templates *** - unzip Godot_v3.2.4-rc3_export_templates.tpz - echo *** Installing Godot Server Export Templates *** - cd /home/runner/ - mkdir -p .local/share/godot - cd .local/share/godot - sudo mkdir -p templates/3.2.4.rc3 - sudo cp -r $GITHUB_WORKSPACE/templates/* templates/3.2.4.rc3 - echo *** Exporting Files *** - cd $GITHUB_WORKSPACE - sudo mkdir -p builds/{x11-64-standard,win-64-standard,osx-standard} - - name: Export x11-64 - run: | - sudo ./Godot_v3.2.4-rc3_linux_headless.64 --path "." --export "x11-64" $GITHUB_WORKSPACE/builds/x11-64-standard/FoxyAdventure.x86_64 - - name: Export osx - run: | - sudo ./Godot_v3.2.4-rc3_linux_headless.64 --path "." --export "osx" $GITHUB_WORKSPACE/builds/osx-standard/FoxyAdventure.zip - - name: Export win-64 - run: | - sudo ./Godot_v3.2.4-rc3_linux_headless.64 --path "." --export "win-64" $GITHUB_WORKSPACE/builds/win-64-standard/FoxyAdventure.exe - tree -a + sudo chmod +x ./build_game.sh + ./build_game.sh - name: ZIP Builds run: | cd $GITHUB_WORKSPACE/builds/win-64-standard From 49cd0c7e50ed218dd70514fe444b235cbcaa5a5d Mon Sep 17 00:00:00 2001 From: JezSonic Date: Wed, 10 Mar 2021 09:19:31 +0100 Subject: [PATCH 6/8] Update godot-build-artifact.yml --- .github/workflows/godot-build-artifact.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/godot-build-artifact.yml b/.github/workflows/godot-build-artifact.yml index 4240c3364..477c54dbc 100644 --- a/.github/workflows/godot-build-artifact.yml +++ b/.github/workflows/godot-build-artifact.yml @@ -6,9 +6,9 @@ name: Godot Build PC Artifact on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master, develop, new-github-actions ] + branches: [ master, develop ] pull_request: - branches: [ master, develop, new-github-actions ] + branches: [ master, develop ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From e0c5243681bc765991477415ac942b8293e8cfb8 Mon Sep 17 00:00:00 2001 From: JezSonic Date: Wed, 10 Mar 2021 09:24:16 +0100 Subject: [PATCH 7/8] Update README.md --- README.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/README.md b/README.md index 42ae6ce66..6e0a00bce 100755 --- a/README.md +++ b/README.md @@ -10,13 +10,3 @@ ### Copyright 2020 - present New-DEV ### Made with [Godot Engine](https://godotengine.org) - - - -## Builds: - -### Branch [master](https://github.com/NewDEV-github/Foxy-Adventure/tree/master/): ![Build](https://github.com/NewDEV-github/Foxy-Adventure/workflows/Build/badge.svg?branch=master) - -### Branch [develop](https://github.com/NewDEV-github/Foxy-Adventure/tree/develop/): ![Build](https://github.com/NewDEV-github/Foxy-Adventure/workflows/Build/badge.svg?branch=develop) - -### Branch [android](https://github.com/NewDEV-github/Foxy-Adventure/tree/android/): ![Build](https://github.com/NewDEV-github/Foxy-Adventure/workflows/Build/badge.svg?branch=android) From b347dcaa1354fcea6e3355c5818c3a86ac036512 Mon Sep 17 00:00:00 2001 From: JezSonic Date: Sat, 13 Mar 2021 09:01:09 +0100 Subject: [PATCH 8/8] fix saving icon placing, add auto save warning --- Scenes/game_ui.tscn | 16 ++++++-- Scenes/intro.tscn | 74 +++++++++++++++++++++++++++++------- Scripts/ServerAPI/updater.gd | 4 +- export_presets.cfg | 10 ++--- 4 files changed, 82 insertions(+), 22 deletions(-) diff --git a/Scenes/game_ui.tscn b/Scenes/game_ui.tscn index 8efac347e..72454c19f 100644 --- a/Scenes/game_ui.tscn +++ b/Scenes/game_ui.tscn @@ -141,12 +141,22 @@ normal = ExtResource( 4 ) action = "ui_left" visibility_mode = 1 -[node name="Icon" type="Sprite" parent="."] +[node name="Icon" type="TextureRect" parent="."] self_modulate = Color( 1, 1, 1, 0 ) material = ExtResource( 7 ) -position = Vector2( 944.591, 532.192 ) -scale = Vector2( 0.8, 0.8 ) +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -128.0 +margin_top = -128.0 +grow_horizontal = 2 +grow_vertical = 2 +rect_clip_content = true texture = ExtResource( 5 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="ms" type="Timer" parent="."] wait_time = 0.1 diff --git a/Scenes/intro.tscn b/Scenes/intro.tscn index b4ecee3ba..fc453d747 100644 --- a/Scenes/intro.tscn +++ b/Scenes/intro.tscn @@ -1,12 +1,14 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://Scripts/ServerAPI/updater.gd" type="Script" id=1] [ext_resource path="res://assets/themes/new_gui/neon.tres" type="Theme" id=2] [ext_resource path="res://assets/fonts/RobotoRegular.tres" type="DynamicFont" id=3] +[ext_resource path="res://assets/Graphics/icon.png" type="Texture" id=4] +[ext_resource path="res://assets/Materials/texture_mask.material" type="Material" id=5] [sub_resource type="Animation" id=1] resource_name = "intro" -length = 2.0 +length = 7.0 tracks/0/type = "value" tracks/0/path = NodePath("ColorRect:visible") tracks/0/interp = 1 @@ -14,7 +16,7 @@ tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 2 ), +"times": PoolRealArray( 0, 7 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ true, false ] @@ -26,7 +28,7 @@ tracks/1/loop_wrap = true tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { -"times": PoolRealArray( 0, 2 ), +"times": PoolRealArray( 0, 7 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ true, false ] @@ -38,10 +40,10 @@ tracks/2/loop_wrap = true tracks/2/imported = false tracks/2/enabled = true tracks/2/keys = { -"times": PoolRealArray( 0, 0.5, 1.5, 2 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), +"times": PoolRealArray( 0, 0.5, 1.5, 2, 2.5, 6.5, 7 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1 ), "update": 0, -"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] +"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] } tracks/3/type = "value" tracks/3/path = NodePath("CharacterCopyright:bbcode_text") @@ -50,14 +52,41 @@ tracks/3/loop_wrap = true tracks/3/imported = false tracks/3/enabled = true tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), +"times": PoolRealArray( 0, 2 ), +"transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ "[center][color=red]WARNING[/color][color=white] \"Tails\" and other characters from SEGA's franchise's are property of SEGA, Inc. Other characters from other franchises are properties of their respective owners. +[/color][/center]", "[center][color=red]WARNING[/color][color=white] +This game uses auto save +Please do not turn off the game while this icon is being displayed [/color][/center]" ] } +tracks/4/type = "value" +tracks/4/path = NodePath("CharacterCopyright:bbcode_enabled") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ true ] +} +tracks/5/type = "value" +tracks/5/path = NodePath("Icon:self_modulate") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/keys = { +"times": PoolRealArray( 2, 3, 6.2, 7 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 0, +"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] +} [node name="Updater" type="Control"] anchor_right = 1.0 @@ -78,6 +107,7 @@ __meta__ = { } [node name="ColorRect" type="ColorRect" parent="."] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 color = Color( 0, 0, 0, 1 ) @@ -90,6 +120,7 @@ __meta__ = { [node name="PCKDownloader" type="HTTPRequest" parent="."] [node name="CharacterCopyright" type="RichTextLabel" parent="."] +visible = false self_modulate = Color( 1, 1, 1, 0 ) anchor_left = 0.5 anchor_top = 0.5 @@ -104,12 +135,12 @@ custom_fonts/normal_font = ExtResource( 3 ) custom_constants/table_hseparation = -1 bbcode_enabled = true bbcode_text = "[center][color=red]WARNING[/color][color=white] -\"Tails\" and other characters from SEGA's franchise's are property of SEGA, Inc. -Other characters from other franchises are properties of their respective owners. +This game uses auto save +Please do not turn off the game while this icon is being displayed [/color][/center]" text = "WARNING -\"Tails\" and other characters from SEGA's franchise's are property of SEGA, Inc. -Other characters from other franchises are properties of their respective owners. +This game uses auto save +Please do not turn off the game while this icon is being displayed " __meta__ = { "_edit_use_anchors_": false @@ -120,6 +151,23 @@ autoplay = "intro" playback_speed = 0.5 anims/intro = SubResource( 1 ) +[node name="Icon" type="TextureRect" parent="."] +self_modulate = Color( 1, 1, 1, 0 ) +material = ExtResource( 5 ) +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -128.0 +margin_top = -128.0 +grow_horizontal = 2 +grow_vertical = 2 +rect_clip_content = true +texture = ExtResource( 4 ) +__meta__ = { +"_edit_use_anchors_": false +} + [connection signal="request_completed" from="RequiredAssets" to="." method="_on_pck_request_completed"] [connection signal="finished" from="VideoPlayer" to="." method="_on_VideoPlayer_finished"] [connection signal="request_completed" from="PCKDownloader" to="." method="_on_pck_request_completed"] diff --git a/Scripts/ServerAPI/updater.gd b/Scripts/ServerAPI/updater.gd index b2c676fb6..5a5c41b12 100644 --- a/Scripts/ServerAPI/updater.gd +++ b/Scripts/ServerAPI/updater.gd @@ -26,7 +26,9 @@ func _ready() -> void: # if intro_played: # get_tree().change_scene("res://Scenes/Menu.tscn") -func _process(delta): +func _process(delta: float) -> void: + if DiscordSDK.discord_user_img: + $Icon.texture = DiscordSDK.discord_user_img if Input.is_action_just_pressed("ui_accept"): _on_VideoPlayer_finished() func _on_AnimationPlayer_animation_finished(_anim_name): diff --git a/export_presets.cfg b/export_presets.cfg index 347d54ac5..ccdcbc7ce 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -32,7 +32,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../foxy-adv.apk" +export_path="../foxy-adv-armeabi-v7a.apk" script_export_mode=1 script_encryption_key="" @@ -40,8 +40,8 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" -custom_template/use_custom_build=false -custom_template/export_format=0 +custom_template/use_custom_build=true +custom_template/export_format=1 architectures/armeabi-v7a=true architectures/arm64-v8a=true architectures/x86=false @@ -53,8 +53,8 @@ keystore/release="C:/Users/karol/OneDrive/Dokumenty/GitHub/Foxy-Adventure/foxyad keystore/release_user="foxyadventure" keystore/release_password="foxyadventure" one_click_deploy/clear_previous_install=false -version/code=10 -version/name="1.4" +version/code=12 +version/name="1.4.1" package/unique_name="org.godotengine.$genname" package/name="" package/signed=true