Andrew Meadows
0de109e2e8
cleanup and fix typos
2017-08-18 11:29:47 -07:00
Sam Gateau
5ac65e8f35
Merge pull request #11184 from Zvork/fadeinvertfix
...
Fade edition bug fix
2017-08-17 15:10:50 -07:00
Zach Fox
ecd1f13197
Allow users to take a snapshot from the secondary camera
2017-08-16 15:34:06 -07:00
Brad Hefta-Gaub
714027d2e2
Merge pull request #11196 from hyperlogic/bug-fix/avatar-capsule-issues
...
Fix for incorrectly sized avatar capsule collision
2017-08-16 09:58:39 -07:00
Olivier Prat
9691c957e4
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeinvertfix
2017-08-16 09:41:49 +02:00
Anthony J. Thibault
e9b8e5431d
Fix for incorrectly scaled bounding volumes when switching avatars
...
Make sure to explicitly set the _geometryToRigTransform in Rig::initJointStates().
This should fix small bounding volume when switching from the Gamebot avatar (which has 0.008 scaling)
to another avatar (which ususally have 0.01 scaling).
2017-08-15 17:26:51 -07:00
Liv
aea5f170f2
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-08-15 13:58:22 -07:00
Anthony J. Thibault
f46198c2fd
Simplified/Improved avatar capsule calculation
...
IK is no longer performed during capsule calculation, This fixes an issue with the mannequin avatar in the marketplace.
Specifically, it was causing the hips to rise during IK which would result in an incorrectly sized and offset capsule.
2017-08-15 13:48:10 -07:00
Anthony Thibault
342f8acff5
Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision
...
Improve avatar hand vs body collision
2017-08-15 13:43:21 -07:00
Anthony J. Thibault
04006a9f76
code review feedback
2017-08-15 11:19:41 -07:00
Sam Gateau
d624413c14
Merge pull request #11189 from SamGondelman/line3DFix
...
Fix drawInFront overlays only rendering in left eye
2017-08-15 09:26:18 -07:00
SamGondelman
194b7d6655
warning
2017-08-14 16:08:07 -07:00
SamGondelman
8163430282
fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds
2017-08-14 15:03:14 -07:00
Anthony Thibault
9af6f2683a
Merge pull request #11083 from Menithal/experimental-face-expressions
...
Opened up setForceFaceTrackerConnected
2017-08-14 14:19:08 -07:00
Olivier Prat
c88082301e
Small changes to respect coding rules
2017-08-14 22:43:39 +02:00
Olivier Prat
358373aeac
Base gradient size edition works again on Elements enter domain event
2017-08-14 11:41:01 +02:00
Olivier Prat
92d5a0c552
Fixed non working fade invert parameter
2017-08-14 11:21:47 +02:00
Anthony J. Thibault
cd57c0706a
more warning fixes
2017-08-11 17:46:50 -07:00
Anthony J. Thibault
f72a94e195
warning fixes
2017-08-11 17:28:50 -07:00
Anthony J. Thibault
b050d2c4c7
fix case on include for linux
2017-08-11 15:15:43 -07:00
Anthony J. Thibault
9e1218b4a4
Use k-dop collision to prevent hands from entering body.
2017-08-11 14:50:00 -07:00
Anthony J. Thibault
ae98974d79
improve 14-dop generation for avatar joint collision
...
Also added debug rendering functionality.
2017-08-10 15:52:51 -07:00
Sam Gateau
79f3be1efe
Merge pull request #11021 from Zvork/fade2
...
Fade dissolve effect JUST AVATARS
2017-08-10 13:48:30 -07:00
Ken Cooke
d0e7584f0f
Merge pull request #11158 from kencooke/audio-input-dummy
...
Support for running Interface without a microphone
2017-08-10 06:47:04 -07:00
Ken Cooke
ee752df653
fix typo
2017-08-09 20:11:52 -07:00
Ken Cooke
bcdf13c59c
Add explicit shutdown request, since null device means something else
2017-08-09 19:40:07 -07:00
Ken Cooke
ee6d4dfc14
If real input device fails to start, use dummy input
2017-08-09 17:50:20 -07:00
Ken Cooke
fc5b4be459
bugfix
2017-08-09 16:59:02 -07:00
Ken Cooke
9c6b7306c4
Re-implement callback to Use common handleAudioInput()
2017-08-09 16:58:12 -07:00
Ken Cooke
7daa3ecff3
Handle dummy input callbacks
2017-08-09 15:54:14 -07:00
Zach Fox
b8c45b0c30
Don't always do precision picking inside mouseMoveEvent
2017-08-09 14:23:43 -07:00
Ken Cooke
6f2cc9cfeb
When no input device, create dummy input to generate callbacks
2017-08-09 14:01:17 -07:00
Seth Alves
af1e27dc36
Merge pull request #11053 from hyperlogic/feature/secondary-pose-support
...
Improved support for Vive Trackers on biceps
2017-08-07 13:11:48 -07:00
Liv Erickson
da70071b5a
Merge branch 'master' into feat/domain-setup
2017-08-07 10:04:54 -07:00
Seth Alves
c570d483d8
Merge pull request #11113 from elisa-lj11/zip_drag
...
Zip drag (needs review)
2017-08-07 03:17:31 -07:00
Seth Alves
83a30e2f35
missed some statics
2017-08-06 13:12:27 -07:00
Seth Alves
6f9460162d
avoid calling a pure virtual function from GLBackend dtor
2017-08-06 12:47:45 -07:00
Seth Alves
186035dc5d
adjust various things that cause a crash-on-exit on Linux
2017-08-06 11:57:55 -07:00
Elisa Lupin-Jimenez
af432087e3
small revisions to bracketing/variable name
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557
Renamed isBlocks to isZip, added debug print for non-entity files
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6
Removed extraneous print statements
2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0
Blocks drag does not work yet
2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54
Can drag blocks zip folder into hifi and upload the .obj
2017-08-04 16:57:48 -07:00
Anthony J. Thibault
98bbe887b9
Merge branch 'master' into feature/secondary-pose-support
2017-08-04 16:11:13 -07:00
Brad Davis
0e508432c4
PR comments
2017-08-04 15:27:33 -07:00
Brad Davis
86e3489167
Updates from Threaded Rendering project
2017-08-04 15:22:14 -07:00
anshuman64
83e50f894a
Merge pull request #11106 from seefo/tracked-objects
...
Added Vive pucks as an input channel and added new puck-attach script
2017-08-03 17:03:45 -07:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
Chris Collins
ddb7d0f1ba
Merge pull request #11112 from kencooke/audio-gate-bugfix
...
Possible fix for "screeching noise" after audio input device changes
2017-08-03 13:55:47 -07:00
vladest
a439cc1837
Make connection to tablet shown signal more consistent, eliminates missed signals
2017-08-03 20:58:44 +02:00
