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
ff8db197
Commit
ff8db197
authored
Apr 06, 2017
by
Cody A Burchett
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git.gmu.edu:gadig/Birb into verticalChange
parents
13bfd6a8
cfa915df
Changes
32
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
21628 additions
and
803 deletions
+21628
-803
Assets/Camel.meta
Assets/Camel.meta
+9
-0
Assets/Camel/CaramelCamel.controller
Assets/Camel/CaramelCamel.controller
+149
-0
Assets/Camel/CaramelCamel.controller.meta
Assets/Camel/CaramelCamel.controller.meta
+8
-0
Assets/Camel/CaramelCamel.prefab
Assets/Camel/CaramelCamel.prefab
+2461
-0
Assets/Camel/CaramelCamel.prefab.meta
Assets/Camel/CaramelCamel.prefab.meta
+8
-0
Assets/Camel/CaramelCamelBones.png
Assets/Camel/CaramelCamelBones.png
+0
-0
Assets/Camel/CaramelCamelBones.png.meta
Assets/Camel/CaramelCamelBones.png.meta
+430
-0
Assets/Camel/CaramelCamelBones_10.asset
Assets/Camel/CaramelCamelBones_10.asset
+394
-0
Assets/Camel/CaramelCamelBones_10.asset.meta
Assets/Camel/CaramelCamelBones_10.asset.meta
+8
-0
Assets/Camel/CaramelCamelBones_11.asset
Assets/Camel/CaramelCamelBones_11.asset
+356
-0
Assets/Camel/CaramelCamelBones_11.asset.meta
Assets/Camel/CaramelCamelBones_11.asset.meta
+8
-0
Assets/Camel/CaramelCamelBones_17.asset
Assets/Camel/CaramelCamelBones_17.asset
+603
-0
Assets/Camel/CaramelCamelBones_17.asset.meta
Assets/Camel/CaramelCamelBones_17.asset.meta
+8
-0
Assets/Camel/CaramelCamelBones_2.asset
Assets/Camel/CaramelCamelBones_2.asset
+375
-0
Assets/Camel/CaramelCamelBones_2.asset.meta
Assets/Camel/CaramelCamelBones_2.asset.meta
+8
-0
Assets/Camel/CaramelCamelBones_6.asset
Assets/Camel/CaramelCamelBones_6.asset
+1771
-0
Assets/Camel/CaramelCamelBones_6.asset.meta
Assets/Camel/CaramelCamelBones_6.asset.meta
+8
-0
Assets/Camel/CaramelCamelBones_7.asset
Assets/Camel/CaramelCamelBones_7.asset
+470
-0
Assets/Camel/CaramelCamelBones_7.asset.meta
Assets/Camel/CaramelCamelBones_7.asset.meta
+8
-0
Assets/Camel/CaramelCamelBones_8.asset
Assets/Camel/CaramelCamelBones_8.asset
+1610
-0
Assets/Camel/CaramelCamelBones_8.asset.meta
Assets/Camel/CaramelCamelBones_8.asset.meta
+8
-0
Assets/Camel/CaramelCamelBones_9.asset
Assets/Camel/CaramelCamelBones_9.asset
+806
-0
Assets/Camel/CaramelCamelBones_9.asset.meta
Assets/Camel/CaramelCamelBones_9.asset.meta
+8
-0
Assets/Camel/Spit.anim
Assets/Camel/Spit.anim
+3533
-0
Assets/Camel/Spit.anim.meta
Assets/Camel/Spit.anim.meta
+8
-0
Assets/Camel/Walk.anim
Assets/Camel/Walk.anim
+3483
-0
Assets/Camel/Walk.anim.meta
Assets/Camel/Walk.anim.meta
+8
-0
Assets/Prefabs/Enemy/CaramelCamel 1.prefab
Assets/Prefabs/Enemy/CaramelCamel 1.prefab
+1945
-0
Assets/Prefabs/Enemy/CaramelCamel 1.prefab.meta
Assets/Prefabs/Enemy/CaramelCamel 1.prefab.meta
+8
-0
Assets/Scenes/CharacterTest.unity
Assets/Scenes/CharacterTest.unity
+3113
-797
Assets/Scripts/Enemy/HorizontalEnemy.cs
Assets/Scripts/Enemy/HorizontalEnemy.cs
+9
-6
ProjectSettings/TagManager.asset
ProjectSettings/TagManager.asset
+7
-0
No files found.
Assets/Camel.meta
0 → 100644
View file @
ff8db197
fileFormatVersion: 2
guid: 1ff9c473baea60c4db8872aead52d61b
folderAsset: yes
timeCreated: 1490920882
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Camel/CaramelCamel.controller
0 → 100644
View file @
ff8db197
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
CaramelCamel
serializedVersion
:
5
m_AnimatorParameters
:
-
m_Name
:
IsSpitting
m_Type
:
4
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
9100000
}
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
m_StateMachine
:
{
fileID
:
1107293039202701156
}
m_Mask
:
{
fileID
:
0
}
m_Motions
:
[]
m_Behaviours
:
[]
m_BlendingMode
:
0
m_SyncedLayerIndex
:
-1
m_DefaultWeight
:
0
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1101
&1101416128883706006
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
1
m_ConditionEvent
:
IsSpitting
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102280380472789500
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0.25
m_TransitionOffset
:
0
m_ExitTime
:
0.64
m_HasExitTime
:
1
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101884533435633972
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
2
m_ConditionEvent
:
IsSpitting
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102736237293744706
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0.25
m_TransitionOffset
:
0
m_ExitTime
:
0.8125
m_HasExitTime
:
1
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1102
&1102280380472789500
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Spit
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101884533435633972
}
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_WriteDefaultValues
:
1
m_Mirror
:
0
m_SpeedParameterActive
:
0
m_MirrorParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_Motion
:
{
fileID
:
7400000
,
guid
:
d1317949245007243b0bb53aa0e674fe
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
---
!u!1102
&1102736237293744706
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Walk
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101416128883706006
}
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_WriteDefaultValues
:
1
m_Mirror
:
0
m_SpeedParameterActive
:
0
m_MirrorParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_Motion
:
{
fileID
:
7400000
,
guid
:
55fa946f0111099419f19c9b8b2b9b84
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
---
!u!1107
&1107293039202701156
AnimatorStateMachine
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Base Layer
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102736237293744706
}
m_Position
:
{
x
:
264
,
y
:
36
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102280380472789500
}
m_Position
:
{
x
:
516
,
y
:
36
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_AnyStatePosition
:
{
x
:
50
,
y
:
20
,
z
:
0
}
m_EntryPosition
:
{
x
:
50
,
y
:
120
,
z
:
0
}
m_ExitPosition
:
{
x
:
800
,
y
:
120
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
1102736237293744706
}
Assets/Camel/CaramelCamel.controller.meta
0 → 100644
View file @
ff8db197
fileFormatVersion: 2
guid: 22be9cdec6dc6c34dbbc2d9c750f26a1
timeCreated: 1491505213
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Camel/CaramelCamel.prefab
0 → 100644
View file @
ff8db197
This diff is collapsed.
Click to expand it.
Assets/Camel/CaramelCamel.prefab.meta
0 → 100644
View file @
ff8db197
fileFormatVersion: 2
guid: c2082f1ab3fe07643ace388fd9c3f111
timeCreated: 1491525287
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Camel/CaramelCamelBones.png
0 → 100644
View file @
ff8db197
260 KB
Assets/Camel/CaramelCamelBones.png.meta
0 → 100644
View file @
ff8db197
fileFormatVersion: 2
guid: fcda737c255f41c40a221d1d2a114205
timeCreated: 1490920946
licenseType: Free
TextureImporter:
fileIDToRecycleName:
21300000: CaramelCamelBones_0
21300002: CaramelCamelBones_1
21300004: CaramelCamelBones_2
21300006: CaramelCamelBones_3
21300008: CaramelCamelBones_4
21300010: CaramelCamelBones_5
21300012: CaramelCamelBones_6
21300014: CaramelCamelBones_7
21300016: CaramelCamelBones_8
21300018: CaramelCamelBones_9
21300020: CaramelCamelBones_10
21300022: CaramelCamelBones_11
21300024: CaramelCamelBones_12
21300026: CaramelCamelBones_13
21300028: CaramelCamelBones_14
21300030: CaramelCamelBones_15
21300032: CaramelCamelBones_16
21300034: CaramelCamelBones_17
21300036: CaramelCamelBones_18
21300038: CaramelCamelBones_19
21300040: CaramelCamelBones_20
21300042: CaramelCamelBones_21
21300044: CaramelCamelBones_22
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: iPhone
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: tvOS
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: WebGL
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: CaramelCamelBones_0
rect:
serializedVersion: 2
x: 37
y: 907
width: 71
height: 81
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_1
rect:
serializedVersion: 2
x: 156
y: 919
width: 73
height: 81
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_2
rect:
serializedVersion: 2
x: 283
y: 728
width: 310
height: 264
alignment: 9
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_3
rect:
serializedVersion: 2
x: 664
y: 893
width: 86
height: 52
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_4
rect:
serializedVersion: 2
x: 846
y: 895
width: 86
height: 53
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_5
rect:
serializedVersion: 2
x: 12
y: 578
width: 240
height: 268
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_6
rect:
serializedVersion: 2
x: 349
y: 304
width: 334
height: 381
alignment: 9
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_7
rect:
serializedVersion: 2
x: 716
y: 550
width: 308
height: 259
alignment: 9
pivot: {x: 0.5081169, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_8
rect:
serializedVersion: 2
x: 3
y: 235
width: 207
height: 334
alignment: 9
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_9
rect:
serializedVersion: 2
x: 239
y: 239
width: 74
height: 292
alignment: 9
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_10
rect:
serializedVersion: 2
x: 688
y: 327
width: 334
height: 206
alignment: 9
pivot: {x: 0.46771097, y: 1.4946668}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_11
rect:
serializedVersion: 2
x: 10
y: 3
width: 95
height: 217
alignment: 9
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_12
rect:
serializedVersion: 2
x: 132
y: 8
width: 84
height: 208
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_13
rect:
serializedVersion: 2
x: 246
y: 6
width: 83
height: 207
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_14
rect:
serializedVersion: 2
x: 354
y: 9
width: 83
height: 207
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_15
rect:
serializedVersion: 2
x: 488
y: 111
width: 69
height: 185
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_16
rect:
serializedVersion: 2
x: 625
y: 111
width: 69
height: 185
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_17
rect:
serializedVersion: 2
x: 772
y: 119
width: 79
height: 195
alignment: 9
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_18
rect:
serializedVersion: 2
x: 914
y: 124
width: 69
height: 185
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_19
rect:
serializedVersion: 2
x: 471
y: 8
width: 95
height: 89
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_20
rect:
serializedVersion: 2
x: 617
y: 8
width: 95
height: 89
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_21
rect:
serializedVersion: 2
x: 760
y: 8
width: 95
height: 89
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
- serializedVersion: 2
name: CaramelCamelBones_22
rect:
serializedVersion: 2
x: 896
y: 8
width: 96
height: 89
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
tessellationDetail: 0
outline: []
spritePackingTag:
userData: 97747517128553
assetBundleName:
assetBundleVariant:
Assets/Camel/CaramelCamelBones_10.asset
0 → 100644
View file @
ff8db197
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&11400000
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
c10c0be6d28fe4d539c4a39822fe301c
,
type
:
3
}