diff --git a/TTCS_Prot/Assets/Scenes/SampleScene.unity b/TTCS_Prot/Assets/Scenes/SampleScene.unity
index 19cea7e896788f027c1d31ec494d1358234a5dcd..84f3fd6dae18b3c8490e4d5ac635a3e9cf2e73bc 100644
--- a/TTCS_Prot/Assets/Scenes/SampleScene.unity
+++ b/TTCS_Prot/Assets/Scenes/SampleScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.43667564, g: 0.48427135, b: 0.5645232, a: 1}
+ m_IndirectSpecularColor: {r: 0.4366757, g: 0.48427194, b: 0.5645252, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -1060,7 +1060,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 4, y: 0.0000076293945}
+ m_AnchoredPosition: {x: 4, y: 0}
m_SizeDelta: {x: -8, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &193758842
@@ -4176,7 +4176,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 534669902}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
- m_LocalPosition: {x: 1.79, y: 7.7, z: -1.16}
+ m_LocalPosition: {x: 1.5, y: 4.32, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -4210,7 +4210,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0dd89afbef87148d197467665f18c6d3, type: 3}
m_Name:
m_EditorClassIdentifier:
- cameraSpeed: 0
+ cameraSpeed: 1
+ startPosition: {x: 1.5, y: 7.5, z: -1}
tutMove: 0
tutZoom: 0
--- !u!1 &553963902
@@ -5533,7 +5534,7 @@ Transform:
m_GameObject: {fileID: 738989159}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -0.5, y: 0, z: 1.33}
- m_LocalScale: {x: 0.7, y: 0.9376819, z: 0.7}
+ m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children: []
m_Father: {fileID: 1426055746}
m_RootOrder: 0
@@ -5726,7 +5727,7 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
- m_Constraints: 0
+ m_Constraints: 116
m_CollisionDetection: 0
--- !u!195 &738989174
NavMeshAgent:
@@ -5737,15 +5738,15 @@ NavMeshAgent:
m_GameObject: {fileID: 738989159}
m_Enabled: 1
m_AgentTypeID: 0
- m_Radius: 0.49999997
+ m_Radius: 0.2
m_Speed: 3.5
m_Acceleration: 8
avoidancePriority: 50
m_AngularSpeed: 0
m_StoppingDistance: 0
- m_AutoTraverseOffMeshLink: 1
+ m_AutoTraverseOffMeshLink: 0
m_AutoBraking: 1
- m_AutoRepath: 1
+ m_AutoRepath: 0
m_Height: 1
m_BaseOffset: 0.5
m_WalkableMask: 4294967295
@@ -6426,29 +6427,29 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
- dialogueTime: 2
+ dialogueTime: 4
endLocation: {x: 0, y: 0, z: 0}
speed: 0
zoomSpeed: 0
wait: 1
size: 0
- dialogue: '...right, who''s the missing persopn here?'
+ dialogue: '...right, who''s the missing person?'
- thisEventType: 2
charName: Kelso
character: {fileID: 738989159}
dialogueImage: {fileID: 2800000, guid: a38aa040d428a454e91143c33ee40a92, type: 3}
- dialogueTime: 2
+ dialogueTime: 5
endLocation: {x: 0, y: 7.7, z: 1}
speed: -1
zoomSpeed: 1
wait: 1
size: 3
- dialogue: No, not a person. It's my rabbit, Samson, not a person... my rabbit.
+ dialogue: No, not a person. It's my rabbit Samson, not a person... My rabbit.
- thisEventType: 2
charName: Penelope
character: {fileID: 0}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
- dialogueTime: 2
+ dialogueTime: 4
endLocation: {x: 3, y: 7.7, z: 1}
speed: 1
zoomSpeed: 1
@@ -6459,7 +6460,7 @@ MonoBehaviour:
charName: T. Kelso
character: {fileID: 738989159}
dialogueImage: {fileID: 2800000, guid: 9c12962af14cc5d4cb0d6fa9951857cb, type: 3}
- dialogueTime: 2
+ dialogueTime: 4
endLocation: {x: 3, y: 7.7, z: -2}
speed: 1
zoomSpeed: 1
@@ -6481,28 +6482,39 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
- dialogueTime: 2
+ dialogueTime: 5
endLocation: {x: 3.75, y: 7.7, z: -1.16}
speed: -1
zoomSpeed: 1
wait: 1
size: 4.143829
dialogue: His Rabbit? He wants me to find him his rabbit?
+ - thisEventType: 1
+ charName: Penelope
+ character: {fileID: 0}
+ dialogueImage: {fileID: 0}
+ dialogueTime: 0
+ endLocation: {x: 1.5, y: 7.5, z: -1.5}
+ speed: -1
+ zoomSpeed: 1
+ wait: 1
+ size: 4.143829
+ dialogue:
description: Beginning Cutscene;
- cutsceneActions:
- - thisEventType: 2
+ - thisEventType: 0
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
dialogueTime: 0
- endLocation: {x: 0, y: 0, z: 0}
+ endLocation: {x: -2.3, y: 0, z: 2}
speed: 0
zoomSpeed: 0
- wait: 1
+ wait: 0
size: 0
dialogue: What do we have here
- - thisEventType: 1
- charName: Detective1
+ - thisEventType: 2
+ charName: Penelope
character: {fileID: 0}
dialogueImage: {fileID: 0}
dialogueTime: 0
@@ -6511,16 +6523,16 @@ MonoBehaviour:
zoomSpeed: 1
wait: 1
size: 3
- dialogue: Test
- - thisEventType: 1
+ dialogue: Hey Kelso, I think I've figured it out.
+ - thisEventType: 0
charName: Detective1
- character: {fileID: 0}
+ character: {fileID: 738989159}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
dialogueTime: 0
- endLocation: {x: 3, y: 7.7, z: 1}
+ endLocation: {x: -1.5, y: 0.5, z: 2}
speed: 1
zoomSpeed: 1
- wait: 1
+ wait: 0
size: 3
dialogue: Test
- thisEventType: 1
@@ -9192,6 +9204,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 3761742374809534360, guid: f4ad175d0facffa459f806cdddc12632,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3761742374809534360, guid: f4ad175d0facffa459f806cdddc12632,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3761742374809534360, guid: f4ad175d0facffa459f806cdddc12632,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.5
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f4ad175d0facffa459f806cdddc12632, type: 3}
--- !u!224 &1239830399 stripped
diff --git a/TTCS_Prot/Assets/Scenes/example.meta b/TTCS_Prot/Assets/Scenes/example.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2938a2cad0bab059ab6924f712eacddea4253a87
--- /dev/null
+++ b/TTCS_Prot/Assets/Scenes/example.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bebd874866a254106aae17e52a06ac6e
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/TTCS_Prot/Assets/Scripts/Classes/CameraMove.cs b/TTCS_Prot/Assets/Scripts/Classes/CameraMove.cs
index fead1e5dfa494a81dd2309a6bd370cb1688662c4..2f2ee2c2c98953d73e5c58ada20718c69985db37 100644
--- a/TTCS_Prot/Assets/Scripts/Classes/CameraMove.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/CameraMove.cs
@@ -5,7 +5,7 @@ using UnityEngine;
public class CameraMove : MonoBehaviour
{
public float cameraSpeed;
- Vector3 position;
+ public Vector3 startPosition;
float maxValue;
float minValue;
public bool tutMove;
@@ -16,36 +16,21 @@ public class CameraMove : MonoBehaviour
{
maxValue = 4.0f;
minValue = 1.0f;
- cameraSpeed = 10f;
tutMove = false;
tutZoom = false;
tutZoom1 = false;
+ transform.position = startPosition;
+
+
}
// Update is called once per frame
void Update()
{
- position = gameObject.transform.position;
- if (Input.GetKey(KeyCode.UpArrow) && position.z < 3.7)
- {
- position.z += cameraSpeed * Time.deltaTime;
- tutMove = true;
- }
- else if(Input.GetKey(KeyCode.DownArrow) && position.z > -5)
- {
- position.z -= cameraSpeed * Time.deltaTime;
- tutMove = true;
- }
- else if(Input.GetKey(KeyCode.RightArrow) && position.x < 7.5)
- {
- position.x += cameraSpeed * Time.deltaTime;
- tutMove = true;
- }
- else if(Input.GetKey(KeyCode.LeftArrow) && position.x > -4)
- {
- position.x -= cameraSpeed * Time.deltaTime;
- tutMove = true;
+ if(Input.GetAxis("CameraVertical") != 0.0f || Input.GetAxis("CameraHorizontal") != 0.0f)
+ {
+ transform.Translate(Input.GetAxis("CameraHorizontal") * cameraSpeed * Time.deltaTime, 0.0f, Input.GetAxis("CameraVertical") * Time.deltaTime);
}
if(Input.mouseScrollDelta.y != 0)
{
@@ -60,10 +45,5 @@ public class CameraMove : MonoBehaviour
{
Camera.main.orthographicSize = maxValue;
}
- if(tutZoom1 && Input.mouseScrollDelta.y == 0)
- {
- tutZoom = true;
- }
- gameObject.transform.position = position;
}
}
diff --git a/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs b/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
index ba602204b89ad408c94bdb8103a7651ea4504c16..416b72f1219f031799227fa6e8ae039261680af1 100644
--- a/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
@@ -70,7 +70,7 @@ public class CutsceneManager : MonoBehaviour {
tutorial.SetActive(true);
}
//resets the camera position and zoom
- Camera.main.transform.position = new Vector3(3.75f, 7.7f, -1.16f);
+ Camera.main.transform.position = FindObjectOfType<Camera>().GetComponent<CameraMove>().startPosition;
Camera.main.orthographicSize = 4.143829f;
}
//temp update function to check for spacebar input
diff --git a/TTCS_Prot/Assets/Scripts/Classes/InputManager.cs b/TTCS_Prot/Assets/Scripts/Classes/InputManager.cs
old mode 100755
new mode 100644
index 20fb32b36f53f1eb8fe3145bd06b8312502471c3..8317860e88cfe4bc653dea55cc29056790712340
--- a/TTCS_Prot/Assets/Scripts/Classes/InputManager.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/InputManager.cs
@@ -54,7 +54,7 @@ public class InputManager : MonoBehaviour
if (_selector.selectedDetectives.Count == 1)
{
Vector3 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
- mousePos.y = 0;
+ mousePos.y = 0.3f;
for(int i = 0; i < _witnesses.Count; i++)
{
@@ -67,6 +67,7 @@ public class InputManager : MonoBehaviour
return;
}
}
+ mousePos.y = 0.0f;
for (int i = 0; i < _rooms.Count; i++)
{
diff --git a/TTCS_Prot/Assets/example.meta b/TTCS_Prot/Assets/example.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2cb0640099e2dab509e40ee97df215b3b2419557
--- /dev/null
+++ b/TTCS_Prot/Assets/example.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1c66af92d50784d799545bc86c9b8590
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/TTCS_Prot/ProjectSettings/DynamicsManager.asset b/TTCS_Prot/ProjectSettings/DynamicsManager.asset
old mode 100755
new mode 100644
index d2855a33d744566fdb47be677e15d8c9f74f13c7..82b7e3164e79aeeadf3d4ee08978098553d40524
--- a/TTCS_Prot/ProjectSettings/DynamicsManager.asset
+++ b/TTCS_Prot/ProjectSettings/DynamicsManager.asset
@@ -1,29 +1,33 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!55 &1
-PhysicsManager:
- m_ObjectHideFlags: 0
- serializedVersion: 7
- m_Gravity: {x: 0, y: -9.81, z: 0}
- m_DefaultMaterial: {fileID: 0}
- m_BounceThreshold: 2
- m_SleepThreshold: 0.005
- m_DefaultContactOffset: 0.01
- m_DefaultSolverIterations: 6
- m_DefaultSolverVelocityIterations: 1
- m_QueriesHitBackfaces: 0
- m_QueriesHitTriggers: 1
- m_EnableAdaptiveForce: 0
- m_ClothInterCollisionDistance: 0
- m_ClothInterCollisionStiffness: 0
- m_ContactsGeneration: 1
- m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
- m_AutoSimulation: 1
- m_AutoSyncTransforms: 1
- m_ClothInterCollisionSettingsToggle: 0
- m_ContactPairsMode: 0
- m_BroadphaseType: 0
- m_WorldBounds:
- m_Center: {x: 0, y: 0, z: 0}
- m_Extent: {x: 250, y: 250, z: 250}
- m_WorldSubdivisions: 8
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!55 &1
+PhysicsManager:
+ m_ObjectHideFlags: 0
+ serializedVersion: 10
+ m_Gravity: {x: 0, y: -9.81, z: 0}
+ m_DefaultMaterial: {fileID: 0}
+ m_BounceThreshold: 2
+ m_SleepThreshold: 0.005
+ m_DefaultContactOffset: 0.01
+ m_DefaultSolverIterations: 6
+ m_DefaultSolverVelocityIterations: 1
+ m_QueriesHitBackfaces: 0
+ m_QueriesHitTriggers: 1
+ m_EnableAdaptiveForce: 0
+ m_ClothInterCollisionDistance: 0
+ m_ClothInterCollisionStiffness: 0
+ m_ContactsGeneration: 1
+ m_LayerCollisionMatrix: fffdfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ m_AutoSimulation: 1
+ m_AutoSyncTransforms: 1
+ m_ReuseCollisionCallbacks: 0
+ m_ClothInterCollisionSettingsToggle: 0
+ m_ContactPairsMode: 0
+ m_BroadphaseType: 0
+ m_WorldBounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 250, y: 250, z: 250}
+ m_WorldSubdivisions: 8
+ m_FrictionType: 0
+ m_EnableEnhancedDeterminism: 0
+ m_EnableUnifiedHeightmaps: 1
diff --git a/TTCS_Prot/ProjectSettings/InputManager.asset b/TTCS_Prot/ProjectSettings/InputManager.asset
old mode 100755
new mode 100644
index 9681a16f2877d47f5861770487d8bc491b361fd9..e20af7a01dcd85ccca9b60e326358a76df3071a7
--- a/TTCS_Prot/ProjectSettings/InputManager.asset
+++ b/TTCS_Prot/ProjectSettings/InputManager.asset
@@ -293,3 +293,35 @@ InputManager:
type: 0
axis: 0
joyNum: 0
+ - serializedVersion: 3
+ m_Name: CameraVertical
+ descriptiveName:
+ descriptiveNegativeName:
+ negativeButton: down
+ positiveButton: up
+ altNegativeButton:
+ altPositiveButton:
+ gravity: 1000
+ dead: 0.001
+ sensitivity: 1000
+ snap: 0
+ invert: 0
+ type: 0
+ axis: 0
+ joyNum: 0
+ - serializedVersion: 3
+ m_Name: CameraHorizontal
+ descriptiveName:
+ descriptiveNegativeName:
+ negativeButton: left
+ positiveButton: right
+ altNegativeButton:
+ altPositiveButton:
+ gravity: 1000
+ dead: 0.001
+ sensitivity: 1000
+ snap: 0
+ invert: 0
+ type: 0
+ axis: 0
+ joyNum: 0
diff --git a/TTCS_Prot/ProjectSettings/NavMeshAreas.asset b/TTCS_Prot/ProjectSettings/NavMeshAreas.asset
old mode 100755
new mode 100644
index adc82460adb62452667e3ee54d63f1b9d84be260..1799c6740e433487452600ec903a469d1e11f8e9
--- a/TTCS_Prot/ProjectSettings/NavMeshAreas.asset
+++ b/TTCS_Prot/ProjectSettings/NavMeshAreas.asset
@@ -74,7 +74,7 @@ NavMeshProjectSettings:
- serializedVersion: 2
agentTypeID: 0
agentRadius: 0.2
- agentHeight: 2
+ agentHeight: 1
agentSlope: 45
agentClimb: 0.75
ledgeDropHeight: 0
diff --git a/TTCS_Prot/ProjectSettings/TagManager.asset b/TTCS_Prot/ProjectSettings/TagManager.asset
index b3a7163f680a981a0aa1cc31c1c12bb3a9d9035a..851809f520479bce19c29889f7f21aee5cf04355 100644
--- a/TTCS_Prot/ProjectSettings/TagManager.asset
+++ b/TTCS_Prot/ProjectSettings/TagManager.asset
@@ -17,7 +17,7 @@ TagManager:
-
-
- PostProcessing
- -
+ - PlaySpace
-
-
-