Clément Brisset 84bd1aeedf Merge pull request #4283 from birarda/master ... fix for ASI playSound called from same thread		2015-02-16 09:12:59 -08:00
..
animation	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
audio	change ScriptCache and SoundCache to derive from Dependency	2015-02-13 15:33:41 -08:00
audio-client	Merge pull request #4281 from Atlante45/fix_mute_environnement	2015-02-16 09:11:47 -08:00
avatars	specify QScriptable include under QtScript	2015-02-04 11:08:26 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	Merge pull request #4280 from AndrewMeadows/inertia	2015-02-13 17:11:56 -08:00
entities-renderer	fix the quad color being broken after rendering text	2015-02-11 15:50:04 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	Merge pull request #4256 from samcake/temp1	2015-02-13 10:49:53 -08:00
gpu	Merge pull request #4256 from samcake/temp1	2015-02-13 10:49:53 -08:00
metavoxels	change ScriptCache and SoundCache to derive from Dependency	2015-02-13 15:33:41 -08:00
model	Clean up comments	2015-02-09 18:02:34 -08:00
networking	fix audio cleanup and close action in Application	2015-02-12 13:35:22 -08:00
octree	Merge pull request #4282 from ZappoMan/bugfix	2015-02-13 16:54:25 -08:00
physics	don't create shape for SHAPE_TYPE_NONE	2015-02-11 08:43:55 -08:00
render-utils	Merge pull request #4256 from samcake/temp1	2015-02-13 10:49:53 -08:00
script-engine	use direct connection to ensure injector is stopped	2015-02-13 11:52:51 -08:00
shared	Merge pull request #4256 from samcake/temp1	2015-02-13 10:49:53 -08:00