Skip to content

Commit 5fb9e1d

Browse files
Adam BursillAdam Bursill
authored andcommitted
Adjusted standard death animation so it looks like everyone else’s, changed the main menu button to escape as I kept accedently hitting q. Created the GameController Prefabs to be able to drag to other levels
1 parent 091e965 commit 5fb9e1d

File tree

11 files changed

+245
-434
lines changed

11 files changed

+245
-434
lines changed

2d_prototype.userprefs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Properties StartupItem="Assembly-CSharp.csproj">
2+
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="Unity.Instance.Unity Editor" />
3+
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/Health.cs">
4+
<Files>
5+
<File FileName="Assets/Scripts/Health.cs" Line="56" Column="1" />
6+
</Files>
7+
</MonoDevelop.Ide.Workbench>
8+
<MonoDevelop.Ide.DebuggingService.Breakpoints>
9+
<BreakpointStore />
10+
</MonoDevelop.Ide.DebuggingService.Breakpoints>
11+
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
12+
</Properties>

Assembly-CSharp.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,20 @@
6666
<Compile Include="Assets\Scripts\RangeAttack.cs" />
6767
<Compile Include="Assets\Scripts\RangedEnemyMovement.cs" />
6868
<Compile Include="Assets\Scripts\SpikePit.cs" />
69-
<Reference Include="UnityEngine.UI">
70-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
71-
</Reference>
72-
<Reference Include="UnityEngine.Networking">
73-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
69+
<Reference Include="UnityEngine.Analytics">
70+
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
7471
</Reference>
7572
<Reference Include="UnityEngine.TestRunner">
7673
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
7774
</Reference>
7875
<Reference Include="nunit.framework">
7976
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/nunit.framework.dll</HintPath>
8077
</Reference>
81-
<Reference Include="UnityEngine.Analytics">
82-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
78+
<Reference Include="UnityEngine.Networking">
79+
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
80+
</Reference>
81+
<Reference Include="UnityEngine.UI">
82+
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
8383
</Reference>
8484
<Reference Include="UnityEngine.HoloLens">
8585
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>

Assets/Animation/StandardEnemy.controller

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ AnimatorController:
1313
m_DefaultFloat: 0
1414
m_DefaultInt: 0
1515
m_DefaultBool: 0
16-
m_Controller: {fileID: 0}
16+
m_Controller: {fileID: 9100000}
1717
- m_Name: attacking
1818
m_Type: 4
1919
m_DefaultFloat: 0
2020
m_DefaultInt: 0
2121
m_DefaultBool: 0
22-
m_Controller: {fileID: 0}
22+
m_Controller: {fileID: 9100000}
2323
m_AnimatorLayers:
2424
- serializedVersion: 5
2525
m_Name: Base Layer

0 commit comments

Comments
 (0)