Merge pull request #6 from MartinFk/dev

Dev
MartinFk · Dec 1, 2020 · d700962 · d700962
2 parents a603c8b + 0412b1d
commit d700962
Show file tree

Hide file tree

Showing 7,023 changed files with 12 additions and 101,720 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,13 +2,13 @@
 #
 # Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
 #
-/[Ll]ibrary/
-/[Tt]emp/
-/[Oo]bj/
-/[Bb]uild/
-/[Bb]uilds/
-/[Ll]ogs/
-/[Mm]emoryCaptures/
+Questionnaires/Questionnaire/[Ll]ibrary/
+Questionnaires/Questionnaire/[Tt]emp/
+Questionnaires/Questionnaire/[Oo]bj/
+Questionnaires/Questionnaire/[Bb]uild/
+Questionnaires/Questionnaire/[Bb]uilds/
+Questionnaires/Questionnaire/[Ll]ogs/
+Questionnaires/Questionnaire/[Mm]emoryCaptures/
 
 # Asset meta data should only be ignored when the corresponding asset is also ignored
 !/[Aa]ssets/**/*.meta

diff --git a/Questionnaires/Questionnaire/Assets/Questionnaires/Data/Questions/IPQ Questionnaire b/Questionnaires/Questionnaire/Assets/Questionnaires/Data/Questions/IPQ Questionnaire
@@ -74,7 +74,7 @@
             },
             {
                "qId":"q5",
-               "qText":"I had a sense of acting in the virtual space; rather than operating something from outside...",
+               "qText":"I had a sense of acting in the virtual space, rather than operating something from outside...",
                "qMandatory":"true",
                "qOptions":[
                   "Fully disagree",
@@ -110,7 +110,7 @@
          "qData":[
             {
                "qId":"q7",
-               "qText":"How aware were you of the real world surrounding while navigating in the virtual world? (i.e. sounds; room temperature; other people; etc.)?",
+               "qText":"How aware were you of the real world surrounding while navigating in the virtual world? (i.e. sounds, room temperature, other people, etc.)?",
                "qMandatory":"true",
                "qOptions":[
                   "Extremely aware",

diff --git a/Questionnaires/Questionnaire/Assets/Questionnaires/Data/Questions/NASA_TLX b/Questionnaires/Questionnaire/Assets/Questionnaires/Data/Questions/NASA_TLX
@@ -62,7 +62,7 @@
             },
             {
                "qId":"g6",
-               "qText":"Frustration:  How insecure; discouraged; irritated; stressed; and annoyed were you?",
+               "qText":"Frustration:  How insecure, discouraged, irritated, stressed, and annoyed were you?",
                "qMandatory":"true",
                "qMin":"0",
                "qMinLabel":"Low",

diff --git a/Questionnaires/Questionnaire/Assets/Questionnaires/Data/Questions/questionnaire_example b/Questionnaires/Questionnaire/Assets/Questionnaires/Data/Questions/questionnaire_example
@@ -194,7 +194,7 @@
          "qData":[
             {
                "qId":"q1",
-               "qText":" If you don’t use VR frequently; what is keeping you from adopting this?",
+               "qText":" If you don’t use VR frequently, what is keeping you from adopting this?",
                "qMandatory":"true"
             }
          ]

diff --git a/Questionnaires/Questionnaire/Assets/Questionnaires/Prefabs/Types/checkboxGrid.meta b/Questionnaires/Questionnaire/Assets/Questionnaires/Prefabs/Types/checkboxGrid.meta
diff --git a/Questionnaires/Questionnaire/Assets/Questionnaires/Prefabs/Types/textInput.meta b/Questionnaires/Questionnaire/Assets/Questionnaires/Prefabs/Types/textInput.meta
diff --git a/Questionnaires/Questionnaire/Assets/Questionnaires/Scenes/SampleScene.unity b/Questionnaires/Questionnaire/Assets/Questionnaires/Scenes/SampleScene.unity
@@ -578,7 +578,7 @@ PrefabInstance:
     - target: {fileID: 8697000388396706263, guid: 93494b0f3d397d74ba1458871f004384,
         type: 3}
       propertyPath: Delimiter
-      value: ','
+      value: ;
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 93494b0f3d397d74ba1458871f004384, type: 3}

diff --git a/Questionnaires/Questionnaire/Library/APIUpdater/project-dependencies.graph b/Questionnaires/Questionnaire/Library/APIUpdater/project-dependencies.graph
diff --git a/Questionnaires/Questionnaire/Library/AnnotationManager b/Questionnaires/Questionnaire/Library/AnnotationManager
diff --git a/Questionnaires/Questionnaire/Library/AssetImportState b/Questionnaires/Questionnaire/Library/AssetImportState
diff --git a/Questionnaires/Questionnaire/Library/BuildPlayer.prefs b/Questionnaires/Questionnaire/Library/BuildPlayer.prefs
diff --git a/Questionnaires/Questionnaire/Library/BuildSettings.asset b/Questionnaires/Questionnaire/Library/BuildSettings.asset