overte-HifiExperiments/libraries
David Rowe 812ab9b7c6 Merge branch 'master' into 20681
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
2015-09-18 16:44:04 -07:00
..
animation fix bugs 2015-09-18 12:01:23 -07:00
audio Merge pull request #5820 from kencooke/audio-fix 2015-09-16 10:26:36 -07:00
audio-client Merge branch 'master' of https://github.com/kencooke/hifi 2015-09-14 12:28:16 -07:00
auto-updater call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
avatars improved debug render of hand coordinates 2015-09-11 13:22:11 -07:00
display-plugins Fix for getEyePose in OpenVRDisplayPlugin 2015-09-17 17:16:12 -07:00
embedded-webserver Merge pull request #5663 from birarda/master 2015-08-27 12:46:24 -07:00
entities Merge branch 'master' into 20681 2015-09-18 16:44:04 -07:00
entities-renderer Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance 2015-09-18 15:19:06 -07:00
environment call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
fbx quiet compiler 2015-09-12 09:59:25 -07:00
gpu Fix the lighting when the rear view mirror is showing up 2015-09-17 12:28:17 -07:00
gpu-networking put back TextureCache headers 2015-09-08 15:23:26 -07:00
input-plugins Adjust controller offset from 6 inches to 3 inches 2015-09-18 12:02:05 -07:00
model Procedural skybox work 2015-09-08 14:31:16 -07:00
networking Merge branch 'master' into 20681 2015-09-18 12:04:02 -07:00
octree CR feedback 2015-09-18 14:24:01 -07:00
physics Merge pull request #5778 from jherico/homer 2015-09-11 17:54:53 -07:00
plugins call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
procedural Fix procedural vec3 uniforms 2015-09-12 13:19:33 -07:00
render Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00
render-utils Fix the lighting when the rear view mirror is showing up 2015-09-17 12:28:17 -07:00
script-engine Merge branch 'master' into 20681 2015-09-18 16:44:04 -07:00
shared Merge branch 'master' into 20681 2015-09-18 16:44:04 -07:00
ui quiet compiler 2015-09-12 09:59:25 -07:00