Andrzej Kapolka 652be27910 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels ... Conflicts: interface/CMakeLists.txt interface/src/Application.cpp		2013-12-12 15:36:37 -08:00
..
audio	Merge remote-tracking branch 'upstream/master' into qt-for-portaudio	2013-12-04 14:20:44 -08:00
avatars	Basic joystick thrust/view drive behavior	2013-12-10 16:52:08 -08:00
metavoxels	More work on rendering voxels.	2013-12-12 15:14:19 -08:00
octree	adding better support for ParticleEditHandle to allow access to particles after being created	2013-12-11 17:46:18 -08:00
octree-server	removed some debugging	2013-12-12 11:07:13 -08:00
particle-server	removed some debugging	2013-12-12 11:07:13 -08:00
particles	added easy access to creating a ParticleEditHandle for a know particle ID	2013-12-12 12:40:38 -08:00
shared	first cut at creatorTokenIDs for creating particles	2013-12-11 15:38:52 -08:00
voxel-server	attempt to fix build buster	2013-12-04 21:29:25 -08:00
voxels	first cut at creatorTokenIDs for creating particles	2013-12-11 15:38:52 -08:00