Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker

Conflicts: unity_Project/Assets/_Scenes/MainLevel.unity
8 years ago · df5d174a53
--- a/Car.fbx
+++ b/Car.fbx
--- a/Car_UV.png
+++ b/Car_UV.png
--- a/Engine_UV.png
+++ b/Engine_UV.png
--- a/models/objects/4-10_Character_Animation_03_Clean.fbx
+++ b/models/objects/4-10_Character_Animation_03_Clean.fbx
--- a/unity_Project/Assets/Character/4-10_Character_Animation_03_Clean.fbx
+++ b/unity_Project/Assets/Character/4-10_Character_Animation_03_Clean.fbx
--- a/unity_Project/Assets/Character/4-10_Character_Animation_03_Clean.fbx.meta
+++ b/unity_Project/Assets/Character/4-10_Character_Animation_03_Clean.fbx.meta
--- a/unity_Project/Assets/Character/Character_Animation.controller
+++ b/unity_Project/Assets/Character/Character_Animation.controller
--- a/unity_Project/Assets/Character/Materials/lambert2.mat
+++ b/unity_Project/Assets/Character/Materials/lambert2.mat
--- a/unity_Project/Assets/Character/Materials/lambert2.mat.meta
+++ b/unity_Project/Assets/Character/Materials/lambert2.mat.meta
@ -0,0 +1,8 @@
 fileFormatVersion: 2
 guid: 74b1ddeb4bb44ca4280ca7fb92e3608f
 timeCreated: 1444007885
 licenseType: Pro
 NativeFormatImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/unity_Project/Assets/_Scenes/MainLevel.unity
+++ b/unity_Project/Assets/_Scenes/MainLevel.unity
--- a/unity_Project/ProjectSettings/ProjectSettings.asset
+++ b/unity_Project/ProjectSettings/ProjectSettings.asset
--- a/unity_Project/ProjectSettings/ProjectVersion.txt
+++ b/unity_Project/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
 m_EditorVersion: 5.1.2f1
 m_EditorVersion: 5.0.1f1
 m_StandardAssetsVersion: 0