Stephen Birarda 11f3161029 resolve conflicts on merge with upstream/master		2015-02-04 10:38:05 -08:00
..
audio	Name threads	2015-01-31 00:50:12 -08:00
avatars	Changed NodeList::getInstance() calls to use the DM	2014-12-17 15:28:25 -08:00
entities	Changed NodeList::getInstance() calls to use the DM	2014-12-17 15:28:25 -08:00
metavoxels	Back to JPG compression for heightfield colors.	2015-01-19 14:59:28 -08:00
octree	Name threads	2015-01-31 00:50:12 -08:00
Agent.cpp	resolve conflicts on merge with upstream/master	2015-02-02 17:10:13 -08:00
Agent.h	Use DM to access AvatarHashMap/Manager	2015-01-23 11:50:27 -08:00
AssignmentClient.cpp	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-28 13:13:32 -08:00
AssignmentClient.h	have ShutdownEventListener handle WM_CLOSE or SIGTERM	2014-12-11 10:21:11 -08:00
AssignmentClientMonitor.cpp	have ShutdownEventListener handle WM_CLOSE or SIGTERM	2014-12-11 10:21:11 -08:00
AssignmentClientMonitor.h	have ShutdownEventListener handle WM_CLOSE or SIGTERM	2014-12-11 10:21:11 -08:00
AssignmentFactory.cpp	first major pass at voxelEctomy	2014-12-30 18:08:58 -08:00
AssignmentFactory.h
AssignmentThread.cpp
AssignmentThread.h
main.cpp	move Logging to LogHandler	2014-10-28 13:59:23 -07:00