Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7eca657
Merge pull request #11 from AcademyPressuredCode/Gabriel
GabrielRRussell Nov 5, 2017
1a8530d
Merge pull request #13 from AcademyPressuredCode/Gabriel
GabrielRRussell Nov 8, 2017
2183d7c
Fix some long standing issues with collision
GabrielRRussell Jan 23, 2018
3409a84
Some other stuff
GabrielRRussell Jan 24, 2018
7f0cb30
Change some prefab settings
GabrielRRussell Jan 24, 2018
f469242
Fix bullet bug
GabrielRRussell Jan 25, 2018
8192268
Fix trigger settings
GabrielRRussell Jan 25, 2018
9d966ff
Merge pull request #23 from AcademyPressuredCode/Gabriel
GabrielRRussell Jan 25, 2018
3a2ffec
Test Menu Changes
GabrielRRussell Jan 25, 2018
a0ac604
Quick Fix
GabrielRRussell Jan 25, 2018
912a130
Add UI tests
GabrielRRussell Jan 25, 2018
8e00990
More UI changes
GabrielRRussell Jan 25, 2018
698b3c1
Add UI change that was missing
GabrielRRussell Jan 25, 2018
cf53d58
Final Changes
GabrielRRussell Jan 25, 2018
7841b10
Add UI changes
GabrielRRussell Jan 25, 2018
abcf676
Weapon Type Setup
GabrielRRussell Jan 27, 2018
b4238f3
Change save system
GabrielRRussell Jan 27, 2018
69aaef3
Gun Differences
GabrielRRussell Jan 27, 2018
40d47b1
More changes separating guns
GabrielRRussell Jan 27, 2018
4f412af
Merge pull request #24 from AcademyPressuredCode/Gabriel
GabrielRRussell Jan 27, 2018
6a58663
Emergency Change
GabrielRRussell Jan 27, 2018
658a892
Cooldown Meter / UI
GabrielRRussell Jan 28, 2018
27e99f3
Merge pull request #25 from AcademyPressuredCode/Gabriel
GabrielRRussell Jan 28, 2018
533a195
Too much
GabrielRRussell Jan 28, 2018
18aee96
Finalize tiles n stuff
GabrielRRussell Jan 28, 2018
9cbb47b
Fix more things
GabrielRRussell Jan 28, 2018
8374451
replace player sprite
GabrielRRussell Jan 28, 2018
5e881c1
Ỉե'ŝ †οὂ ḷäṱɛ †ὅ ɓӗ ẉǒṙҟĭñʛ
GabrielRRussell Jan 28, 2018
25ecffc
Merge pull request #26 from AcademyPressuredCode/Gabriel
GabrielRRussell Jan 28, 2018
2694ada
Two maps made
TeamHud Jan 28, 2018
dfef97b
Kinda need this
TeamHud Jan 28, 2018
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
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ ExportedObj/
*.svd
*.pdb

# Unity3D generated meta files
*.pidb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AnimationClip:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: WalkDown
m_Name: Idle
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
Expand All @@ -19,15 +19,13 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: b9fc9dc47759a154194ad2bbbd4a9560, type: 3}
- time: 0.05
value: {fileID: 21300002, guid: b9fc9dc47759a154194ad2bbbd4a9560, type: 3}
- time: 0.1
value: {fileID: 21300004, guid: b9fc9dc47759a154194ad2bbbd4a9560, type: 3}
- time: 0.15
value: {fileID: 21300006, guid: b9fc9dc47759a154194ad2bbbd4a9560, type: 3}
- time: 0.2
value: {fileID: 21300000, guid: b9fc9dc47759a154194ad2bbbd4a9560, type: 3}
value: {fileID: 21300000, guid: 0566afa766896e34eb0d569152b607ee, type: 3}
- time: 0.16666667
value: {fileID: 21300002, guid: 0566afa766896e34eb0d569152b607ee, type: 3}
- time: 0.33333334
value: {fileID: 21300004, guid: 0566afa766896e34eb0d569152b607ee, type: 3}
- time: 0.5
value: {fileID: 21300006, guid: 0566afa766896e34eb0d569152b607ee, type: 3}
attribute: m_Sprite
path:
classID: 212
Expand All @@ -47,17 +45,16 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: b9fc9dc47759a154194ad2bbbd4a9560, type: 3}
- {fileID: 21300002, guid: b9fc9dc47759a154194ad2bbbd4a9560, type: 3}
- {fileID: 21300004, guid: b9fc9dc47759a154194ad2bbbd4a9560, type: 3}
- {fileID: 21300006, guid: b9fc9dc47759a154194ad2bbbd4a9560, type: 3}
- {fileID: 21300000, guid: b9fc9dc47759a154194ad2bbbd4a9560, type: 3}
- {fileID: 21300000, guid: 0566afa766896e34eb0d569152b607ee, type: 3}
- {fileID: 21300002, guid: 0566afa766896e34eb0d569152b607ee, type: 3}
- {fileID: 21300004, guid: 0566afa766896e34eb0d569152b607ee, type: 3}
- {fileID: 21300006, guid: 0566afa766896e34eb0d569152b607ee, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.21666667
m_StopTime: 0.51666665
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

153 changes: 153 additions & 0 deletions Assets/Animations/Player/Player 1.controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
%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: Player 1
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Walking
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 1
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107470972811323074}
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 &1101469450947932596
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Walking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102692748568868436}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.516129
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101572233354888498
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Walking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102885008766563666}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102692748568868436
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: 1101572233354888498}
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_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 7c810cb63c51c9940aa6e11536bfe626, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102885008766563666
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101469450947932596}
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_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 6594d2db1d8c59e42b6508c208ea040c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107470972811323074
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: 1102885008766563666}
m_Position: {x: 252, y: 48, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102692748568868436}
m_Position: {x: 528, 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: 576, y: -36, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102885008766563666}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 69 additions & 0 deletions Assets/Animations/Player/Player.controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
%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: Player
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107253499967745190}
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!1102 &1102514901651580430
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: []
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_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 7c810cb63c51c9940aa6e11536bfe626, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107253499967745190
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: 1102514901651580430}
m_Position: {x: 396, y: 24, 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: 1102514901651580430}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading