Sam Gateau f38fa14a39 Merge branch 'master' of https://github.com/highfidelity/hifi into blue		2017-10-24 21:00:44 -07:00
..
animation	cleanup WANT_DETAILED_PROFILING	2017-10-19 14:31:50 -07:00
audio	Merge pull request #11538 from kencooke/audio-mac-bugfix2	2017-10-17 11:02:55 -07:00
audio-client
auto-updater
avatars	Merge pull request #11326 from cain-kilgore/21537	2017-10-06 08:51:42 -07:00
avatars-renderer	handle camera-relative controller joints for other avatars	2017-10-17 12:36:15 -07:00
baking	Merge pull request #11585 from huffman/fix/draco-material-ids	2017-10-20 11:32:31 -07:00
controllers
display-plugins	build error	2017-10-09 11:48:54 -07:00
embedded-webserver
entities	clean up VERSION_ENTITIES stuff	2017-10-24 13:48:27 -07:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-24 21:00:44 -07:00
fbx
gl
gpu	Merge pull request #11542 from SamGondelman/bubbleBoy	2017-10-10 14:26:20 -07:00
gpu-gl	Merged with master	2017-10-10 12:11:23 +02:00
gpu-gles
image	Fixed cube map conversion from equirectangular maps when done after HDR conversion	2017-10-13 11:05:27 +02:00
input-plugins
ktx	Merged with master	2017-10-10 12:11:23 +02:00
midi
model	Code review fixes.	2017-10-20 14:27:27 -07:00
model-networking	Merge pull request #11571 from huffman/fix/ktx-thrashing	2017-10-13 11:53:24 -07:00
networking	actually remove all those defines	2017-10-24 14:45:33 -07:00
octree	clean up VERSION_ENTITIES stuff	2017-10-24 13:48:27 -07:00
physics
plugins
pointers	Merge branch 'pointers' of https://github.com/highfidelity/hifi into pointers	2017-10-17 13:23:08 -07:00
procedural
recording
render	Merge branch 'master' into hazeZone	2017-10-11 22:12:52 -07:00
render-utils	Changed blend range from 32,000 m to 30,000m	2017-10-24 13:17:09 -07:00
script-engine	remove some log spam	2017-10-24 11:50:25 -07:00
shared	Merge pull request #11611 from AndrewMeadows/faster-update-renderables	2017-10-20 13:43:08 -07:00
trackers
ui	Code style fixes	2017-10-20 15:12:09 +02:00
ui-plugins