Seth Alves 311e0cee67 Merge pull request #6820 from AndrewMeadows/collision-mask ... use "collidesWith" instead of "collisionMask"		2016-01-21 09:13:34 -08:00
..
animation	grab animation work	2016-01-07 19:36:57 -08:00
audio	remove some extra debug that isn't needed	2015-12-21 16:23:23 -07:00
audio-client
auto-updater
avatars	Merge remote-tracking branch 'upstream/master' into tony/soft-avatar-attachment-script	2016-01-07 16:14:52 -08:00
controllers	Allow input devices to break up their mappings into multiple files	2015-12-30 22:28:10 -08:00
display-plugins	CR feedback	2016-01-11 11:13:33 -08:00
embedded-webserver
entities	Merge pull request #6820 from AndrewMeadows/collision-mask	2016-01-21 09:13:34 -08:00
entities-renderer	try again to make this thread safe	2016-01-19 15:44:22 -08:00
environment
fbx
gl	More cleanup & menu fixing	2016-01-20 11:23:56 -08:00
gpu	Prepare shadowMap pipeline to debug in color	2016-01-14 12:56:28 -08:00
input-plugins	CR feedback	2016-01-11 11:07:07 -08:00
model	Optimize getVertexStream() by using a const&	2015-12-31 11:51:05 -08:00
model-networking	Merge pull request #6838 from ctrlaltdavid/20763	2016-01-15 17:02:14 -08:00
networking	fix bugs	2016-01-12 15:08:52 -08:00
octree	don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file	2016-01-18 16:50:26 -08:00
physics	namechange ignoreForCollisions --> collisionless	2016-01-19 09:06:17 -08:00
plugins	CR feedback	2016-01-11 11:07:07 -08:00
procedural	Render SKY_DOME when SKY_MAP tex is loading	2015-12-29 10:58:23 -08:00
recording
render	Externalize list sizing for render::cullItems	2016-01-20 12:39:27 -08:00
render-utils	Move ShoudRenderFunctor to render::CullFunctor	2016-01-19 11:24:11 -08:00
script-engine	Fix crash in Running Scripts when edit filter after highlighting script	2016-01-16 15:50:33 +13:00
shared	Merge pull request #6860 from zzmp/refactor/cull-functor	2016-01-20 14:25:42 -08:00
ui	More cleanup & menu fixing	2016-01-20 11:23:56 -08:00