Skip to content

Commit 2316c89

Browse files
JFritJFrit
committed
Add UI that can be exclusively seen by the experimenter
1 parent 504e25e commit 2316c89

44 files changed

Lines changed: 2027 additions & 696 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Assets/Scenes/AttentionExperiment.unity‎

Lines changed: 1606 additions & 653 deletions
Large diffs are not rendered by default.

‎Assets/Scripts/ActiveLaserManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using UnityEngine;
1+
using ScriptableObjects.Variables;
2+
using UnityEngine;
23
using Valve.VR;
34

45
public class ActiveLaserManager : MonoBehaviour

Assets/Scripts/Events/StaircaseUpdateEvent.asset renamed to Assets/Scripts/Events/PercentageUpdate.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: a1c8a667491d67249a2d7658190cd7b1, type: 3}
13-
m_Name: StaircaseUpdateEvent
13+
m_Name: PercentageUpdate
1414
m_EditorClassIdentifier:

‎Assets/Scripts/Events/PercentageUpdate.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Scripts/Events/StaircaseUpdate.asset‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: a1c8a667491d67249a2d7658190cd7b1, type: 3}
13+
m_Name: StaircaseUpdate
14+
m_EditorClassIdentifier:

Assets/Scripts/Events/StaircaseUpdateEvent.asset.meta renamed to Assets/Scripts/Events/StaircaseUpdate.asset.meta

File renamed without changes.

‎Assets/Scripts/Events/TrialNumUpdate.asset‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: a1c8a667491d67249a2d7658190cd7b1, type: 3}
13+
m_Name: TrialNumUpdate
14+
m_EditorClassIdentifier:

‎Assets/Scripts/Events/TrialNumUpdate.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Scripts/FloatReference.cs‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Assets/Scripts/Pointer/Pointer.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using UnityEngine;
1+
using ScriptableObjects.Variables;
2+
using UnityEngine;
23
using Valve.VR;
34

45
public class Pointer : MonoBehaviour

0 commit comments

Comments
 (0)