overte-thingvellir/libraries/entities-renderer/src
ZappoMan 9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
..
EntityTreeRenderer.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
EntityTreeRenderer.h Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
RenderableBoxEntityItem.cpp move all glut-ness to geometry cache 2014-12-18 11:20:17 -08:00
RenderableBoxEntityItem.h move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
RenderableLightEntityItem.cpp move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
RenderableLightEntityItem.h move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
RenderableModelEntityItem.cpp fixing derived classes to use new EntityItem API 2014-12-18 11:41:20 -08:00
RenderableModelEntityItem.h fixing derived classes to use new EntityItem API 2014-12-18 11:41:20 -08:00
RenderableSphereEntityItem.cpp move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
RenderableSphereEntityItem.h move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
RenderableTextEntityItem.cpp more work on removing immediate mode GL_QUADS 2014-12-23 09:50:38 -08:00
RenderableTextEntityItem.h move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00