overte/libraries
Brad Davis 472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui
Conflicts:
	scripts/system/controllers/handControllerGrab.js
2016-06-10 10:43:09 -07:00
..
animation Added MyAvatar.hmdLeanRecenterEnabled property 2016-06-03 13:56:32 -07:00
audio cleanup 2016-06-09 16:31:09 -07:00
audio-client
auto-updater
avatars Merge pull request #8010 from hyperlogic/feature/hmd-lean-recenter-property 2016-06-09 12:17:51 -07:00
controllers Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-10 10:43:09 -07:00
display-plugins Pinned UI support 2016-06-02 17:24:25 -07:00
embedded-webserver
entities Fix OSX warning 2016-06-07 16:46:32 -07:00
entities-renderer remove some magic numbers 2016-06-03 10:47:54 -07:00
fbx Merge pull request #7889 from samcake/color 2016-06-08 17:38:45 -07:00
gl Update SteamVR keyboard behavior 2016-06-07 21:52:21 -07:00
gpu FIxing the reflection jittering by moving the normal into world space 2016-05-27 19:24:56 -07:00
gpu-gl quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
input-plugins Remove input plugin menu dependency 2016-06-06 13:28:36 -07:00
model Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 10:38:40 -07:00
model-networking Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 10:38:40 -07:00
networking additional revert related change 2016-05-31 20:50:12 -07:00
octree Fix JurisdictionMap not initializing correctly 2016-05-17 15:12:45 -07:00
physics Merge pull request #8010 from hyperlogic/feature/hmd-lean-recenter-property 2016-06-09 12:17:51 -07:00
plugins Activate Inputs after menus are setup 2016-06-06 13:28:36 -07:00
procedural fix broken procedural skybox when leaving and re-entering 2016-05-22 22:52:56 -07:00
recording Remove delayLoad 2016-05-09 18:09:48 -07:00
render Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta 2016-05-16 10:53:39 -07:00
render-utils Merge pull request #7889 from samcake/color 2016-06-08 17:38:45 -07:00
script-engine Merge pull request #7968 from birarda/audio-is-playing 2016-05-26 12:06:00 -07:00
shared Attempt to get better logging from pure virtual call crashes 2016-06-08 22:35:39 -07:00
ui Pinned UI support 2016-06-02 17:24:25 -07:00