From 3f1a1e29abdee19acdd5a3d950c85e6ce1658932 Mon Sep 17 00:00:00 2001 From: Chad Reed Date: Sun, 31 May 2015 23:38:01 -0400 Subject: [PATCH 1/6] Converted to Unity 5 and created new main menu --- C3/Assembly-CSharp-vs.csproj | 9 ++++++--- C3/Assembly-CSharp.csproj | 9 ++++++--- C3/Assembly-UnityScript-vs.unityproj | 9 ++++++--- C3/Assembly-UnityScript.unityproj | 9 ++++++--- C3/Assets/Scenes/NewMainMenu.unity | Bin 0 -> 34632 bytes C3/Assets/Scenes/NewMainMenu.unity.meta | 8 ++++++++ C3/Assets/Scripts/PlayerMotion.cs | 10 +++++----- C3/C3-csharp.sln | 2 +- C3/C3.sln | 2 +- C3/ProjectSettings/GraphicsSettings.asset | Bin 4128 -> 4228 bytes C3/ProjectSettings/NavMeshAreas.asset | Bin 0 -> 9100 bytes C3/ProjectSettings/ProjectSettings.asset | Bin 27572 -> 34428 bytes C3/ProjectSettings/ProjectVersion.txt | 2 ++ 13 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 C3/Assets/Scenes/NewMainMenu.unity create mode 100644 C3/Assets/Scenes/NewMainMenu.unity.meta create mode 100644 C3/ProjectSettings/NavMeshAreas.asset create mode 100644 C3/ProjectSettings/ProjectVersion.txt diff --git a/C3/Assembly-CSharp-vs.csproj b/C3/Assembly-CSharp-vs.csproj index 468c69a..b28f0d7 100644 --- a/C3/Assembly-CSharp-vs.csproj +++ b/C3/Assembly-CSharp-vs.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_4_5_3;UNITY_4_5;UNITY_ANDROID;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_UNITYEVENTS;ENABLE_NEW_HIERARCHY ;ENABLE_AUDIO_FMOD;ENABLE_MONO;ENABLE_TERRAIN;ENABLE_SUBSTANCE;ENABLE_GENERICS;INCLUDE_WP8SUPPORT;ENABLE_WWW;ENABLE_IMAGEEFFECTS;INCLUDE_WP_BLUE_SUPPORT;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;UNITY_ANDROID_API;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN + DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX prompt 4 0169 @@ -39,10 +39,10 @@ - C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll + /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll - C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll + /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll @@ -68,6 +68,9 @@ + + /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll +