Howard Stearns e0a4909b22 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader		2015-05-01 13:32:05 -07:00
..
animation
audio	Move "Stereo Audio" option into developerMenu.js	2015-04-28 14:14:10 -07:00
audio-client	Move "Stereo Audio" option into developerMenu.js	2015-04-28 14:14:10 -07:00
avatars	Merge pull request #4722 from birarda/avatar-mixer-debug	2015-04-29 10:00:24 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	Merge pull request #4738 from huffman/entity-naming	2015-05-01 11:58:30 -07:00
entities-renderer	improve display of box and model entities when in simulator-id debug mode	2015-04-30 14:17:20 -07:00
environment
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into objReader	2015-05-01 09:51:15 -07:00
gpu	fix the bug with sahdows on Mac due to the fbo needing a colorbuffer even though it's not needed	2015-04-30 23:31:56 -07:00
model	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
networking	Add name property to entities	2015-05-01 08:40:24 -07:00
octree	Merge branch 'master' of github.com:highfidelity/hifi into json-skip-default-values	2015-04-30 11:28:33 -07:00
physics	merge upstream/master into andrew/bispinor	2015-04-28 15:18:02 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into objReader	2015-05-01 13:32:05 -07:00
script-engine	Merge pull request #4721 from ctrlaltdavid/20514	2015-04-28 20:44:09 -07:00
shared	don't save default values in json file	2015-04-30 11:28:27 -07:00
ui	Fix crash cause when Menu::instance() is before offscreen ui startup	2015-04-27 22:58:09 -07:00