Commit graph

43798 commits

Author SHA1 Message Date
Brad Davis
4e49f3f942 Fix browser and update dialogs 2016-06-02 19:54:25 -07:00
Atlante45
e2fa734024 Set collision threashold to walking speed 2016-06-02 19:15:55 -07:00
Brad Davis
e9b359feb1 Make QML overlays disappear, use fade for non-window types 2016-06-02 19:15:19 -07:00
Atlante45
4e8b61dea0 Limit collision injectors count to 3 2016-06-02 19:12:37 -07:00
Brad Hefta-Gaub
7ed35399e9 make the application of redundant physics update idempotent to improve action glitches 2016-06-02 18:01:23 -07:00
Atlante45
854bf82631 Raise and stretch collision sounds threshold 2016-06-02 17:37:36 -07:00
Brad Davis
ed5d904b3d Hide overlays when driving 2016-06-02 17:24:26 -07:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
Brad Davis
068a462901 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-02 17:20:23 -07:00
Brad Davis
e6cb6d8395 Merge pull request #7989 from howard-stearns/partition-vive-trackpad-by-x-y
Partition vive trackpad by center, x, and y (not just center v outer).
2016-06-02 16:49:15 -07:00
Brad Davis
d5f9330ad7 Merge pull request #7993 from howard-stearns/click-on-trigger
Click on full trigger, activate on partial trigger.
2016-06-02 16:49:04 -07:00
Atlante45
3ca158265a Make sure getVelocityChange returns the velocityChange 2016-06-02 16:44:13 -07:00
Brad Davis
bf734395e5 More invisible web entity fixes 2016-06-02 16:37:45 -07:00
Brad Davis
cc85ce9c01 fix crash on click on non-visible web-entity 2016-06-02 16:37:45 -07:00
Brad Hefta-Gaub
da983ffe68 Merge pull request #7986 from ctrlaltdavid/20937
make navigating directories in file browser dialog possible without double-clicking
2016-06-02 14:56:48 -07:00
Brad Hefta-Gaub
281c257d25 Merge pull request #7980 from zzmp/fix/max-capacity
fix domain max capacity to only count users (not scripted agents)
2016-06-02 14:54:16 -07:00
Brad Hefta-Gaub
4b2e2ca10a Merge pull request #7961 from AndrewMeadows/convexification
vhacd-util improvements
2016-06-02 14:52:10 -07:00
Brad Hefta-Gaub
326aa639fc Merge pull request #7995 from samcake/blue
Fix the jittering reflection bug and more Normal improvments
2016-06-02 14:13:44 -07:00
Brad Hefta-Gaub
62d3b171d7 Merge pull request #7985 from ZappoMan/addAudioLimiter
add audio peak limiter to audio mixer
2016-06-02 14:11:55 -07:00
howard-stearns
e6cc1fabe0 Do not send stale vive data as valid after deactivating. 2016-06-02 12:38:54 -07:00
Zach Pomerantz
a8228d42ee Improve max users explanation 2016-06-02 11:57:24 -07:00
samcake
7de5b80179 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-06-01 17:52:36 -07:00
samcake
1dca62f752 Introducing a new technique for normal packing and fixing a bug on the normal buffer format 2016-06-01 17:51:53 -07:00
howard-stearns
6d3fd4f208 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into click-on-trigger 2016-06-01 14:17:27 -07:00
howard-stearns
84fa4402fd Click on full trigger, activate on partial trigger. 2016-06-01 14:03:49 -07:00
Brad Davis
585f079133 Merge pull request #7987 from howard-stearns/hand-controller-grab-respects-overlays
handControllerGrab respects overlays
2016-06-01 14:00:05 -07:00
Peter Clemenko III
036fd0c4af Update the build docs for a better OpenSSL security posture. There are around 19 CVEs in the current recommended version. 2016-06-01 10:35:36 -04:00
Howard Stearns
f0133013c2 typo 2016-06-01 07:30:26 -07:00
David Rowe
b65938b631 Adjust default and minimum sizes 2016-06-01 16:23:26 +12:00
Brad Hefta-Gaub
35b80ba066 Merge pull request #7990 from ZappoMan/revert7943
Revert PR-7943
2016-05-31 21:21:12 -07:00
David Rowe
c4aed1ce06 Remove "Open Folder" button 2016-06-01 16:16:08 +12:00
Brad Hefta-Gaub
3119b654dc additional revert related change 2016-05-31 20:50:12 -07:00
Howard Stearns
922468ce1c fix cut and paste error with extraneous namespace qualifiers. 2016-05-31 20:47:58 -07:00
Brad Hefta-Gaub
b8c80e2222 Revert "refresh API info during re-connect - case 570"
This reverts commit e8d7f9614a.
2016-05-31 20:39:16 -07:00
David Rowe
4da1c0ac4d Click on blank part of dialog to deselect item 2016-06-01 14:25:07 +12:00
David Rowe
eddfe4847a Select nothing by default when navigate up/down directory structure 2016-06-01 14:22:54 +12:00
howard-stearns
c2858f847b Partition vive trackpad by center, x, and y (not just center v outer). 2016-05-31 16:57:23 -07:00
samcake
ae7d817705 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-05-31 15:38:07 -07:00
howard-stearns
9ad19a2eaf Draw grab balls in front of entities (not just the lines as before).
Don't intersect with grab balls (not just lasers as before).
Don't run grab lasers through (2d or 3d) overlays.
Don't try to manage reticle in handControllerGrab because other scripts
do.
2016-05-31 14:57:31 -07:00
Andrew Meadows
1eb0b6a231 apply FBXGeometry.scaleOffset to mesh vertices 2016-05-31 11:38:58 -07:00
David Rowe
437607998f Adjust minimum size of file browser dialog to keep all buttons visible 2016-05-30 14:20:13 +12:00
David Rowe
fd467caf86 Add "Open Folder" button to file browser dialog 2016-05-30 14:19:25 +12:00
Brad Hefta-Gaub
b3a43c40a9 remove audio test file 2016-05-29 14:16:30 -07:00
Brad Hefta-Gaub
2ed95542a9 use sound file from S3 2016-05-29 13:56:09 -07:00
Brad Hefta-Gaub
1fb8f659a7 add test content 2016-05-29 13:33:24 -07:00
Brad Hefta-Gaub
f65f99a3e0 fix warning 2016-05-29 12:34:57 -07:00
Brad Hefta-Gaub
7fd531541c simplify 2016-05-29 12:08:10 -07:00
Brad Hefta-Gaub
1e7cd06d0e add audio peak limiter to audio mixer 2016-05-28 20:34:27 -07:00
samcake
3fe9b67e45 FIxing the reflection jittering by moving the normal into world space 2016-05-27 19:24:56 -07:00
Brad Hefta-Gaub
cb3dfa0457 Merge pull request #7983 from ZappoMan/fixShapes
fix shapes to property polymorph and persist
2016-05-27 17:56:25 -07:00