Merge branch 'master' of https://github.com/immersivecognition/unity-experiment-framework

Author: jackbrookes

Assets/UXF/Scripts/UI/Form/FormElementController.cs

@@ -85,6 +85,12 @@ public void DisplayFault()
             Invoke("ResetTitle", 5);
         }
 
+        public void DisplayFault(string message)
+        {
+            title.text = string.Format("{0} <b><color=red>(!) Error: {1}</color></b>", originalTitle, message);
+            Invoke("ResetTitle", 8);
+        }
+
         public void ResetTitle()
         {
             title.text = originalTitle;

Assets/UXF/Scripts/UI/ParticipantListSelection.cs

@@ -214,7 +214,7 @@ public string Finish()
             // check if not empty
             if (ppid.Replace(" ", string.Empty) == string.Empty)
             {
-                form.ppidElement.controller.DisplayFault();
+                form.ppidElement.controller.DisplayFault("Invalid participant name!");
                 throw new Exception("Invalid participant name!");
             }
 
@@ -226,7 +226,7 @@ public string Finish()
                 DataRow searchResultRow = ppList.AsEnumerable().FirstOrDefault(r => r.Field<string>("ppid") == ppid);
                 if (searchResultRow != null)
                 {
-                    form.ppidElement.controller.DisplayFault();
+                    form.ppidElement.controller.DisplayFault("Participant ID already exists!");
                     throw new Exception("Participant ID already exists! Enter a new ID or select the existing participant from the dropdown.");
                 }
                 // else new id has been entered

README.md

@@ -16,6 +16,7 @@ A set of components which simplify human behaviour experiments developed in the
 If you have developed a project using UXF please [let me know](http://twitter.com/jackbrookes)! 
 
 **Contents**
+- [Built with UXF](#built-with-uxf)
 - [Get started](#get-started)
 - [Features](#features)
   - [Programming style](#programming-style)
@@ -28,9 +29,20 @@ If you have developed a project using UXF please [let me know](http://twitter.co
 - [Example](#example)
 - [Development](#development)
 - [Documentation](#documentation)
-- [Feedback](#feedback)
+- [Tutorial: Building an experiment with UXF](#tutorial-building-an-experiment-with-uxf)
 - [Related packages](#related-packages)
 
+## Built with UXF
+
+
+<p align="center">
+  <a href="https://immersivecognition.github.io/projects/virtual-reality-experiments/" target="_blank">
+  <img src="media/built-with-uxf.jpg">
+  </a>
+  
+  Click the banner above to see some of our experiments that have been built with UXF.
+</p>
+
 ## Get started
 0. Read over this Readme and the [paper](https://doi.org/10.3758/s13428-019-01242-0) to understand UXF.
 
@@ -181,18 +193,11 @@ This project is developed under Unity 2017.4.2f1 but should work on all recent v
 
 ## Documentation
 
-Visit the [Wiki](https://github.com/immersivecognition/unity-experiment-framework/wiki)
-
-## Feedback
-
-<p align="center">
-  <a href ="https://forms.gle/rrySNPNPvdMvtTM46">
-  <img src="media/survey-ss.png">
-  </a>
-</p>
+Visit the [Wiki](https://github.com/immersivecognition/unity-experiment-framework/wiki) for full documentation.
 
-Please fill out the anonymous [UXF feedback form](https://forms.gle/rrySNPNPvdMvtTM46)
+## Tutorial: Building an experiment with UXF
 
+A full tutorial for building an experiment with UXF is available [here](https://immersivecognition.github.io/uxf-tutorial/).
 
 ## Related packages