Develop

.github/workflows/godot-build-artifact.yml

@@ -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:

.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

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)

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

Scenes/intro.tscn

@@ -1,20 +1,22 @@
-[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
 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"]

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):

build_game.sh

@@ -0,0 +1,27 @@
+#!/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
+cd .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

export_presets.cfg

@@ -32,16 +32,16 @@ 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=""
 
 [preset.1.options]
 
 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