Olivier Prat fcf1c301b6 Merge branch 'master' of git://github.com/highfidelity/hifi into bloom		2017-11-03 18:12:15 +01:00
..
animation
audio	Cleaning	2017-10-25 19:09:37 -07:00
audio-client
auto-updater
avatars
avatars-renderer	actually remove href not script	2017-10-26 17:47:04 -07:00
baking	Fixed issue with QTextStream	2017-10-24 20:14:02 -07:00
controllers
display-plugins	Merge pull request #11671 from ElderOrb/case8553	2017-10-25 10:31:31 -07:00
embedded-webserver	Update most DS API forwarding APIs to use a single forwarding function	2017-10-27 15:53:50 -07:00
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests	2017-11-01 12:38:34 -07:00
entities-renderer	call Model::scaleToFit() before update render items	2017-11-02 12:32:51 -07:00
fbx
gl
gpu
gpu-gl
gpu-gles
image
input-plugins
ktx
midi
model	Moving consts into mode::Haze namespace.	2017-10-31 13:46:58 -07:00
model-networking
networking	Merge pull request #11730 from zfox23/pop_avatarEntityTests	2017-11-02 15:34:37 -07:00
octree	More progress	2017-10-31 12:14:12 -07:00
physics	Merge pull request #11336 from 1P-Cusack/21389_PR2	2017-10-25 10:41:21 -07:00
plugins
pointers
procedural
recording
render	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-03 18:12:15 +01:00
render-utils	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-03 18:12:15 +01:00
script-engine	Removed references to Haze from Stage.	2017-10-30 10:49:08 -07:00
shared	fix compile errors after merge	2017-10-25 11:57:44 -07:00
trackers
ui	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
ui-plugins