Suo
Merge branch 'master' of https://github.com/clucasa/Olympus

Conflicts:
	Olympus.suo
	Olympus/Object.cpp
	Olympus/Object.h
	Olympus/RenderManager.cpp
	Olympus/RenderManager.h
	Olympus/models.hlsl
	README.md
Huge terrain fbx! plus LOD apex stuff
Box Shooter kinda works. Apex LOD. Fixed texture wrapping
Some libraries
Merge branch 'master' of https://github.com/clucasa/Olympus
Fixed cube mapping, box shooter attached to controller
Merge branch 'master' of https://github.com/clucasa/Olympus
FPS, camera position, and crosshairs printing on screen.
Merge branch 'master' of https://github.com/clucasa/Olympus
Added cudaContextManager to physx scene. MASSIVE fps boost! Physx objects are much much smoother too.
Working on clothing. Not much progress to report
modified the emitters to spew more particles that last longer
Cloth almost loaded....
Merged Chris's Materials. Waiting to merge shadows until fixed. Weird cloth problems.
Merged Chris's Materials. Waiting to merge shadows until fixed. Weird cloth problems.
To get to render: fix vertex buffer and index buffers, create corresponding shader, draw
cool
Merge branch 'master' of https://github.com/clucasa/Olympus

Conflicts:
	Olympus.suo
	Olympus/ApexParticles.cpp
	Olympus/Media/Textures/Thumbs.db
	Olympus/RenderManager.cpp
Merged toggles, improved point lights, added torches