Stephen Birarda 340248ac43 resolve conflicts on merge with upstream master		2014-02-21 15:16:15 -08:00
..
audio	fix logging target-name extra characters	2014-02-20 12:02:23 -08:00
avatars	Merge pull request #2043 from birarda/metavoxel-fix	2014-02-21 10:24:29 -08:00
metavoxels	fix logging target-name extra characters	2014-02-20 12:02:23 -08:00
octree	ping inactive nodes in conjunction with domain server check in	2014-02-07 14:06:42 -08:00
particles	use SharedNodePointer in place of Node where appropriate	2014-02-06 14:58:03 -08:00
voxels	use SharedNodePointer in place of Node where appropriate	2014-02-06 14:58:03 -08:00
Agent.cpp	resolve conflicts on merge with upstream master	2014-02-21 15:16:15 -08:00
Agent.h	fixes for scripted avatars, closes #2033	2014-02-19 16:55:24 -08:00
AssignmentClient.cpp	resolve conflicts on merge with upstream master	2014-02-21 15:16:15 -08:00
AssignmentClient.h	changes to AssignmentClient architecture to fix fork behaviour	2014-01-10 16:59:01 -08:00
AssignmentClientMonitor.cpp	fix logging target-name extra characters	2014-02-20 12:02:23 -08:00
AssignmentClientMonitor.h	changes to AssignmentClient architecture to fix fork behaviour	2014-01-10 16:59:01 -08:00
AssignmentFactory.cpp	move octree-server libs to assignment-client	2014-02-05 16:04:23 -08:00
AssignmentFactory.h	packet header changes and beginning of conversion to QByteArray	2014-01-28 10:36:08 -08:00
main.cpp	changes to AssignmentClient architecture to fix fork behaviour	2014-01-10 16:59:01 -08:00