OculusCheck

Working in lines to detect if the Oculus is plugged in, with a checkbox
in the LoadGUI
OculusCheck

So far I can’t get OVR.IsSensorPresent or OVR.IsDevicePresent to work
on Mac. Going to try running Unity on PC
Holodeck Room First Attempt

Asked Floksy to send me a new texture
Holodeck Environment Backgrounds

Trying out some different background textures for the virtual
environment
Holodeck Environment Progress

Got the textures to line up pretty nicely. Not perfect, but it'll do for
now. Waiting for another round of textures from Floksy.
Holodeck Environment Progress 2

Changed walls from cubes to planes, made it bigger, added new wall
textures from Floksy. Made her textures slightly transparent.
Reorganized Textures and Materials folder.
Holodeck Environment Progress 3

Added new patterns, got them lines up pretty nice. Trying out generating
cube skeleton prefabs at runtime.
Spatial N-Back progress

Figuring out how to generate and place objects at runtime. Transparency
seems to be working. Starting to think occlusion might be an issue,
though...
Holodeck Environment Tentatively Complete

I'm pretty happy with how it looks now. Next step: figure out a task.
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.