Olivier Prat b68ec4f933 Merge branch 'master' of git://github.com/highfidelity/hifi into fade		2017-07-13 22:36:52 +02:00
..
animation	coding style	2017-07-06 17:36:28 -07:00
audio	remove unneeded <>	2017-07-12 13:14:32 -07:00
audio-client	more const ref	2017-07-11 19:56:34 -07:00
auto-updater
avatars	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-13 11:05:14 +02:00
avatars-renderer	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-13 22:36:52 +02:00
controllers
display-plugins	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
embedded-webserver
entities	Added fade state in render::Item	2017-07-07 09:16:54 +02:00
entities-renderer	Fixed compilation errors on Mac and Linux	2017-07-13 17:51:16 +02:00
fbx
gl	Refining the custom shader pipeline design and registration mechanism	2017-07-12 14:13:58 +02:00
gpu
gpu-gl	Merged with master	2017-07-03 15:32:30 +02:00
image
input-plugins
ktx
model
model-networking	Trying to fix overlay crashes again	2017-07-05 14:30:01 -07:00
networking	Revert "Revert "fix for invisible avatars after radius ignore""	2017-07-12 10:36:53 -07:00
octree
physics	supply minimum shape rather than null	2017-07-06 10:37:44 -07:00
plugins	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
procedural
recording	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
render	Yet some more compilation fixes for Mac and Linux	2017-07-13 18:22:18 +02:00
render-utils	Removed unused variable that prevented build on Linux	2017-07-13 18:45:08 +02:00
script-engine	stopAndDeleteLater is now just stop	2017-07-11 21:21:42 -07:00
shared	Merge pull request #10879 from AndrewMeadows/avoid-null-shape	2017-07-07 10:22:05 -07:00
trackers
ui	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
ui-plugins