Andrew Meadows af3fae7bbf Merge upsteam master into current project (experimental hand paddles) ... Conflicts: interface/src/avatar/Avatar.cpp libraries/avatars/src/AvatarData.cpp		2014-01-14 16:39:46 -08:00
..
audio	Merge remote-tracking branch 'upstream/master' into nodelist-container	2014-01-14 16:08:58 -08:00
avatars	Merge upsteam master into current project (experimental hand paddles)	2014-01-14 16:39:46 -08:00
metavoxels	Fix (hopefully) for warning on Windows build.	2014-01-13 15:02:46 -08:00
octree	foreach spacing and reference repairs	2014-01-14 15:54:09 -08:00
octree-server	properly emit signal on silent node removal	2014-01-14 10:28:41 -08:00
particle-server	removed some debugging	2013-12-12 11:07:13 -08:00
particles	Merge upsteam master into current project (experimental hand paddles)	2014-01-14 16:39:46 -08:00
script-engine	use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces	2014-01-04 03:16:47 -08:00
shared	Merge upsteam master into current project (experimental hand paddles)	2014-01-14 16:39:46 -08:00
voxel-server	attempt to fix build buster	2013-12-04 21:29:25 -08:00
voxels	resolve conflicts on merge with upstream master	2014-01-14 16:09:12 -08:00