Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/camera'
Browse files Browse the repository at this point in the history
  • Loading branch information
@pschichtel
pschichtel committed May 6, 2017
2 parents 2badbe0 + 4ad5be8 commit ba16f9c
Show file tree
Hide file tree
Showing 13 changed files with 272 additions and 217 deletions.
22 changes: 0 additions & 22 deletions Assets/BloodyTrailController.cs
View file

This file was deleted.

6 changes: 3 additions & 3 deletions Assets/Intro.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5563,13 +5563,13 @@ Transform:
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1824863377}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0.168, y: 0, z: -0.009}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2022806324}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
--- !u!64 &1824863379
MeshCollider:
m_ObjectHideFlags: 0
Expand Down
211 changes: 134 additions & 77 deletions Assets/Main.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2636,6 +2636,35 @@ NavMeshObstacle:
m_CarveOnlyStationary: 1
m_Center: {x: 0, y: 0, z: 0}
m_TimeToStationary: 0.5
--- !u!1 &271143977
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 271143978}
m_Layer: 0
m_Name: CameraWagon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &271143978
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 271143977}
m_LocalRotation: {x: 0, y: -0.96751094, z: 0, w: 0.25282934}
m_LocalPosition: {x: -21.53, y: 12, z: -21.65}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1659018933}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: -150.71, z: 0}
--- !u!1 &276570102
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5591,7 +5620,7 @@ Light:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 648355838}
m_Enabled: 1
m_Enabled: 0
serializedVersion: 8
m_Type: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
Expand Down Expand Up @@ -8190,6 +8219,106 @@ NavMeshObstacle:
m_CarveOnlyStationary: 1
m_Center: {x: 0, y: 0, z: 0}
m_TimeToStationary: 0.5
--- !u!1001 &1011077016
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.x
value: -21.53
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.y
value: 0.22
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.z
value: -21.65
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalRotation.y
value: -0.96751094
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalRotation.w
value: 0.25282934
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114250885029735736, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: bigDoor
value:
objectReference: {fileID: 1921971980}
- target: {fileID: 114250885029735736, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: bigDoorPlane
value:
objectReference: {fileID: 1669155117}
- target: {fileID: 114250885029735736, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: bigDoorSpotlight
value:
objectReference: {fileID: 633644554}
- target: {fileID: 114086110393262488, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: ReturnTo
value:
objectReference: {fileID: 676812400}
- target: {fileID: 114086110393262488, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: musicSource
value:
objectReference: {fileID: 1659018934}
- target: {fileID: 114082067899699048, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: cam
value:
objectReference: {fileID: 1659018932}
- target: {fileID: 4227552989078636, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.y
value: 4.38
objectReference: {fileID: 0}
- target: {fileID: 4227552989078636, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.z
value: -0.91
objectReference: {fileID: 0}
- target: {fileID: 4227552989078636, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.x
value: 0.36
objectReference: {fileID: 0}
- target: {fileID: 4756882635609012, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.y
value: 4.25
objectReference: {fileID: 0}
- target: {fileID: 4756882635609012, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.z
value: -1.03
objectReference: {fileID: 0}
- target: {fileID: 4756882635609012, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.x
value: 0.58
objectReference: {fileID: 0}
- target: {fileID: 1966998975797404, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
m_IsPrefabParent: 0
--- !u!1001 &1016719623
Prefab:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -13368,13 +13497,13 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1659018928}
m_LocalRotation: {x: 0.54256654, y: 0.07309499, z: -0.04746844, w: 0.8354792}
m_LocalPosition: {x: -24, y: 9.8, z: -23.8}
m_LocalRotation: {x: 0.5328763, y: 0, z: 0, w: 0.8461932}
m_LocalPosition: {x: 0, y: 0, z: -4.04}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_Father: {fileID: 271143978}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 66, y: 10, z: 0}
m_LocalEulerAnglesHint: {x: 64.4, y: 0, z: 0}
--- !u!82 &1659018934
AudioSource:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -15079,78 +15208,6 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 4.1, y: 1.41, z: 4.58}
m_Center: {x: -0.100000024, y: 0.6, z: 0.100000024}
--- !u!1001 &1831903544
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.x
value: -21.53
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.y
value: 0.22
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalPosition.z
value: -21.65
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalRotation.y
value: -0.96751094
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_LocalRotation.w
value: 0.25282934
objectReference: {fileID: 0}
- target: {fileID: 4862397493011524, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114082067899699048, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: cam
value:
objectReference: {fileID: 1659018932}
- target: {fileID: 114086110393262488, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: ReturnTo
value:
objectReference: {fileID: 676812400}
- target: {fileID: 114086110393262488, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: musicSource
value:
objectReference: {fileID: 1659018934}
- target: {fileID: 114250885029735736, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: bigDoor
value:
objectReference: {fileID: 1921971980}
- target: {fileID: 114250885029735736, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: bigDoorPlane
value:
objectReference: {fileID: 1669155117}
- target: {fileID: 114250885029735736, guid: 1c07278cd5d5249b7af2f5a1c846c058,
type: 2}
propertyPath: bigDoorSpotlight
value:
objectReference: {fileID: 633644554}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 1c07278cd5d5249b7af2f5a1c846c058, type: 2}
m_IsPrefabParent: 0
--- !u!1 &1837308607
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit ba16f9c

Please sign in to comment.