Zach Pomerantz 15ff106947 Merge pull request #6917 from AndrewMeadows/cf-empty-model-url ... fix crash for empty modelUrl in ModelEntityItem		2016-01-25 16:09:00 -08:00
..
animation	Hooked up fly animation to json and Rig	2016-01-22 13:47:09 -08:00
audio
audio-client
auto-updater
avatars	oops	2016-01-19 15:00:33 -08:00
controllers
display-plugins
embedded-webserver	Pospone logging of the shutdown reason	2016-01-21 17:54:10 -08:00
entities	Merge pull request #6919 from ctrlaltdavid/20790	2016-01-25 15:12:10 -08:00
entities-renderer	fix crash for emtpy modelUrl in ModelEntityItem	2016-01-22 22:01:30 -08:00
fbx	Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque"	2016-01-22 11:51:02 -08:00
gl	More cleanup & menu fixing	2016-01-20 11:23:56 -08:00
gpu	Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows	2016-01-22 10:03:06 -08:00
input-plugins
model	Yet more atmosphere removal	2016-01-21 15:15:17 -08:00
model-networking	Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque"	2016-01-22 11:51:02 -08:00
networking	Merge pull request #6899 from birarda/fix-go-home	2016-01-21 21:29:24 -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	Merge pull request #6895 from hyperlogic/tony/hmd-recenter-on-rotation	2016-01-22 14:07:40 -08:00
plugins
procedural
recording
render	Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows	2016-01-22 10:03:06 -08:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-01-22 18:31:30 -08:00
script-engine	Yet more atmosphere removal	2016-01-21 15:15:17 -08:00
shared	Button prefs and conditionally enabled prefs	2016-01-22 19:06:30 -08:00
ui	Break up preferences dialogs	2016-01-23 23:11:41 -08:00