overte-thingvellir/libraries
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
..
animation
audio
avatars Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
embedded-webserver
entities Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
entities-renderer Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
environment more voxelEctomy 2014-12-30 19:58:04 -08:00
fbx more voxelEctomy 2014-12-30 19:58:04 -08:00
gpu
metavoxels Scale back on first dropped packet, use Qt send/receive buffer size options 2014-12-30 12:30:38 -08:00
model
networking more voxelEctomy 2014-12-30 20:35:21 -08:00
octree Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
physics easier to read Bullet to GLM conversions and back 2014-12-30 13:15:57 -08:00
render-utils Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
script-engine more voxelEctomy 2014-12-30 19:58:04 -08:00
shared