Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
be76997
add required file for mono godot and test script in csharp
JezSonic Jan 24, 2021
bdffe18
remove string keys
JezSonic Jan 24, 2021
88a1e44
dd git vcs
JezSonic Jan 24, 2021
83d0c16
fix:
JezSonic Jan 24, 2021
bdb7a67
Create .keep
JezSonic Jan 25, 2021
9d8fc22
Update and rename .keep to discord_game_sdk.gdnlib
JezSonic Jan 25, 2021
2c611e0
Add Discord Game SDK for supported platforms
JezSonic Jan 25, 2021
f06c261
Update build.yml
JezSonic Jan 25, 2021
5864610
Merge pull request #27 from NewDEV-github/master
JezSonic Jan 25, 2021
b68cb0f
fix names and dependencies
JezSonic Jan 25, 2021
15e2b7c
fix agin
JezSonic Jan 25, 2021
c849028
change godot versions
JezSonic Jan 25, 2021
4430acc
Delete build-v2.yml
JezSonic Jan 25, 2021
55d1900
Update README.md
JezSonic Jan 25, 2021
65e1b8c
Update README.md
JezSonic Jan 25, 2021
02dbdd3
Update build.yml
JezSonic Jan 25, 2021
f64d314
fix library dependencies
JezSonic Jan 25, 2021
7535576
linux - fix binary extensions
JezSonic Jan 25, 2021
3a48972
fix big issue with wrong artifact path for build-x11-32
JezSonic Jan 25, 2021
e23c764
Update discord server invitation
JezSonic Jan 25, 2021
f7fd1bb
Update build.yml
JezSonic Jan 25, 2021
b9de8a0
Now we can quit credits just by pressing enter
JezSonic Jan 25, 2021
6f6aec6
now we can also skip intro
JezSonic Jan 25, 2021
d798b18
Merge pull request #29 from NewDEV-github/master
JezSonic Jan 25, 2021
9b9bd69
in code enemies now can take damage from player
JezSonic Jan 25, 2021
b208944
on the way to take damage
JezSonic Jan 25, 2021
27b38a6
add restart butto to the pause menu
JezSonic Jan 25, 2021
cd04009
some fixes
JezSonic Jan 25, 2021
54643cc
update android menu
JezSonic Jan 25, 2021
c8ac0da
almost all changes done, fix collisions and done
JezSonic Jan 25, 2021
a05832e
git vcs if working finally, wixed bug with discord game sdk
JezSonic Jan 25, 2021
33bdad8
add working discord sdk
JezSonic Jan 25, 2021
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
77 changes: 0 additions & 77 deletions .github/workflows/build-v2.yml

This file was deleted.

12 changes: 5 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ on:
push:
tags:
- '*'
branches-ignore: [ develop, android ]
branches-ignore: [ android ]
paths-ignore:
- 'game_version.txt'
pull_request:
branches-ignore: [ develop, android ]

workflow_dispatch:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
Expand Down Expand Up @@ -53,7 +51,7 @@ jobs:
uses: josephbmanley/build-godot-action@v1.4.1
with:
# Name of the exported binary
name: FoxyAdventure.32
name: FoxyAdventure.x86
# Name of the preset in `export_presets.cfg` to use
preset: x11-32
# Optional name of the subdirectory to put exported project in
Expand All @@ -68,7 +66,7 @@ jobs:
uses: josephbmanley/build-godot-action@v1.4.1
with:
# Name of the exported binary
name: FoxyAdventure.64
name: FoxyAdventure.x86_64
# Name of the preset in `export_presets.cfg` to use
preset: x11-64
# Optional name of the subdirectory to put exported project in
Expand Down Expand Up @@ -127,7 +125,7 @@ jobs:
with:
name: build-x11-32
# A file, directory or wildcard pattern that describes what to upload
path: build/build-x11-64
path: build/build-x11-32
- name: Upload a Build Artifact (x11-64)
uses: actions/upload-artifact@v2.2.2
with:
Expand Down
2 changes: 1 addition & 1 deletion FeedBack/Main.gd
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func _on_TextEdit_text_changed():


func _on_DSCServer_pressed():
OS.shell_open(SharedLibManager.discord_server.get_data())
OS.shell_open("https://discord.gg/DAK4Gp2ufS")


func _on_Website_pressed():
Expand Down
61 changes: 61 additions & 0 deletions Foxy Adventure.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Tools</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{FCA61B70-B628-4C73-976F-520E34E4E4F7}</ProjectGuid>
<OutputType>Library</OutputType>
<OutputPath>.mono\temp\bin\$(Configuration)</OutputPath>
<RootNamespace>FoxyAdventure</RootNamespace>
<AssemblyName>Foxy Adventure</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<GodotProjectGeneratorVersion>1.0.7333.3918</GodotProjectGeneratorVersion>
<BaseIntermediateOutputPath>.mono\temp\obj</BaseIntermediateOutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)</IntermediateOutputPath>
<ApiConfiguration Condition=" '$(Configuration)' != 'Release' ">Debug</ApiConfiguration>
<ApiConfiguration Condition=" '$(Configuration)' == 'Release' ">Release</ApiConfiguration>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<DefineConstants>$(GodotDefineConstants);GODOT;DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
<DefineConstants>$(GodotDefineConstants);GODOT;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Tools|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<DefineConstants>$(GodotDefineConstants);GODOT;DEBUG;TOOLS;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="GodotSharp">
<Private>False</Private>
<HintPath>$(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharp.dll</HintPath>
</Reference>
<Reference Include="GodotSharpEditor" Condition=" '$(Configuration)' == 'Tools' ">
<Private>False</Private>
<HintPath>$(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharpEditor.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="mono\Node2D.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="mono\**.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
19 changes: 19 additions & 0 deletions Foxy Adventure.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foxy Adventure", "Foxy Adventure.csproj", "{FCA61B70-B628-4C73-976F-520E34E4E4F7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Tools|Any CPU = Tools|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FCA61B70-B628-4C73-976F-520E34E4E4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FCA61B70-B628-4C73-976F-520E34E4E4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCA61B70-B628-4C73-976F-520E34E4E4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FCA61B70-B628-4C73-976F-520E34E4E4F7}.Release|Any CPU.Build.0 = Release|Any CPU
{FCA61B70-B628-4C73-976F-520E34E4E4F7}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
{FCA61B70-B628-4C73-976F-520E34E4E4F7}.Tools|Any CPU.Build.0 = Tools|Any CPU
EndGlobalSection
EndGlobal
25 changes: 25 additions & 0 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using System.Reflection;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.

[assembly: AssemblyTitle("Foxy Adventure")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("1.0.*")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.

//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]
22 changes: 16 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
Foxy Adventure
# Foxy Adventure

About the game:
## About the game:
2D platformer with New The Fox and Miles "Tails" Prower as a playable characters

Requirements: Python3 Installed
## Requirements: Python3 Installed

[Licenses](https://github.com/NewDEV-github/Foxy-Adventure/tree/master/Licenses)
[Credits](https://github.com/NewDEV-github/Foxy-Adventure/tree/master/CREDITS.txt)

Authors: NewTheFox/New The Hedgefox, JezSonic (aka sonic, sonic.exe), GeKaGD (aka Gekon)
**Authors**: NewTheFox/New The Hedgefox, JezSonic (aka sonic, sonic.exe), GeKaGD (aka Gekon)

Copyright 2020 - present New-DEV
### Copyright 2020 - present New-DEV

Made with [Godot Engine](https://godotengine.org)
### 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)
17 changes: 9 additions & 8 deletions Scenes/Characters/New The Fox.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0, 0.346, 0.699 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ -180.0, -90.0, 0.0 ]
"values": [ -90.0 ]
}
tracks/2/type = "value"
tracks/2/path = NodePath(".:region_enabled")
Expand Down Expand Up @@ -235,26 +235,25 @@ tracks/5/keys = {
}

[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 15.1005, 12.4917 )
extents = Vector2( 7.5, 10.5 )

[node name="Tails" type="KinematicBody2D"]
position = Vector2( 130.108, 141.421 )
z_index = 1
collision/safe_margin = 0.1
script = ExtResource( 2 )
character_name = "New The Fox"
camera = NodePath("Camera2D")

[node name="Anim" type="Node2D" parent="."]
position = Vector2( 0, -4 )

[node name="Sprite" type="Sprite" parent="Anim"]
position = Vector2( 0.5, 4.5 )
rotation = -1.5708
texture = ExtResource( 3 )
hframes = 8
frame = 4
region_enabled = true
region_rect = Rect2( 0, 13, 380, 37 )
region_rect = Rect2( 465.807, 45.5556, 234.193, 47.5556 )

[node name="AnimationPlayer" type="AnimationPlayer" parent="Anim/Sprite"]
playback_speed = 0.3
Expand All @@ -264,7 +263,6 @@ anims/run = SubResource( 3 )

[node name="LowCollider" type="CollisionShape2D" parent="."]
position = Vector2( 0.899, -1.51 )
scale = Vector2( 0.7, 1 )
shape = SubResource( 4 )

[node name="LeftGroundSensor" type="RayCast2D" parent="."]
Expand All @@ -291,4 +289,7 @@ cast_to = Vector2( -11, 0 )
current = true
limit_left = 0

[node name="Area2D" type="Area2D" parent="."]

[connection signal="tree_exiting" from="." to="." method="_on_Tails_tree_exiting"]
[connection signal="body_entered" from="Area2D" to="." method="_on_Area2D_body_entered"]
14 changes: 6 additions & 8 deletions Scenes/Characters/Tails.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0, 0.346, 0.699 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ -180.0, -90.0, 0.0 ]
"values": [ -90.0 ]
}
tracks/2/type = "value"
tracks/2/path = NodePath(".:region_enabled")
Expand Down Expand Up @@ -235,14 +235,13 @@ tracks/5/keys = {
}

[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 15.1005, 12.4917 )
extents = Vector2( 7.5, 10.5 )

[node name="Tails" type="KinematicBody2D"]
z_index = 1
collision/safe_margin = 0.1
script = ExtResource( 2 )
character_name = "Tails"
camera = NodePath("Camera2D")

[node name="Camera2D" type="Camera2D" parent="."]
current = true
Expand All @@ -261,11 +260,11 @@ position = Vector2( 0, -4 )

[node name="Sprite" type="Sprite" parent="Anim"]
position = Vector2( 0.5, 4.5 )
rotation = -1.5708
texture = ExtResource( 3 )
hframes = 8
frame = 4
region_enabled = true
region_rect = Rect2( 0, 13, 380, 37 )
region_rect = Rect2( 465.807, 45.5556, 234.193, 47.5556 )

[node name="AnimationPlayer" type="AnimationPlayer" parent="Anim/Sprite"]
playback_speed = 0.3
Expand All @@ -275,7 +274,6 @@ anims/run = SubResource( 3 )

[node name="LowCollider" type="CollisionShape2D" parent="."]
position = Vector2( 0.8995, -1.51041 )
scale = Vector2( 0.7, 1 )
shape = SubResource( 4 )

[node name="LeftGroundSensor" type="RayCast2D" parent="."]
Expand Down
Loading