overte-HifiExperiments/libraries
Thijs Wenker 6e52fcb857 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
2015-10-07 03:11:24 +02:00
..
animation put IK targets in skeleton's model-frame 2015-10-06 16:49:29 -07:00
audio Improved random generator for SIMD dither 2015-10-01 20:32:48 -07:00
audio-client Remove 4 Application static methods 2015-10-06 13:56:19 -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 Merge branch 'master' into transmit-joint-translation 2015-10-01 16:55:24 -07:00
display-plugins Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 2015-10-06 19:56:22 +02:00
embedded-webserver Merge pull request #5663 from birarda/master 2015-08-27 12:46:24 -07:00
entities clean up warnings and coding standard issues 2015-10-06 16:33:24 -07:00
entities-renderer Merge pull request #5946 from jherico/nelson 2015-10-05 17:12:32 -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 Merge branch 'master' into transmit-joint-translation 2015-10-02 11:40:33 -07:00
gpu Working on texture compatibility with Shadertoy 2015-10-02 19:09:43 -07:00
input-plugins Merge pull request #5998 from birarda/qt-5.5 2015-10-05 17:00:43 -07:00
model Cleaning code 2015-10-01 19:23:32 -07:00
model-networking Fixing Linux build failure 2015-10-02 11:57:14 -07:00
networking Merge pull request #5984 from Atlante45/cleanup_app 2015-10-06 16:58:05 -07:00
octree fixes merge issues 2015-10-06 20:20:37 +02:00
physics Merge pull request #5967 from AndrewMeadows/collision-group-hack 2015-10-02 16:08:52 -07:00
plugins Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
procedural Working on texture compatibility with Shadertoy 2015-10-02 19:09:43 -07:00
render MOving forward on the background beeing drawn last 2015-09-29 18:28:20 -07:00
render-utils Remove shadowMatrices/Distances 2015-10-06 13:56:23 -07:00
script-engine Back out fromSpherical code addition 2015-09-24 19:14:26 -07:00
shared Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 2015-10-06 19:56:22 +02:00
ui quiet compiler 2015-09-12 09:59:25 -07:00