Blobs

Stimuli folder, meet blobs. Blobs, stimuli folder.
Revert "Blobs"

This reverts commit 5ddd1ea3ea7768ca56c1847e2724752781439ffe.
Un-Revert Blobs

Mistakenly thought Revert meant "go back to this commit" but actually it
means "undo this commit and make another one". This adds all the blobs
back.
Blob_1-8Colliders

Added folder, " Colliders(Nonmesh)". Folder contains prefabs for Blobs
1-8 with a hierarchy of game objects containing a number of prim
colliders approximating the shape. Note: colliders have not yet been
incorporated into a mesh.
RightClickDrag, Checkbox, PrefabLoad

-Added right click dragging on y axis. It's not perfect but it works for
now. It assumes each object is along the same Y plane (which isn't true)
-Added checkbox to decide the bounding box to use for random position
generation. The two options are preconfigured in the stimulus script
configuration
-Changed stimulus to be loaded from prefabs instead of already in-scene
objects. This helps performance and allows addition of arbitrary
stimulus with only minor memory footprint.

Still need to upload logger modifications and collision changes.
Logger Update

Added logger update to follow summary template and combine raw data into
one file.

Logging schema changed quite a bit. It could still use a little work and
currently doesn't output hold time.
7-31-14 Meeting Revisions

The following changes were made:
-Objects no longer flash when touched in phase 0
-The header of the summary file no longer contains a touch duration
field
-The Y coordinate is set to be random within a small range
-Each trial uses different stimuli (required logger changes to enforce
synchronization and appropriate memory allocation)
-Must move all objects before pressing space bar
-Add a vibro glove check box (currently only populates a PlayerPrefs...
doesn't do anything after that)
Merge remote-tracking branch 'origin/Aldi'

Conflicts:
	Assets/Colliders(NonMesh).meta
	Assets/Editor/QCAR/ImageTargetTextures.meta
	Assets/Materials/BasicColors.meta
	Assets/Materials/Holodeck.meta
	Assets/Scripts/LoadGUI.cs
	Assets/Textures/BasicColors.meta
Merging Conflicts

These were conflicted files I tried to fix.
Fixed identical blob

Blobs 9 and 16 were identical, so I generated another and replaced
Blob9. They should be ready for colliders now!
Added Syncable Kinect Demo
Merge remote-tracking branch 'origin/Aldi'
Merge branch 'master' of https://github.com/TheHolodeckProject/UnityHolodeckProject
Mesh Collider Assets

Created New Folder for All BlobMesh.asset and .asset.meta files. Mesh
Assets just need to be imported with Blob assets and an applied mesh
collider should take on the shape of the mesh asset. Note: All meshes
were generated with renders. These should probably be deleted so as not
to see the meshes.
Oculus+Kinect Integration

Virtual skeletons! Still needs some tweaking, but it's working.
BlobGrab

Changed the Oculus camera relative position to feel more natural. You
can finally grab blobs now! I'm going to fiddle with it and try to clean
up the code a bit.
Blob Prefabs

Added mesh colliders to the blobs and made them each into single game
objects... manually