unity and native osx bundles and frameworks build from the same project now

2016-06-16 11:47:08 -07:00
parent 621970619d
commit 699edf8f30
111 changed files with 11112 additions and 14 deletions
--- a/integrations/Unity3D/ProjectSettings/AudioManager.asset
+++ b/integrations/Unity3D/ProjectSettings/AudioManager.asset
--- a/integrations/Unity3D/ProjectSettings/ClusterInputManager.asset
+++ b/integrations/Unity3D/ProjectSettings/ClusterInputManager.asset
--- a/integrations/Unity3D/ProjectSettings/DynamicsManager.asset
+++ b/integrations/Unity3D/ProjectSettings/DynamicsManager.asset
--- a/integrations/Unity3D/ProjectSettings/EditorBuildSettings.asset
+++ b/integrations/Unity3D/ProjectSettings/EditorBuildSettings.asset
--- a/integrations/Unity3D/ProjectSettings/EditorSettings.asset
+++ b/integrations/Unity3D/ProjectSettings/EditorSettings.asset
--- a/integrations/Unity3D/ProjectSettings/GraphicsSettings.asset
+++ b/integrations/Unity3D/ProjectSettings/GraphicsSettings.asset
--- a/integrations/Unity3D/ProjectSettings/InputManager.asset
+++ b/integrations/Unity3D/ProjectSettings/InputManager.asset
--- a/integrations/Unity3D/ProjectSettings/NavMeshAreas.asset
+++ b/integrations/Unity3D/ProjectSettings/NavMeshAreas.asset
--- a/integrations/Unity3D/ProjectSettings/NetworkManager.asset
+++ b/integrations/Unity3D/ProjectSettings/NetworkManager.asset
--- a/integrations/Unity3D/ProjectSettings/Physics2DSettings.asset
+++ b/integrations/Unity3D/ProjectSettings/Physics2DSettings.asset
--- a/integrations/Unity3D/ProjectSettings/ProjectSettings.asset
+++ b/integrations/Unity3D/ProjectSettings/ProjectSettings.asset
--- a/integrations/Unity3D/ProjectSettings/ProjectVersion.txt
+++ b/integrations/Unity3D/ProjectSettings/ProjectVersion.txt
@@ -0,0 +1,2 @@
+m_EditorVersion: 5.3.5f1
+m_StandardAssetsVersion: 0
--- a/integrations/Unity3D/ProjectSettings/QualitySettings.asset
+++ b/integrations/Unity3D/ProjectSettings/QualitySettings.asset
--- a/integrations/Unity3D/ProjectSettings/TagManager.asset
+++ b/integrations/Unity3D/ProjectSettings/TagManager.asset
--- a/integrations/Unity3D/ProjectSettings/TimeManager.asset
+++ b/integrations/Unity3D/ProjectSettings/TimeManager.asset
--- a/integrations/Unity3D/ProjectSettings/UnityAdsSettings.asset
+++ b/integrations/Unity3D/ProjectSettings/UnityAdsSettings.asset
--- a/integrations/Unity3D/ProjectSettings/UnityConnectSettings.asset
+++ b/integrations/Unity3D/ProjectSettings/UnityConnectSettings.asset