-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #40 from iamtomhewitt/beta
Beta 2.7 to production
- Loading branch information
Showing
53 changed files
with
1,417 additions
and
903 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -283,12 +283,33 @@ | |
| <Reference Include="UnityEngine.TestRunner"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="nunit.framework"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEngine.Timeline"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEditor.Timeline"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Timeline/Editor/UnityEditor.Timeline.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEngine.Networking"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEditor.Networking"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEditor.GoogleAudioSpatializer"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/Editor/UnityEditor.GoogleAudioSpatializer.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEngine.GoogleAudioSpatializer"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEditor.SpatialTracking"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/Editor/UnityEditor.SpatialTracking.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEngine.SpatialTracking"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEditor.VR"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath> | ||
| </Reference> | ||
|
|
@@ -304,6 +325,9 @@ | |
| <Reference Include="SyntaxTree.VisualStudio.Unity.Bridge"> | ||
| <HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/15.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="Google.ProtocolBuffers"> | ||
| <HintPath>C:/Git/vr-pacman/Assets/GoogleVR/Plugins/Google.ProtocolBuffers.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEditor.Advertisements"> | ||
| <HintPath>C:/Git/vr-pacman/Library/PackageCache/[email protected]/Editor/UnityEditor.Advertisements.dll</HintPath> | ||
| </Reference> | ||
|
|
@@ -325,9 +349,6 @@ | |
| <Reference Include="UnityEditor.Purchasing"> | ||
| <HintPath>C:/Git/vr-pacman/Library/PackageCache/[email protected]/Editor/UnityEditor.Purchasing.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="Google.ProtocolBuffers"> | ||
| <HintPath>C:/Git/vr-pacman/Assets/GoogleVR/Plugins/Google.ProtocolBuffers.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="mscorlib"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath> | ||
| </Reference> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -223,20 +223,22 @@ | |
| <Compile Include="Assets\Graphics\ImageEffects\Scripts\VignetteAndChromaticAberration.cs" /> | ||
| <Compile Include="Assets\Graphics\ImageEffects\Scripts\Vortex.cs" /> | ||
| <Compile Include="Assets\Scripts\Ghosts\Ghost.cs" /> | ||
| <Compile Include="Assets\Scripts\Ghosts\GhostPath.cs" /> | ||
| <Compile Include="Assets\Scripts\Manager\AudioManager.cs" /> | ||
| <Compile Include="Assets\Scripts\Manager\GameController.cs" /> | ||
| <Compile Include="Assets\Scripts\Manager\GameManager.cs" /> | ||
| <Compile Include="Assets\Scripts\Manager\GameEventManager.cs" /> | ||
| <Compile Include="Assets\Scripts\Manager\GameObjectManager.cs" /> | ||
| <Compile Include="Assets\Scripts\Manager\HighscoreManager.cs" /> | ||
| <Compile Include="Assets\Scripts\Pacman\MinimapPacmanIcon.cs" /> | ||
| <Compile Include="Assets\Scripts\Pacman\PacmanCollision.cs" /> | ||
| <Compile Include="Assets\Scripts\Pacman\PacmanHud.cs" /> | ||
| <Compile Include="Assets\Scripts\Pacman\PacmanMovement.cs" /> | ||
| <Compile Include="Assets\Scripts\Pacman\PacmanScore.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\Constants.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\HardwareHelper.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\HighscoreDisplayHelper.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\HighscoreEntry.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\ControlsHelper.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\Highscore\HighscoreDisplayHelper.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\Highscore\HighscoreEntry.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\LevelBuilder.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\MatchTransform.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\Rotate.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\Powerup.cs" /> | ||
| <Compile Include="Assets\Scripts\Utility\Utilities.cs" /> | ||
| <None Include="Assets\Graphics\ImageEffects\Shaders\_BloomAndFlares\BlendOneOne.shader" /> | ||
| <None Include="Assets\Graphics\ImageEffects\Shaders\NoiseEffectShaderRGB.shader" /> | ||
|
|
@@ -524,9 +526,24 @@ | |
| <Reference Include="UnityEngine.TestRunner"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="nunit.framework"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEngine.Timeline"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEngine.Networking"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEngine.GoogleAudioSpatializer"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEngine.SpatialTracking"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="Google.ProtocolBuffers"> | ||
| <HintPath>C:/Git/vr-pacman/Assets/GoogleVR/Plugins/Google.ProtocolBuffers.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="UnityEngine.Advertisements"> | ||
| <HintPath>C:/Git/vr-pacman/Library/PackageCache/[email protected]/Runtime/UnityEngine.Advertisements.dll</HintPath> | ||
| </Reference> | ||
|
|
@@ -542,9 +559,6 @@ | |
| <Reference Include="Unity.Analytics.Tracker"> | ||
| <HintPath>C:/Git/vr-pacman/Library/PackageCache/[email protected]/Unity.Analytics.Tracker.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="Google.ProtocolBuffers"> | ||
| <HintPath>C:/Git/vr-pacman/Assets/GoogleVR/Plugins/Google.ProtocolBuffers.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="netstandard"> | ||
| <HintPath>C:/Program Files/Unity/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath> | ||
| </Reference> | ||
|
|
||
Binary file not shown.
This file was deleted.
Oops, something went wrong.
Binary file not shown.
46 changes: 36 additions & 10 deletions
46
...s/Sprites/VR Turret Defense Logo.psd.meta → Assets/Graphics/Sprites/Icon.psd.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.