Commit graph

43963 commits

Author SHA1 Message Date
Andrew Meadows
eff59d3fd3 build compound sub meshes shapes with less copying 2016-06-03 10:47:54 -07:00
Andrew Meadows
bce8879d7c remove ShapeInfo::clearPoints()
use getPoints() by ref and then clear
2016-06-03 10:47:54 -07:00
Andrew Meadows
9dc0fa7796 don't automatically clear ShapeInfo points 2016-06-03 10:47:54 -07:00
Andrew Meadows
211bbb88e6 purge SHAPE_TYPE_ELLIPSOID which wasn't used 2016-06-03 10:47:54 -07:00
Andrew Meadows
7858ef84b3 don't copy points onto itself 2016-06-03 10:47:54 -07:00
Andrew Meadows
c066b4d4ac purge collision shape for ParticleEffectEntityItem 2016-06-03 10:47:54 -07:00
Andrew Meadows
5d9e320dd7 purge SHAPE_TYPE_LINE 2016-06-03 10:47:54 -07:00
Andrew Meadows
654468619c swap order of if-else blocks 2016-06-03 10:47:54 -07:00
Andrew Meadows
d591561a88 remove RenderableModelEntityItem::_points
use ShapeInfo::_points instead
2016-06-03 10:47:54 -07:00
howard-stearns
3e919cb7ac cleanup 2016-06-03 10:42:02 -07:00
Brad Hefta-Gaub
c85923c69b Merge pull request #7956 from jherico/web_entity_crash
fix crash on click on non-visible web-entity
2016-06-03 10:29:55 -07:00
Brad Hefta-Gaub
2e4480ee15 Merge pull request #7979 from jherico/steam_vr_exit_fix
Fix crash on shutdown of SteamVR
2016-06-03 10:28:53 -07:00
SamGondelman
e2c4b4d306 added haptic support to sdl and touch (needs testing) 2016-06-03 10:17:08 -07:00
Andrew Meadows
a22de76052 Merge pull request #8003 from ZappoMan/improveActionGlitches
fix glitches when observer client watches object with action
2016-06-03 09:35:12 -07:00
Brad Hefta-Gaub
1075ba1599 CR feedback 2016-06-03 08:01:09 -07:00
Brad Hefta-Gaub
e891a53ddd Merge pull request #8002 from Atlante45/fix/avatar-collision-sounds
Fix Avatar collision sounds triggering all the time.
2016-06-02 20:35:06 -07:00
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
SamGondelman
912b35693b added vive single pulse haptics 2016-06-02 18:13:33 -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
Zach Pomerantz
5c293646b9 Segment metadata users 2016-06-02 17:22:39 -07:00
Brad Davis
068a462901 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-02 17:20:23 -07:00
Zach Pomerantz
85055d82bf Regenerate Domain metadata on user (dis)connect 2016-06-02 17:05:58 -07:00
James B. Pollack
f6644ad2bb change artemis url 2016-06-02 16:58:48 -07:00
SamGondelman
8b76af531b made touch hand orientation more comfortable, fixed all the touch key mappings, exposed capacitive touch keys for use later 2016-06-02 16:52:17 -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
samcake
681da201fc COrrect the name of the Unlit dbug view 2016-06-02 16:25:14 -07:00
samcake
079f6af2cc Fixing the gamma correction for the debug view of occlusion 2016-06-02 16:14:46 -07:00
Zach Pomerantz
b13e7a1a8f Encapsulate metadata in DomainMetadata 2016-06-02 16:04:27 -07:00
Zach Pomerantz
18696144f1 Move metadata generation to DomainMetadata 2016-06-02 15:36:29 -07:00
Zach Pomerantz
87e27d9570 Factor out metadata generation from heartbeat 2016-06-02 15:35:47 -07:00
Zach Pomerantz
bf920c2b80 Compact Domain heartbeat JSON 2016-06-02 15:34:36 -07:00
samcake
2489df8229 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 15:16:41 -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
SamGondelman
69971a3439 fix one more tab 2016-06-02 12:20:05 -07:00
SamGondelman
642438a259 fix tabs 2016-06-02 12:18:56 -07:00