Worked on normal mapping, plus fullscreen mode, but stubbed out win32 fullscreen
Merge branch 'develop' of git://github.com/adam4813/Sigma into planets
Merged upstream changes
working on skybox rendering
Fixed merges
Working on converting to sc format
Merged upstream
Fixed merge conflicts and issues with VS2012 lack of c++11 compatibility
Removed dependency of SDL from cube_sphere, however crashes when using Win32
Fixed merge, finished implementing star box
Moved shaders so they could be added to repo, adjusted relative paths accordingly
Added cullface options to mesh
Fixed OBJ rendering to properly collate normals, colors and uvs
Working on tweaking movement speeds
Merged