Commit graph

48727 commits

Author SHA1 Message Date
Anthony J. Thibault
49ce04e214 Revert "Merge pull request #9150 from hyperlogic/bug-fix/driving-while-flying-in-hmd"
This reverts commit a69d77ffbe, reversing
changes made to 996d3f5875.
2016-12-05 15:17:32 -08:00
Anthony J. Thibault
e8b5b56df7 Revert "Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode"
This reverts commit 119653bceb, reversing
changes made to a69d77ffbe.
2016-12-05 15:16:49 -08:00
Andrew Meadows
119653bceb Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode
Fix for reset sensors while in desktop mode.
2016-12-05 13:46:53 -08:00
Andrew Meadows
a69d77ffbe Merge pull request #9150 from hyperlogic/bug-fix/driving-while-flying-in-hmd
Fix for driving/turning while flying in HMD mode
2016-12-05 13:46:29 -08:00
Ryan Huffman
996d3f5875 Merge pull request #9135 from druiz17/nearGrab
Fixed pressing the grip button causes a near grabbed object to drop
2016-12-05 11:07:15 -08:00
Clément Brisset
1db14c924d Merge pull request #9146 from kencooke/audio-update-wasapi
Updated the Qt audio plugins
2016-12-05 10:55:22 -08:00
Anthony J. Thibault
6d82410bc5 Fix for away.js teleporting user when in desktop mode
away.js calls MyAvatar.centerBody, however centerBody is only meaningful in HMD mode.
To guard against this, MyAvatar::centerBody is now a no-op if the application is not in HMD mode.
2016-12-05 10:53:20 -08:00
Anthony J. Thibault
349f0355ae Fix for reset sensors while in desktop mode.
Previously hitting ' a.k.a. reset sensors, would teleport you to the last
position you were in before you switched into desktop mode, or the spawn location.

This fixes that behavior but not re-centering the avatar while in desktop mode.
2016-12-05 10:42:20 -08:00
Brad Davis
dc1b154482 Merge pull request #9149 from samcake/blue
Fix the lighting problem at the outline of the shapes
2016-12-05 10:29:08 -08:00
Anthony J. Thibault
a0f93dad2c Fix for driving/turning while flying in HMD mode
The internal MyAvatar:_sensorToWorldMatrix was being updated properly, however
the MyAvatar::_sensorToWorldMatrixCache was not. To fix this I've introduced
a new "mode" to updateSensorToWorldMatrix that does not change the sensorToWorldMatrix at all,
but properly copies the value to the cache and also updates hand controller poses etc.
2016-12-05 10:14:03 -08:00
Dante Ruiz
08301d488d clean up 2016-12-05 18:10:54 +00:00
Dante Ruiz
09d5dc382f better solution 2016-12-05 18:08:36 +00:00
sam
310e26011f Fix the lighting problem at the outline of the shapes, use the depth buffer instead of the Linear depth buffer 2016-12-05 00:47:50 -08:00
Ken Cooke
b888ce890c Updated the Qt audio plugins 2016-12-03 07:26:55 -08:00
Chris Collins
10c054165f Merge pull request #9144 from highfidelity/revert-9129-audio-dll
Revert "Select Audio DLL at runtime"
2016-12-02 17:21:42 -08:00
samcake
acdce95bba Merge pull request #9140 from jherico/polyline_threading_fix
Possible polyline crash fix
2016-12-02 14:16:14 -08:00
Clément Brisset
3659e8e585 Revert "Select Audio DLL at runtime" 2016-12-02 14:15:11 -08:00
Chris Collins
6cb85e92b1 Merge pull request #9136 from samcake/hdr
Fix a crash if current shader is null
2016-12-02 09:14:07 -08:00
Brad Davis
12ccbdac0b Actually render polylines 2016-12-01 19:46:08 -08:00
Seth Alves
8fe7c3156a Merge pull request #9138 from hyperlogic/bug-fix/3dsmax-fbx-reader-fixes
Support for the 3ds Max object offset feature
2016-12-01 19:39:05 -08:00
Brad Hefta-Gaub
934148fea5 Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1
Added jsdocs for MyAvatar
2016-12-01 18:11:25 -08:00
Anthony J. Thibault
35eeaad590 Added jsdocs for MyAvatar
Not complete by any means, but it's a start.
2016-12-01 17:38:43 -08:00
Seth Alves
d2b32c3084 Merge pull request #9057 from druiz17/childParent
fixed children of parent object not being added back when performing an undo
2016-12-01 16:59:06 -08:00
Anthony J. Thibault
68b103b46b Fix for missing fields in static initializer. 2016-12-01 15:21:49 -08:00
Zach Fox
30dade242c GIFs: Quality improvements; duration tweaks; processing notif (#9139) 2016-12-01 14:53:18 -08:00
Dante Ruiz
348c0c95e5 conforming to coding standard and better variable naming 2016-12-01 22:22:17 +00:00
Brad Davis
5bade2ef9a Add locking around the code that reads polyline entity data and builds GPU structures for them 2016-12-01 14:14:17 -08:00
Seth Alves
24e54f25bf Merge pull request #9108 from PhilipRosedale/drifting
Grab.js weaker at a distance
2016-12-01 12:59:28 -08:00
Philip Rosedale
c60b0c7ef5 Fix indents 2016-12-01 12:54:38 -08:00
Chris Collins
942850293e Merge pull request #9105 from druiz17/teleportBug
Fix for unable to teleport to areas that you should
2016-12-01 11:35:06 -08:00
Seth Alves
efe9571ab8 Merge pull request #8691 from highfidelity/out-of-body-experience
Room Scale HMD comfort features.
2016-12-01 11:09:39 -08:00
Dante Ruiz
a35f28725b fixed child not commit back when performing undo 2016-12-01 10:54:26 -08:00
Dante Ruiz
3c1d434449 fixed typo 2016-12-01 10:54:26 -08:00
Dante Ruiz
0c9cd5803a added descendant checking 2016-12-01 10:54:26 -08:00
Dante Ruiz
c52f893273 isChildOfParent 2016-12-01 10:54:26 -08:00
Dante Ruiz
cb0e01bfa4 fixed child of parent not being added when performing an undo 2016-12-01 10:54:26 -08:00
samcake
ff39ec6753 fix a potential crash if the current shaderObject is null 2016-12-01 10:51:32 -08:00
Andrew Meadows
2bbe2be516 fix spelling: physcis --> physics 2016-12-01 10:50:10 -08:00
Andrew Meadows
ae699e2a65 add initializer for member variable 2016-12-01 10:41:40 -08:00
Andrew Meadows
445c730ca3 remove cruft, fix formatting and spelling 2016-12-01 10:38:13 -08:00
Andrew Meadows
333e9ec7f4 Merge pull request #9128 from Polyrhythm/ryan/v3-and-shader-helpers
Vec3 and shader helpers
2016-12-01 10:32:34 -08:00
Dante Ruiz
1b24d373d2 fixed near grab issue 2016-12-01 10:18:34 -08:00
Dante Ruiz
dc7bb5b083 grip button fix 2016-12-01 10:17:54 -08:00
Chris Collins
19b5e7cd86 Merge pull request #9054 from howard-stearns/third-person-lasers
make hand-controller ui work in third person
2016-12-01 10:11:12 -08:00
Chris Collins
c0a0a16ff8 Merge pull request #9127 from huffman/fix/hand-controller-grab-release
Fix 'releaseGrab' not being called when using grip buttons
2016-12-01 09:58:36 -08:00
Brad Hefta-Gaub
e0bcbb08ff Merge pull request #9134 from samcake/blue
Fix a bug when using the gpu::Batch::_glUniform*() calls  with a bad location
2016-12-01 09:03:56 -08:00
sam
3d29187156 FIx a potential bug when using _glUniform calls with an invalid location 2016-12-01 02:44:04 -08:00
sam
6342762fde FIx a potential bug when using _glUniform calls with an invalid location 2016-12-01 02:39:52 -08:00
Anthony J. Thibault
e96676fea4 Support for the 3ds Max object offset feature
FBXReader now supports the GeometricTranslation, GeometricRotation and GeometricScaling FBX fields.
These offsets are applied directly to the mesh vertices, as they are never animated and the rest of our
rendering and animation system would have difficulty supporting them otherwise.
2016-11-30 18:28:55 -08:00
Ryan Jones
7b0756c745 remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions 2016-11-30 16:37:04 -08:00