Skip to content

Commit 1415211

Browse files
jackbrookesjackbrookes
committed
manual start example
1 parent 1afa335 commit 1415211

File tree

99 files changed

+22140
-18776
lines changed

Some content is hidden

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

99 files changed

+22140
-18776
lines changed

‎Assets/UXF/Examples/1_Basic.meta renamed to ‎Assets/UXF/Examples/1_Basic_SpaceShuttle.meta

File renamed without changes.

‎Assets/UXF/Examples/1_Basic_SpaceShuttle/BasicExample.unity

Lines changed: 6462 additions & 0 deletions
Large diffs are not rendered by default.

‎Assets/UXF/Examples/1_Basic/BasicExample.unity.meta renamed to ‎Assets/UXF/Examples/1_Basic_SpaceShuttle/BasicExample.unity.meta

File renamed without changes.

‎Assets/UXF/Examples/1_Basic/Example_BasicExampleScript.cs renamed to ‎Assets/UXF/Examples/1_Basic_SpaceShuttle/Example_BasicExampleScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ of an ExperimentSession component as .settings */
4444

4545
// retrieve the n_trials setting, which was loaded from our .json file into our session settings
4646
// if we dont supply a settings profile (e.g. when running in a web browser, or Oculus Quest) it will revert to valueIfNotFound (10)
47-
int numMainTrials = session.settings.GetInt("n_trials", valueIfNotFound: 2);
47+
int numMainTrials = session.settings.GetInt("n_trials", valueIfNotFound: 10);
4848
// create the block
4949
Block mainBlock = session.CreateBlock(numMainTrials); // block 2
5050

‎Assets/UXF/Examples/1_Basic/Example_BasicExampleScript.cs.meta renamed to ‎Assets/UXF/Examples/1_Basic_SpaceShuttle/Example_BasicExampleScript.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/AdvancedExample.unity renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/AdvancedExample.unity

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/AdvancedExample.unity.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/AdvancedExample.unity.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_CursorFollower.cs renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_CursorFollower.cs

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_CursorFollower.cs.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_CursorFollower.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_ExperimentGenerator.cs renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_ExperimentGenerator.cs

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_ExperimentGenerator.cs.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_ExperimentGenerator.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_InstructionsController.cs renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_InstructionsController.cs

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_InstructionsController.cs.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_InstructionsController.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_StartBlockController.cs renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_StartBlockController.cs

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_StartBlockController.cs.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_StartBlockController.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_TargetController.cs renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_TargetController.cs

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_TargetController.cs.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_TargetController.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_TargetManager.cs renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_TargetManager.cs

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_TargetManager.cs.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_TargetManager.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_TaskManager.cs renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_TaskManager.cs

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Scripts/Example_TaskManager.cs.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Scripts/Example_TaskManager.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Sprites.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Sprites.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Sprites/Cursor.png renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Sprites/Cursor.png

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Sprites/Cursor.png.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Sprites/Cursor.png.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Sprites/Square.png renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Sprites/Square.png

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Sprites/Square.png.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Sprites/Square.png.meta

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Sprites/Target.png renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Sprites/Target.png

File renamed without changes.

‎Assets/UXF/Examples/2_Advanced/Sprites/Target.png.meta renamed to ‎Assets/UXF/Examples/2_Advanced_MoveToTarget/Sprites/Target.png.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleGray.mat renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleGray.mat

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleGray.mat.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleGray.mat.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleGreen.mat renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleGreen.mat

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleGreen.mat.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleGreen.mat.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleRed.mat renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleRed.mat

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleRed.mat.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleRed.mat.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleSky 1.mat renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleSky 1.mat

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleSky 1.mat.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleSky 1.mat.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleSky 2.mat renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleSky 2.mat

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleSky 2.mat.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleSky 2.mat.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleSky 3.mat renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleSky 3.mat

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleSky 3.mat.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleSky 3.mat.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleWhite.mat renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleWhite.mat

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/ExampleWhite.mat.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/ExampleWhite.mat.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/HighFriction.physicMaterial renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/HighFriction.physicMaterial

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Materials/HighFriction.physicMaterial.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Materials/HighFriction.physicMaterial.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models/BallMat.mat renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models/BallMat.mat

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models/BallMat.mat.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models/BallMat.mat.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models/CHAHIN_BASKETBALL.mtl renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models/CHAHIN_BASKETBALL.mtl

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models/CHAHIN_BASKETBALL.mtl.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models/CHAHIN_BASKETBALL.mtl.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models/CHAHIN_BASKETBALL.obj renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models/CHAHIN_BASKETBALL.obj

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models/CHAHIN_BASKETBALL.obj.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models/CHAHIN_BASKETBALL.obj.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models/CHAHIN_BASKETBALL_TEXTURE.jpg renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models/CHAHIN_BASKETBALL_TEXTURE.jpg

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models/CHAHIN_BASKETBALL_TEXTURE.jpg.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models/CHAHIN_BASKETBALL_TEXTURE.jpg.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models/CREDIT.txt renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models/CREDIT.txt

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Models/CREDIT.txt.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Models/CREDIT.txt.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/MultiSceneExample.unity renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/MultiSceneExample.unity

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/MultiSceneExample.unity.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/MultiSceneExample.unity.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/OtherScenes.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/OtherScenes/ReactionExample.unity renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ReactionExample.unity

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/OtherScenes/ReactionExample.unity.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ReactionExample.unity.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/OtherScenes/ShootingExample.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ShootingExample.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/OtherScenes/ShootingExample.unity renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ShootingExample.unity

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/OtherScenes/ShootingExample.unity.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ShootingExample.unity.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/OtherScenes/ShootingExample/LightingData.asset renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ShootingExample/LightingData.asset

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/OtherScenes/ShootingExample/LightingData.asset.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ShootingExample/LightingData.asset.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/OtherScenes/ShootingExample/ReflectionProbe-0.exr renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ShootingExample/ReflectionProbe-0.exr

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/OtherScenes/ShootingExample/ReflectionProbe-0.exr.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ShootingExample/ReflectionProbe-0.exr.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Prefabs.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Prefabs.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_MultiSceneExperimentGenerator.cs renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_MultiSceneExperimentGenerator.cs

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_MultiSceneExperimentGenerator.cs.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_MultiSceneExperimentGenerator.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_ReactionStim.cs renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_ReactionStim.cs

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_ReactionStim.cs.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_ReactionStim.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_ReactionTask.cs renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_ReactionTask.cs

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_ReactionTask.cs.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_ReactionTask.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_ShootTarget.cs renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_ShootTarget.cs

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_ShootTarget.cs.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_ShootTarget.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_Shooter.cs renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_Shooter.cs

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_Shooter.cs.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_Shooter.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_ShootingTask.cs renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_ShootingTask.cs

File renamed without changes.

‎Assets/UXF/Examples/3_MultiScene/Scripts/Example_ShootingTask.cs.meta renamed to ‎Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_ShootingTask.cs.meta

File renamed without changes.

‎Assets/UXF/Examples/4_ManualStartup/Example_InitialiseSessionManually.cs

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

0 commit comments

Comments
 (0)