David Williams 20576d7a6f Merge branch 'develop' into feature/cubiquity-version ...

Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl

2014-01-28 23:39:22 +01:00

..

ErrorHandling.cpp

Separated logging code into different .cpp/.h files.

2014-01-24 15:21:59 +01:00

Logging.cpp

Separated logging code into different .cpp/.h files.

2014-01-24 15:21:59 +01:00

MarchingCubesTables.cpp

Change the types of the edgeTable and triTable

2013-07-04 19:35:09 +01:00

MinizWrapper.cpp

Added some comments.

2013-10-03 16:56:14 +02:00

RandomUnitVectors.cpp

Renamed 'PolyVoxImpl' to just 'Impl'.

2012-11-05 17:00:09 +01:00

RandomVectors.cpp

Renamed 'PolyVoxImpl' to just 'Impl'.

2012-11-05 17:00:09 +01:00

Timer.cpp

Replaced some more logging commands with macros which can be compiled out.

2014-01-28 23:15:24 +01:00

Utility.cpp

Making Cubiquity version of PolyVox more closely match develop version.

2013-08-09 20:32:20 +02:00