Seth Alves 76df582a6c Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting		2015-12-21 14:29:32 -08:00
..
animation	Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix	2015-12-18 14:16:35 -08:00
audio
audio-client
auto-updater
avatars	Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting	2015-12-18 13:43:33 -08:00
controllers	more work on hand movement	2015-12-18 15:44:01 -08:00
display-plugins
embedded-webserver	use a ternary for single assignment	2015-12-17 10:54:32 -08:00
entities	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-21 14:29:32 -08:00
entities-renderer	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-21 14:29:32 -08:00
environment
fbx	Load texture by convention with .obj	2015-12-15 19:30:15 -08:00
gl	Revert "Revert "Migrate QML based web views to Qt WebEngine""	2015-12-18 17:18:46 -08:00
gpu	Adding Gamma correction to all the Color coming for the attribute stream if used as color	2015-12-18 12:50:21 -08:00
input-plugins
model	FIxing the bad returned value per reference	2015-12-17 10:08:40 -08:00
model-networking
networking	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-18 09:12:57 -08:00
octree
physics	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-21 09:14:37 -08:00
plugins
procedural	Tuning the proedural shader support to work with the current default: gamma corrected emissive	2015-12-21 12:00:30 -08:00
recording
render	Change the default tone curve to jusimple gamma correct and fix the renaming in the renderENgineDebug script	2015-12-18 15:35:01 -08:00
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-21 14:29:32 -08:00
script-engine	Merge pull request #6701 from highfidelity/graphics	2015-12-21 13:54:50 -08:00
shared	try again on AACube::operator +=	2015-12-21 11:34:53 -08:00
ui	Revert "Revert "Migrate QML based web views to Qt WebEngine""	2015-12-18 17:18:46 -08:00