David Rowe
a0c3c974a9
Throttle DDE face acquisition attempts in order to reduce CPU usage
2015-05-21 19:44:38 -07:00
Seth Alves
38edc27cbb
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 18:24:40 -07:00
samcake
496898273c
Merge pull request #4846 from jherico/dk1
...
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
2015-05-20 17:02:28 -07:00
Seth Alves
782402b4c8
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 14:53:05 -07:00
Brad Hefta-Gaub
79023763ef
Merge pull request #4869 from ctrlaltdavid/20543
...
CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled
2015-05-20 14:47:31 -07:00
Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -07:00
Howard Stearns
c5b8dd51d8
Fix https://app.asana.com/0/32622044445063/34195351184789
...
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Brad Davis
827d7f6221
Merge branch 'master' into dk1
2015-05-20 09:41:20 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Sam Cake
580339e99f
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 17:24:59 -07:00
Sam Cake
e9ff06df24
FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed
2015-05-15 17:22:29 -07:00
Philip Rosedale
36b396b9ef
Merge pull request #4881 from ctrlaltdavid/fix-binary-eyelid
...
Fix visibility of binary eyelid control menu item
2015-05-15 17:19:15 -07:00
Philip Rosedale
0d00393eff
Merge pull request #4854 from ctrlaltdavid/fix-facetracker-rotation
...
Fix facetracker rotation
2015-05-15 17:17:30 -07:00
David Rowe
d3cb6a9334
Fix visibility of binary eyelid control menu item
2015-05-15 09:40:32 -07:00
Brad Davis
6797174b97
Fix picking in the HMD
2015-05-14 19:15:47 -07:00
Seth Alves
41d77e6146
Merge pull request #4852 from AndrewMeadows/nova
...
improved distributed simulation ownership negotiation
2015-05-14 11:40:49 -07:00
Philip Rosedale
e0e026c639
Merge pull request #4862 from birarda/master
...
fixes for other avatar receive stats rendering
2015-05-14 10:19:09 -07:00
Andrew Meadows
81d06e0dc3
Merge upstream/master into andrew/nova
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItemProperties.cpp
2015-05-14 10:09:55 -07:00
Brad Hefta-Gaub
d1f52231be
Merge pull request #4863 from samcake/orange
...
Using the skymap for ambient lighting
2015-05-14 09:12:46 -07:00
David Rowe
ff7b2016b4
Add option to auto mute microphone after lose face tracking
2015-05-14 08:50:43 -07:00
David Rowe
95a565627c
Make DDE isTracking() behave the same as Faceshift's
2015-05-14 08:49:44 -07:00
Brad Davis
e20d2ffb15
Merge typo
2015-05-13 21:39:04 -07:00
Brad Davis
c94b8b6e30
Merge branch 'master' into dk1
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
2015-05-13 21:25:56 -07:00
Brad Hefta-Gaub
77019eafa7
Merge pull request #4831 from jherico/plugins_pt2
...
Display plugins part 2
2015-05-13 20:40:33 -07:00
Brad Hefta-Gaub
3b7acae8a2
Merge pull request #4850 from jherico/web-entity
...
Web entity
2015-05-13 17:02:55 -07:00
Sam Cake
d13106f4c9
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-05-13 16:00:42 -07:00
Stephen Birarda
57fa3d8c53
fixes for other avatar receive stats rendering
2015-05-13 14:43:31 -07:00
Brad Davis
3b7e8a69b5
Attempting to fix threading issues with web entities
2015-05-13 14:00:41 -07:00
Bradley Austin Davis
a0097bcff8
Fixing offscreen rendering on retina display, even without a proxy window
2015-05-13 12:26:46 -07:00
Seth Alves
80749195e6
don't ddeTracker->init if HAVE_DDE isn't set
2015-05-13 11:44:42 -07:00
David Rowe
7319c7b767
Fix face-tracked head rotation for Faceshift, also
2015-05-13 11:35:04 -07:00
David Rowe
5050171d30
Fix face-tracked head disappearing into body
...
Normalize quaternion to ensure that acos(r.w) is valid (r.w <= 1.0) and
r.w = 1.0 when r.x = r.y = r.z = 0.0.
2015-05-13 11:34:19 -07:00
Sam Cake
8324268ec8
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-05-13 11:32:39 -07:00
Philip Rosedale
96b761357b
Merge pull request #4853 from huffman/remove-scripts-tip
...
Remove scripts 'Tip' label and fix tool window heights
2015-05-13 11:21:49 -07:00
Philip Rosedale
a5c49b7a13
Merge pull request #4813 from ctrlaltdavid/20532
...
CR for 20532 - Default face tracking to Use Camera for first time users
2015-05-13 11:06:46 -07:00
Brad Davis
9b6c20d93c
Merge remote-tracking branch 'upstream/master' into web-entity
2015-05-13 09:49:53 -07:00
Bradley Austin Davis
fc825f6632
Fixing the loading of local HTML so it works on both OSX and win32
2015-05-13 09:46:24 -07:00
Ryan Huffman
7ff9422717
Fix runningScripts and tool window height
2015-05-13 09:45:18 -07:00
Ryan Huffman
8e5438a4ad
Remove scripts 'Tip' label
2015-05-13 09:32:17 -07:00
Andrew Meadows
fb34a5ba84
renaming and cleanup
2015-05-13 08:44:10 -07:00
Philip Rosedale
b658c26799
Merge pull request #4840 from jherico/menu
...
Only display new menu in VR mode
2015-05-13 08:15:04 -07:00
Brad Davis
a8d343bbf1
Working on web entities
2015-05-13 00:27:57 -07:00
Sam Cake
04d3f690dc
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-05-12 23:12:37 -07:00
Sam Cake
536fff4502
Trying to create the SH from the skybox cubemap
2015-05-12 23:11:52 -07:00
Brad Davis
e9b83e1c02
Working on web entities
2015-05-12 21:15:54 -07:00
David Rowe
8a3c8e0d9a
Merge branch 'master' into 20532
...
Conflicts:
interface/src/devices/DdeFaceTracker.cpp
2015-05-12 17:41:12 -07:00
Philip Rosedale
349886c146
Merge pull request #4847 from birarda/domain-paths
...
add initial support for local paths in domain
2015-05-12 17:09:13 -07:00
Philip Rosedale
65277e0573
Merge pull request #4836 from ctrlaltdavid/20535
...
CR for #20535 - Improve DDE eyelid control
2015-05-12 17:00:02 -07:00
Brad Davis
8c4f802dbf
Merge remote-tracking branch 'upstream/master' into web-entity
...
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
