overte/libraries
David Rowe de49fefc61 Merge branch 'master' into 21602
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
2017-11-25 17:06:36 +13:00
..
animation 9267 Fix not restoring animations after changing view modes 2017-11-15 15:04:24 -07:00
audio HRTF cleanup 2017-10-29 18:01:43 -07:00
audio-client
auto-updater
avatars Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-20 17:19:18 -08:00
avatars-renderer Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-20 17:19:18 -08:00
baking
controllers laserpointers generate pointerevents 2017-10-26 12:01:09 -07:00
display-plugins
embedded-webserver Fix domain server label not handling spaces correctly 2017-11-08 13:09:42 -08:00
entities Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-21 10:53:29 -08:00
entities-renderer Merging with master 2017-11-21 14:12:47 -08:00
fbx Merge pull request #11308 from luiscuenca/patch-1 2017-11-17 14:52:51 -08:00
gl
gpu Merged with master 2017-11-13 14:33:59 +01:00
gpu-gl
gpu-gles
image
input-plugins
ktx
midi
model Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-13 11:52:32 -08:00
model-networking Merge pull request #11308 from luiscuenca/patch-1 2017-11-17 14:52:51 -08:00
networking reverted special property case, parentJointName is now only parsed from the JSON import 2017-11-20 18:29:33 +01:00
octree Merge pull request #11841 from ZappoMan/makeAddEntityAtomic 2017-11-18 14:27:12 -08:00
physics Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-19 14:40:31 -08:00
plugins
pointers cleanup 2017-11-17 10:45:39 -08:00
procedural
recording
render Merge pull request #11770 from AndrewMeadows/sort-and-throttle 2017-11-19 11:09:08 -08:00
render-utils Merge pull request #11559 from Zvork/bloom 2017-11-15 15:11:31 -08:00
script-engine Merge branch 'master' into 21602 2017-11-25 17:06:36 +13:00
shared Merge branch 'master' into 21602 2017-11-25 17:06:36 +13:00
trackers
ui Merging with master 2017-11-21 14:12:47 -08:00
ui-plugins