David Williams d9da93b6c0 Merge branch 'develop' into feature/opengl ...

Conflicts:
	examples/Basic/CMakeLists.txt
	examples/Basic/OpenGLWidget.cpp
	examples/Basic/OpenGLWidget.h
	include/PolyVox/Impl/Timer.h

2015-02-08 20:49:25 +01:00

..

Basic

Merge branch 'develop' into feature/opengl

2015-02-08 20:49:25 +01:00

common

Moved all headers from 'PolyVoxCore' to 'PolyVox', as we no longer have the core/util distinction.

2015-02-07 17:26:36 +01:00

DecodeOnGPU

Moved all headers from 'PolyVoxCore' to 'PolyVox', as we no longer have the core/util distinction.

2015-02-07 17:26:36 +01:00

OpenGL

Moved all headers from 'PolyVoxCore' to 'PolyVox', as we no longer have the core/util distinction.

2015-02-07 17:26:36 +01:00

Paging

Moved all headers from 'PolyVoxCore' to 'PolyVox', as we no longer have the core/util distinction.

2015-02-07 17:26:36 +01:00

Python

Normalized line endings

2014-09-25 22:38:01 +02:00

SmoothLOD

Moved all headers from 'PolyVoxCore' to 'PolyVox', as we no longer have the core/util distinction.

2015-02-07 17:26:36 +01:00

CMakeLists.txt

Reorganise the CMake scripts to make sure the core library is independent

2014-12-10 15:53:25 +00:00