Merge branch 'master' of https://github.com/chibicitiberiu/frica-de-gaze

FricaDeGaze/Assembly-CSharp-firstpass-vs.csproj

@@ -39,17 +39,17 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>E:/SDKs/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>E:/SDKs/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>
      <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\MouseLook.cs" />
      <None Include="Assets\Standard Assets\Skyboxes\_skybox info.txt" />
  <Reference Include="UnityEngine.UI">
- <HintPath>E:/SDKs/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Program Files (x86)/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll</HintPath>
  </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

FricaDeGaze/Assembly-CSharp-firstpass.csproj

@@ -39,17 +39,17 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>E:/SDKs/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>E:/SDKs/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>
      <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\MouseLook.cs" />
      <None Include="Assets\Standard Assets\Skyboxes\_skybox info.txt" />
  <Reference Include="UnityEngine.UI">
- <HintPath>E:/SDKs/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Program Files (x86)/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll</HintPath>
  </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

FricaDeGaze/Assembly-UnityScript-firstpass-vs.unityproj

@@ -39,10 +39,10 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>E:/SDKs/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>E:/SDKs/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>
@@ -50,7 +50,7 @@
      <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\FPSInputController.js" />
      <None Include="Assets\Standard Assets\Skyboxes\_skybox info.txt" />
  <Reference Include="UnityEngine.UI">
- <HintPath>E:/SDKs/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Program Files (x86)/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll</HintPath>
  </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

FricaDeGaze/Assembly-UnityScript-firstpass.unityproj

@@ -39,10 +39,10 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>E:/SDKs/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>E:/SDKs/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>
@@ -50,7 +50,7 @@
      <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\FPSInputController.js" />
      <None Include="Assets\Standard Assets\Skyboxes\_skybox info.txt" />
  <Reference Include="UnityEngine.UI">
- <HintPath>E:/SDKs/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Program Files (x86)/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll</HintPath>
  </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

FricaDeGaze/Assets/spider.blend.meta

@@ -51,6 +51,7 @@ ModelImporter:
     100090: Spine1
     100092: Spine2
     100094: Spine3
+    100096: Spider
     400000: //RootNode
     400002: trnt_body
     400004: trnt_eyes
@@ -99,6 +100,7 @@ ModelImporter:
     400090: Spine1
     400092: Spine2
     400094: Spine3
+    400096: Spider
     2300000: trnt_body
     2300002: trnt_eyes
     3300000: trnt_body

FricaDeGaze/FricaDeGaze-csharp.sln

@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 
 Project("{CBAEB5C9-9422-1C3C-8D96-61F0B7398125}") = "FricaDeGaze", "Assembly-CSharp-firstpass-vs.csproj", "{42BC90A2-817C-3CE9-3483-ECCB5166C46D}"
 EndProject
+Project("{CBAEB5C9-9422-1C3C-8D96-61F0B7398125}") = "FricaDeGaze", "Assembly-CSharp-vs.csproj", "{5979DAC1-7534-B99A-F626-3716543927F7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -13,6 +15,10 @@ Global
 		{42BC90A2-817C-3CE9-3483-ECCB5166C46D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42BC90A2-817C-3CE9-3483-ECCB5166C46D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42BC90A2-817C-3CE9-3483-ECCB5166C46D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5979DAC1-7534-B99A-F626-3716543927F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5979DAC1-7534-B99A-F626-3716543927F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5979DAC1-7534-B99A-F626-3716543927F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5979DAC1-7534-B99A-F626-3716543927F7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

FricaDeGaze/FricaDeGaze.sln

@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 
 Project("{CBAEB5C9-9422-1C3C-8D96-61F0B7398125}") = "FricaDeGaze", "Assembly-CSharp-firstpass.csproj", "{42BC90A2-817C-3CE9-3483-ECCB5166C46D}"
 EndProject
+Project("{CBAEB5C9-9422-1C3C-8D96-61F0B7398125}") = "FricaDeGaze", "Assembly-CSharp.csproj", "{5979DAC1-7534-B99A-F626-3716543927F7}"
+EndProject
 Project("{CBAEB5C9-9422-1C3C-8D96-61F0B7398125}") = "FricaDeGaze", "Assembly-UnityScript-firstpass.unityproj", "{69E5724F-5132-70E4-F6C2-99F1516B8593}"
 EndProject
 Global
@@ -15,6 +17,10 @@ Global
 		{42BC90A2-817C-3CE9-3483-ECCB5166C46D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42BC90A2-817C-3CE9-3483-ECCB5166C46D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42BC90A2-817C-3CE9-3483-ECCB5166C46D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5979DAC1-7534-B99A-F626-3716543927F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5979DAC1-7534-B99A-F626-3716543927F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5979DAC1-7534-B99A-F626-3716543927F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5979DAC1-7534-B99A-F626-3716543927F7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{69E5724F-5132-70E4-F6C2-99F1516B8593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{69E5724F-5132-70E4-F6C2-99F1516B8593}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{69E5724F-5132-70E4-F6C2-99F1516B8593}.Release|Any CPU.ActiveCfg = Release|Any CPU

FricaDeGaze/FricaDeGaze.userprefs

@@ -1,8 +1,8 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Standard Assets\Character Controllers\Sources\Scripts\FPSInputController.js">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\RandomSpider.cs">
     <Files>
-      <File FileName="Assets\Standard Assets\Character Controllers\Sources\Scripts\FPSInputController.js" Line="15" Column="63" />
+      <File FileName="Assets\RandomSpider.cs" Line="9" Column="3" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>

FricaDeGaze/FricaDeGaze_Data/output_log.txt

@@ -1,20 +1,21 @@
 Initialize engine version: 4.6.1f1 (d1db7a1b5196)
 GfxDevice: creating device client; threaded=1
 Direct3D:
-    Version:  Direct3D 11.0 [level 10.1]
-    Renderer: ATI Mobility Radeon HD 4500/5100 Series (ID=0x9553)
-    Vendor:   ATI
-    VRAM:     505 MB
+    Version:  Direct3D 11.0 [level 11.0]
+    Renderer: NVIDIA GeForce 820M       (ID=0x1140)
+    Vendor:   NVIDIA
+    VRAM:     1994 MB
 Begin MonoManager ReloadAssembly
-Platform assembly: E:\Facultate\VR\Lab4_FricaDeGaze\FricaDeGaze\FricaDeGaze_Data\Managed\UnityEngine.dll (this message is harmless)
-Loading E:\Facultate\VR\Lab4_FricaDeGaze\FricaDeGaze\FricaDeGaze_Data\Managed\UnityEngine.dll into Unity Child Domain
-Platform assembly: E:\Facultate\VR\Lab4_FricaDeGaze\FricaDeGaze\FricaDeGaze_Data\Managed\Assembly-UnityScript-firstpass.dll (this message is harmless)
-Loading E:\Facultate\VR\Lab4_FricaDeGaze\FricaDeGaze\FricaDeGaze_Data\Managed\Assembly-UnityScript-firstpass.dll into Unity Child Domain
-Platform assembly: E:\Facultate\VR\Lab4_FricaDeGaze\FricaDeGaze\FricaDeGaze_Data\Managed\UnityEngine.UI.dll (this message is harmless)
-Loading E:\Facultate\VR\Lab4_FricaDeGaze\FricaDeGaze\FricaDeGaze_Data\Managed\UnityEngine.UI.dll into Unity Child Domain
-- Completed reload, in  0.291 seconds
+Platform assembly: C:\Users\ligia_000\Documents\PCWorkspace\frica-de-gaze\FricaDeGaze\FricaDeGaze_Data\Managed\UnityEngine.dll (this message is harmless)
+Loading C:\Users\ligia_000\Documents\PCWorkspace\frica-de-gaze\FricaDeGaze\FricaDeGaze_Data\Managed\UnityEngine.dll into Unity Child Domain
+Platform assembly: C:\Users\ligia_000\Documents\PCWorkspace\frica-de-gaze\FricaDeGaze\FricaDeGaze_Data\Managed\Assembly-UnityScript-firstpass.dll (this message is harmless)
+Loading C:\Users\ligia_000\Documents\PCWorkspace\frica-de-gaze\FricaDeGaze\FricaDeGaze_Data\Managed\Assembly-UnityScript-firstpass.dll into Unity Child Domain
+Platform assembly: C:\Users\ligia_000\Documents\PCWorkspace\frica-de-gaze\FricaDeGaze\FricaDeGaze_Data\Managed\UnityEngine.UI.dll (this message is harmless)
+Loading C:\Users\ligia_000\Documents\PCWorkspace\frica-de-gaze\FricaDeGaze\FricaDeGaze_Data\Managed\UnityEngine.UI.dll into Unity Child Domain
+- Completed reload, in  0.047 seconds
 desktop: 1366x768 60Hz; virtual: 1366x768 at 0,0
 <RI> Initializing input.
+XInput1_3.dll not found.
 <RI> Input initialized.
-Platform assembly: E:\Facultate\VR\Lab4_FricaDeGaze\FricaDeGaze\FricaDeGaze_Data\Managed\System.Core.dll (this message is harmless)
-Platform assembly: E:\Facultate\VR\Lab4_FricaDeGaze\FricaDeGaze\FricaDeGaze_Data\Managed\Boo.Lang.dll (this message is harmless)
+Platform assembly: C:\Users\ligia_000\Documents\PCWorkspace\frica-de-gaze\FricaDeGaze\FricaDeGaze_Data\Managed\System.Core.dll (this message is harmless)
+Platform assembly: C:\Users\ligia_000\Documents\PCWorkspace\frica-de-gaze\FricaDeGaze\FricaDeGaze_Data\Managed\Boo.Lang.dll (this message is harmless)