Skip to content

Commit 8b516b9

Browse files
committed
Last tweeks before next branch
1 parent 91cb7de commit 8b516b9

File tree

4 files changed

+7
-99
lines changed

4 files changed

+7
-99
lines changed

Assets/_Project/Animations/PlayerAnimController.controller

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ AnimatorStateTransition:
145145
m_Mute: 0
146146
m_IsExit: 0
147147
serializedVersion: 3
148-
m_TransitionDuration: 0
148+
m_TransitionDuration: 0.2
149149
m_TransitionOffset: 0
150150
m_ExitTime: 1
151151
m_HasExitTime: 0
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d82bc749e12d4fbc9ec752998f6e10e386efeb50d07e6626021f1a712a52a15b
3-
size 33016
2+
oid sha256:aeb798d2af12e81b9e4a18303ef23b07c2647bd0ba35fc640835578940188835
3+
size 32997

Assets/_Project/Scenes/tally-viz.unity

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -742,101 +742,6 @@ Transform:
742742
m_Father: {fileID: 1339374950}
743743
m_RootOrder: 0
744744
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
745-
--- !u!1 &1596470882
746-
GameObject:
747-
m_ObjectHideFlags: 0
748-
m_CorrespondingSourceObject: {fileID: 0}
749-
m_PrefabInstance: {fileID: 0}
750-
m_PrefabAsset: {fileID: 0}
751-
serializedVersion: 6
752-
m_Component:
753-
- component: {fileID: 1596470886}
754-
- component: {fileID: 1596470885}
755-
- component: {fileID: 1596470884}
756-
- component: {fileID: 1596470883}
757-
m_Layer: 0
758-
m_Name: Cube
759-
m_TagString: Untagged
760-
m_Icon: {fileID: 0}
761-
m_NavMeshLayer: 0
762-
m_StaticEditorFlags: 0
763-
m_IsActive: 1
764-
--- !u!65 &1596470883
765-
BoxCollider:
766-
m_ObjectHideFlags: 0
767-
m_CorrespondingSourceObject: {fileID: 0}
768-
m_PrefabInstance: {fileID: 0}
769-
m_PrefabAsset: {fileID: 0}
770-
m_GameObject: {fileID: 1596470882}
771-
m_Material: {fileID: 0}
772-
m_IsTrigger: 0
773-
m_Enabled: 1
774-
serializedVersion: 2
775-
m_Size: {x: 1, y: 1, z: 1}
776-
m_Center: {x: 0, y: 0, z: 0}
777-
--- !u!23 &1596470884
778-
MeshRenderer:
779-
m_ObjectHideFlags: 0
780-
m_CorrespondingSourceObject: {fileID: 0}
781-
m_PrefabInstance: {fileID: 0}
782-
m_PrefabAsset: {fileID: 0}
783-
m_GameObject: {fileID: 1596470882}
784-
m_Enabled: 1
785-
m_CastShadows: 1
786-
m_ReceiveShadows: 1
787-
m_DynamicOccludee: 1
788-
m_MotionVectors: 1
789-
m_LightProbeUsage: 1
790-
m_ReflectionProbeUsage: 1
791-
m_RayTracingMode: 2
792-
m_RayTraceProcedural: 0
793-
m_RenderingLayerMask: 1
794-
m_RendererPriority: 0
795-
m_Materials:
796-
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
797-
m_StaticBatchInfo:
798-
firstSubMesh: 0
799-
subMeshCount: 0
800-
m_StaticBatchRoot: {fileID: 0}
801-
m_ProbeAnchor: {fileID: 0}
802-
m_LightProbeVolumeOverride: {fileID: 0}
803-
m_ScaleInLightmap: 1
804-
m_ReceiveGI: 1
805-
m_PreserveUVs: 0
806-
m_IgnoreNormalsForChartDetection: 0
807-
m_ImportantGI: 0
808-
m_StitchLightmapSeams: 1
809-
m_SelectedEditorRenderState: 3
810-
m_MinimumChartSize: 4
811-
m_AutoUVMaxDistance: 0.5
812-
m_AutoUVMaxAngle: 89
813-
m_LightmapParameters: {fileID: 0}
814-
m_SortingLayerID: 0
815-
m_SortingLayer: 0
816-
m_SortingOrder: 0
817-
m_AdditionalVertexStreams: {fileID: 0}
818-
--- !u!33 &1596470885
819-
MeshFilter:
820-
m_ObjectHideFlags: 0
821-
m_CorrespondingSourceObject: {fileID: 0}
822-
m_PrefabInstance: {fileID: 0}
823-
m_PrefabAsset: {fileID: 0}
824-
m_GameObject: {fileID: 1596470882}
825-
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
826-
--- !u!4 &1596470886
827-
Transform:
828-
m_ObjectHideFlags: 0
829-
m_CorrespondingSourceObject: {fileID: 0}
830-
m_PrefabInstance: {fileID: 0}
831-
m_PrefabAsset: {fileID: 0}
832-
m_GameObject: {fileID: 1596470882}
833-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
834-
m_LocalPosition: {x: 7.640972, y: 8.279563, z: -29.03}
835-
m_LocalScale: {x: 1, y: 1, z: 1}
836-
m_Children: []
837-
m_Father: {fileID: 0}
838-
m_RootOrder: 5
839-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
840745
--- !u!1001 &1867092989
841746
PrefabInstance:
842747
m_ObjectHideFlags: 0

Assets/_Project/Scripts/Effects/FaceCamera.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
public class FaceCamera : MonoBehaviour {
66

7+
// make a game object face the camera regardless of its parent transform
8+
79
Camera cam;
810

911
private void Awake ()
@@ -13,7 +15,8 @@ private void Awake ()
1315

1416
void Update ()
1517
{
16-
// turn on the Y axis to face face camera
18+
// turn on the Y axis to face camera
1719
transform.rotation = Quaternion.Euler (0, cam.transform.eulerAngles.y, 0);
1820
}
21+
1922
}

0 commit comments

Comments
 (0)