Brad Hefta-Gaub b2c5154cb6 Merge pull request #11909 from ZappoMan/rc60FixModelImportSizing ... fix issues in model import sizing caused by recent refactor		2017-12-02 09:30:57 -08:00
..
animation	9267 Fix not restoring animations after changing view modes	2017-11-15 15:04:24 -07:00
audio
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
display-plugins
embedded-webserver
entities	fix issues in model import sizing caused by recent refactor	2017-11-30 18:08:32 -08:00
entities-renderer	fix issues in model import sizing caused by recent refactor	2017-11-30 18:08:32 -08:00
fbx	Merge pull request #11308 from luiscuenca/patch-1	2017-11-17 14:52:51 -08:00
gl
gpu
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	kick logged in by fingerprint/ip if enabled in DS settings	2017-11-27 18:23:14 -08: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	remove test code disabling the script cache	2017-11-20 15:57:44 -08:00
shared	Merging with master	2017-11-21 14:12:47 -08:00
trackers
ui	mac fix	2017-12-01 15:17:23 -07:00
ui-plugins