Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Birb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gadig
Birb
Commits
fd0028f5
Commit
fd0028f5
authored
Apr 13, 2017
by
Andrew R Van Buren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'LungeEnemy' into 'master'
Lunge enemy See merge request
!56
parents
d984067e
15f344dd
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
38 additions
and
10 deletions
+38
-10
Assets/Prefabs/Lunge Enemy.prefab
Assets/Prefabs/Lunge Enemy.prefab
+0
-0
Assets/Prefabs/Lunge Enemy.prefab.meta
Assets/Prefabs/Lunge Enemy.prefab.meta
+8
-0
Assets/Scenes/jumptest.unity
Assets/Scenes/jumptest.unity
+0
-0
Assets/Scripts/Birb/Dash.cs
Assets/Scripts/Birb/Dash.cs
+1
-0
Assets/Scripts/Enemy/Lunge_Attack.cs
Assets/Scripts/Enemy/Lunge_Attack.cs
+0
-0
Assets/Scripts/Enemy/Lunge_Attack.cs.meta
Assets/Scripts/Enemy/Lunge_Attack.cs.meta
+12
-0
Assets/Scripts/Enemy/desktop.ini
Assets/Scripts/Enemy/desktop.ini
+2
-0
Assets/Scripts/Enemy/desktop.ini.meta
Assets/Scripts/Enemy/desktop.ini.meta
+8
-0
birb.sln
birb.sln
+7
-10
No files found.
Assets/Prefabs/Lunge Enemy.prefab
0 → 100644
View file @
fd0028f5
File added
Assets/Prefabs/Lunge Enemy.prefab.meta
0 → 100644
View file @
fd0028f5
fileFormatVersion: 2
guid: 662f53d653f63834597b5983de9d8859
timeCreated: 1492125460
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/jumptest.unity
View file @
fd0028f5
No preview for this file type
Assets/Scripts/Birb/Dash.cs
View file @
fd0028f5
...
...
@@ -66,6 +66,7 @@ public class Dash : AbstractBehavior {
distTraveled
/=
samples
;
return
(
dashDistance
/
distTraveled
);
}
...
...
Assets/Scripts/Enemy/Lunge_Attack.cs
0 → 100644
View file @
fd0028f5
B
using
System.Collections
;
Assets/Scripts/Enemy/Lunge_Attack.cs.meta
0 → 100644
View file @
fd0028f5
fileFormatVersion: 2
guid: 017ab18b4c3d0ea43be073a58863ab7a
timeCreated: 1487896683
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Enemy/desktop.ini
0 → 100644
View file @
fd0028f5
[LocalizedFileNames]
Lunge_Attack.cs
=
@Lunge_Attack.cs,0
Assets/Scripts/Enemy/desktop.ini.meta
0 → 100644
View file @
fd0028f5
fileFormatVersion: 2
guid: 5b3d6d680ead1a941852d0097afe0f49
timeCreated: 1487901782
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
birb.sln
View file @
fd0028f5
Microsoft Visual Studio Solution File, Format Version 1
1
.00
# Visual Studio 201
0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Birb", "
Assembly-CSharp.csproj", "{A490B848-188F-485C-9203-EFF824787523
}"
Microsoft Visual Studio Solution File, Format Version 1
2
.00
# Visual Studio 201
5
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Birb", "
Birb.csproj", "{0E1C9E80-2222-A473-1DED-289BBAAF06DC
}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
...
...
@@ -9,15 +9,12 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{
A490B848-188F-485C-9203-EFF824787523
}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{
A490B848-188F-485C-9203-EFF824787523
}.Debug|Any CPU.Build.0 = Debug|Any CPU
{
A490B848-188F-485C-9203-EFF824787523
}.Release|Any CPU.ActiveCfg = Release|Any CPU
{
A490B848-188F-485C-9203-EFF824787523
}.Release|Any CPU.Build.0 = Release|Any CPU
{
0E1C9E80-2222-A473-1DED-289BBAAF06DC
}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{
0E1C9E80-2222-A473-1DED-289BBAAF06DC
}.Debug|Any CPU.Build.0 = Debug|Any CPU
{
0E1C9E80-2222-A473-1DED-289BBAAF06DC
}.Release|Any CPU.ActiveCfg = Release|Any CPU
{
0E1C9E80-2222-A473-1DED-289BBAAF06DC
}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj
EndGlobalSection
EndGlobal
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment