swapped project to the one with the beta scene

GameDev · Oct 31, 2013 · 94c7c7a · 94c7c7a
1 parent dee36c5
commit 94c7c7a
Show file tree

Hide file tree

Showing 95 changed files with 2,977 additions and 3 deletions.
diff --git a/Assembly-CSharp.pidb b/Assembly-CSharp.pidb
diff --git a/Assembly-UnityScript.pidb b/Assembly-UnityScript.pidb
diff --git a/Assets/Resources.meta b/Assets/Resources.meta
diff --git a/Assets/Resources/Block.mat b/Assets/Resources/Block.mat
diff --git a/Assets/Resources/Block.mat.meta b/Assets/Resources/Block.mat.meta
diff --git a/Assets/Resources/Block.prefab b/Assets/Resources/Block.prefab
diff --git a/Assets/Resources/Block.prefab.meta b/Assets/Resources/Block.prefab.meta
diff --git a/Assets/Resources/Generator.prefab b/Assets/Resources/Generator.prefab
diff --git a/Assets/Resources/Generator.prefab.meta b/Assets/Resources/Generator.prefab.meta
diff --git a/Assets/Resources/Materials.meta b/Assets/Resources/Materials.meta
diff --git a/Assets/Resources/Materials/Mat_Blue.mat b/Assets/Resources/Materials/Mat_Blue.mat
diff --git a/Assets/Resources/Materials/Mat_Blue.mat.meta b/Assets/Resources/Materials/Mat_Blue.mat.meta
diff --git a/Assets/Resources/Materials/Mat_Cyan.mat b/Assets/Resources/Materials/Mat_Cyan.mat
diff --git a/Assets/Resources/Materials/Mat_Cyan.mat.meta b/Assets/Resources/Materials/Mat_Cyan.mat.meta
diff --git a/Assets/Resources/Materials/Mat_Green.mat b/Assets/Resources/Materials/Mat_Green.mat
diff --git a/Assets/Resources/Materials/Mat_Green.mat.meta b/Assets/Resources/Materials/Mat_Green.mat.meta
diff --git a/Assets/Resources/Materials/Mat_Magenta.mat b/Assets/Resources/Materials/Mat_Magenta.mat
diff --git a/Assets/Resources/Materials/Mat_Magenta.mat.meta b/Assets/Resources/Materials/Mat_Magenta.mat.meta
diff --git a/Assets/Resources/Materials/Mat_Orange.mat b/Assets/Resources/Materials/Mat_Orange.mat
diff --git a/Assets/Resources/Materials/Mat_Orange.mat.meta b/Assets/Resources/Materials/Mat_Orange.mat.meta
diff --git a/Assets/Resources/Materials/Mat_Red.mat b/Assets/Resources/Materials/Mat_Red.mat
diff --git a/Assets/Resources/Materials/Mat_Red.mat.meta b/Assets/Resources/Materials/Mat_Red.mat.meta
diff --git a/Assets/Resources/Materials/TestMat.mat b/Assets/Resources/Materials/TestMat.mat
diff --git a/Assets/Resources/Materials/TestMat.mat.meta b/Assets/Resources/Materials/TestMat.mat.meta
diff --git a/Assets/Resources/Seperator.prefab b/Assets/Resources/Seperator.prefab
diff --git a/Assets/Resources/Seperator.prefab.meta b/Assets/Resources/Seperator.prefab.meta
diff --git a/Assets/Resources/TheGoal.prefab b/Assets/Resources/TheGoal.prefab
diff --git a/Assets/Resources/TheGoal.prefab.meta b/Assets/Resources/TheGoal.prefab.meta
diff --git a/Assets/Resources/WaterDrop.prefab b/Assets/Resources/WaterDrop.prefab
diff --git a/Assets/Resources/WaterDrop.prefab.meta b/Assets/Resources/WaterDrop.prefab.meta
diff --git a/Assets/Resources/WaterDropBlue.prefab b/Assets/Resources/WaterDropBlue.prefab
diff --git a/Assets/Resources/WaterDropBlue.prefab.meta b/Assets/Resources/WaterDropBlue.prefab.meta
diff --git a/Assets/Resources/WaterDropGreen.prefab b/Assets/Resources/WaterDropGreen.prefab
diff --git a/Assets/Resources/WaterDropGreen.prefab.meta b/Assets/Resources/WaterDropGreen.prefab.meta
diff --git a/Assets/Resources/WaterDropOrange.prefab b/Assets/Resources/WaterDropOrange.prefab
diff --git a/Assets/Resources/WaterDropOrange.prefab.meta b/Assets/Resources/WaterDropOrange.prefab.meta
diff --git a/Assets/Resources/WaterDropPurple.prefab b/Assets/Resources/WaterDropPurple.prefab
diff --git a/Assets/Resources/WaterDropPurple.prefab.meta b/Assets/Resources/WaterDropPurple.prefab.meta
diff --git a/Assets/Resources/WaterDropRed.prefab b/Assets/Resources/WaterDropRed.prefab
diff --git a/Assets/Resources/WaterDropRed.prefab.meta b/Assets/Resources/WaterDropRed.prefab.meta
diff --git a/Assets/Resources/WaterDropYellow.prefab b/Assets/Resources/WaterDropYellow.prefab
diff --git a/Assets/Resources/WaterDropYellow.prefab.meta b/Assets/Resources/WaterDropYellow.prefab.meta
diff --git a/Assets/Scenes.meta b/Assets/Scenes.meta
diff --git a/Assets/Scenes/TestScene1.unity b/Assets/Scenes/TestScene1.unity
diff --git a/Assets/Scenes/TestScene1.unity.meta b/Assets/Scenes/TestScene1.unity.meta
diff --git a/Assets/Scenes/TestScene_Levente.unity b/Assets/Scenes/TestScene_Levente.unity
diff --git a/Assets/Scenes/TestScene_Levente.unity.meta b/Assets/Scenes/TestScene_Levente.unity.meta
diff --git a/Assets/Scenes/betascene.unity b/Assets/Scenes/betascene.unity
diff --git a/Assets/Scenes/betascene.unity.meta b/Assets/Scenes/betascene.unity.meta
diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta
diff --git a/Assets/Scripts/BumpAndChangeColor.cs b/Assets/Scripts/BumpAndChangeColor.cs
diff --git a/Assets/Scripts/BumpAndChangeColor.cs.meta b/Assets/Scripts/BumpAndChangeColor.cs.meta
diff --git a/Assets/Scripts/Cup_Collide.cs b/Assets/Scripts/Cup_Collide.cs
diff --git a/Assets/Scripts/Cup_Collide.cs.meta b/Assets/Scripts/Cup_Collide.cs.meta
diff --git a/Assets/Scripts/Filter_Blue.cs b/Assets/Scripts/Filter_Blue.cs
diff --git a/Assets/Scripts/Filter_Blue.cs.meta b/Assets/Scripts/Filter_Blue.cs.meta
diff --git a/Assets/Scripts/Filter_Master.cs b/Assets/Scripts/Filter_Master.cs
diff --git a/Assets/Scripts/Filter_Master.cs.meta b/Assets/Scripts/Filter_Master.cs.meta
diff --git a/Assets/Scripts/Goal.cs b/Assets/Scripts/Goal.cs
diff --git a/Assets/Scripts/Goal.cs.meta b/Assets/Scripts/Goal.cs.meta
diff --git a/Assets/Scripts/InkLimit.cs b/Assets/Scripts/InkLimit.cs
@@ -8,7 +8,6 @@ public class InkLimit : MonoBehaviour {
 	// Use this for initialization
 	void Start () {
 		CanDrawUpdate = GameObject.FindWithTag("MainCamera").GetComponent("MagicMarker");
-
 	}
 
 	// Update is called once per frame

diff --git a/Assets/Scripts/InkLimit.cs.meta b/Assets/Scripts/InkLimit.cs.meta
diff --git a/Assets/Scripts/MagicMarker.cs b/Assets/Scripts/MagicMarker.cs
diff --git a/Assets/Scripts/MagicMarker.cs.meta b/Assets/Scripts/MagicMarker.cs.meta
diff --git a/Assets/Scripts/MasterCounter.cs b/Assets/Scripts/MasterCounter.cs
diff --git a/Assets/Scripts/MasterCounter.cs.meta b/Assets/Scripts/MasterCounter.cs.meta
diff --git a/Assets/Scripts/WaterGenerator.cs b/Assets/Scripts/WaterGenerator.cs
diff --git a/Assets/Scripts/WaterGenerator.cs.meta b/Assets/Scripts/WaterGenerator.cs.meta
diff --git a/Assets/Standard Assets.meta b/Assets/Standard Assets.meta
diff --git a/Assets/Standard Assets/Physic Materials.meta b/Assets/Standard Assets/Physic Materials.meta
diff --git a/Assets/Standard Assets/Physic Materials/Bouncy.physicmaterial b/Assets/Standard Assets/Physic Materials/Bouncy.physicmaterial
diff --git a/Assets/Standard Assets/Physic Materials/Bouncy.physicmaterial.meta b/Assets/Standard Assets/Physic Materials/Bouncy.physicmaterial.meta
diff --git a/Assets/Standard Assets/Physic Materials/Ice.physicmaterial b/Assets/Standard Assets/Physic Materials/Ice.physicmaterial
diff --git a/Assets/Standard Assets/Physic Materials/Ice.physicmaterial.meta b/Assets/Standard Assets/Physic Materials/Ice.physicmaterial.meta
diff --git a/Assets/Standard Assets/Physic Materials/Metal.physicmaterial b/Assets/Standard Assets/Physic Materials/Metal.physicmaterial
diff --git a/Assets/Standard Assets/Physic Materials/Metal.physicmaterial.meta b/Assets/Standard Assets/Physic Materials/Metal.physicmaterial.meta
diff --git a/Assets/Standard Assets/Physic Materials/Rubber.physicmaterial b/Assets/Standard Assets/Physic Materials/Rubber.physicmaterial
diff --git a/Assets/Standard Assets/Physic Materials/Rubber.physicmaterial.meta b/Assets/Standard Assets/Physic Materials/Rubber.physicmaterial.meta
diff --git a/Assets/Standard Assets/Physic Materials/Wood.physicmaterial b/Assets/Standard Assets/Physic Materials/Wood.physicmaterial
diff --git a/Assets/Standard Assets/Physic Materials/Wood.physicmaterial.meta b/Assets/Standard Assets/Physic Materials/Wood.physicmaterial.meta
diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset
diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
@@ -6,4 +6,4 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/TestScene1.unity
+    path: Assets/Scenes/betascene.unity
diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
diff --git a/ProjectSettings/NavMeshLayers.asset b/ProjectSettings/NavMeshLayers.asset
diff --git a/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -103,7 +103,11 @@ PlayerSettings:
   AndroidKeystoreName: 
   AndroidKeyaliasName: 
   resolutionDialogBanner: {fileID: 0}
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: 
+    m_Icons:
+    - m_Icon: {fileID: 0}
+      m_Size: 128
   m_BuildTargetBatching: []
   webPlayerTemplate: APPLICATION:Default
   m_TemplateCustomTags: {}

diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset
diff --git a/README.md b/README.md
diff --git a/Spectrum.userprefs b/Spectrum.userprefs
diff --git a/spectrum-master.userprefs b/spectrum-master.userprefs
@@ -0,0 +1,12 @@
+<Properties>
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Scripts\InkLimit.cs">
+    <Files>
+      <File FileName="Assets\Scripts\InkLimit.cs" Line="10" Column="84" />
+    </Files>
+  </MonoDevelop.Ide.Workbench>
+  <MonoDevelop.Ide.DebuggingService.Breakpoints>
+    <BreakpointStore />
+  </MonoDevelop.Ide.DebuggingService.Breakpoints>
+  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+</Properties>