Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016

2026-03-24 02:01:06 +00:00 · 2016-01-30 02:17:20 -05:00 · 2016-01-30 02:17:20 -05:00 · 562bb78aae
commit 562bb78aae
parent 96101e66d8 a0b0c5f054
18 changed files with 1 additions and 1 deletions
--- a/Assets/materials/Player
+++ b/Assets/materials/Player
--- a/Assets/materials/player
+++ b/Assets/materials/player
--- a/Assets/materials/player
+++ b/Assets/materials/player
--- a/Assets/scenes/prototype.unity
+++ b/Assets/scenes/prototype.unity
--- a/ProjectSettings/AudioManager.asset
+++ b/ProjectSettings/AudioManager.asset
--- a/ProjectSettings/DynamicsManager.asset
+++ b/ProjectSettings/DynamicsManager.asset
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
--- a/ProjectSettings/EditorSettings.asset
+++ b/ProjectSettings/EditorSettings.asset
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
--- a/ProjectSettings/NavMeshAreas.asset
+++ b/ProjectSettings/NavMeshAreas.asset
--- a/ProjectSettings/NetworkManager.asset
+++ b/ProjectSettings/NetworkManager.asset
--- a/ProjectSettings/Physics2DSettings.asset
+++ b/ProjectSettings/Physics2DSettings.asset
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 5.1.0f3
+m_EditorVersion: 5.3.2f1
 m_StandardAssetsVersion: 0
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
--- a/ProjectSettings/TimeManager.asset
+++ b/ProjectSettings/TimeManager.asset