Commit graph

6180 commits

Author SHA1 Message Date
SamGondelman
9b41cb5554 improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot 2018-07-25 15:19:25 -07:00
SamGondelman
fbcddf1445 test gradual normal interpolation 2018-07-24 14:15:49 -07:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
SamGondelman
763e6465a2 followNormal, fixin stuff 2018-07-20 10:41:24 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
SamGondelman
39fa3420ec pointer rendering, update teleport.js 2018-07-19 12:02:39 -07:00
Qliemillar
2163bf1ef0
Merge pull request #13628 from r3tk0n/16726-Vive-Blackboxes
16726 - Remove Black Boxes ( HMD.requestShowHandControllers() )
2018-07-19 12:34:38 -06:00
Howard Stearns
2378cdfdc6
Merge pull request #13624 from howard-stearns/app-refactor4-merge
appUi module, and use in People app
2018-07-19 11:07:54 -07:00
Qliemillar
3466d944fb
Merge pull request #13630 from huffman/fix/create-undo-while-disabled-visual
Disable showing the entity edit tools when undoing while disabled
2018-07-19 09:03:40 -06:00
howard-stearns
a904182cc2 cr feedback 2018-07-18 14:03:26 -07:00
Thijs Wenker
b29044fd7e
Merge pull request #13618 from dback2/clickHandleSwitchEntityFix
Fix quickly clicking an edit handle causing selected entity change
2018-07-18 22:49:11 +02:00
howard-stearns
74914ffb3e Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge 2018-07-18 13:16:50 -07:00
Ryan Huffman
b015845371 Disable showing the entity edit tools when undoing while disabled 2018-07-18 11:54:40 -07:00
r3tk0n
a9eb8103f6 Clean up comments a bit. 2018-07-18 09:52:25 -07:00
r3tk0n
f7b49598b5 Disabled tip boxes for Vive controllers, as per experience team request. 2018-07-18 09:50:59 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler
Allow creators to disable hand touch from javascript
2018-07-18 08:16:37 -06:00
Qliemillar
07a7bbbcf6
Merge pull request #13621 from thoys/fix/create/desktop-tablet#master
[FIX] Use create app in tablet mode when choosing to use tablet in desktop mode
2018-07-17 14:36:55 -06:00
howard-stearns
bfd9e208b5 Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge 2018-07-17 12:31:18 -07:00
Thijs Wenker
09e1090e72 Use create app in tablet mode when choosing to use tablet in desktop mode 2018-07-17 17:33:13 +02:00
Qliemillar
42daa33d11
Merge pull request #13560 from danteruiz/fix-parent-grab-and-flickering
fix parent grab dropping and cullig flickering when flying at high velocities
2018-07-17 08:53:41 -06:00
luiscuenca
82a3b73de8 Added disable hand touch for entityID 2018-07-17 07:06:48 -07:00
howard-stearns
cb5ac6f42c Merge branch 'master' of https://github.com/highfidelity/hifi into app-refactor4-merge 2018-07-16 17:43:53 -07:00
luiscuenca
84dac94379 Allow creator to disable hand touch 2018-07-16 17:03:50 -07:00
Zach Fox
7cdb84ee68
Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup
Fix MS16562: Massive PAL speedup!
2018-07-16 16:45:01 -07:00
howard-stearns
2c92b02b95 lint 2018-07-16 16:28:44 -07:00
howard-stearns
f1fed37763 cleanup 2018-07-16 15:58:01 -07:00
howard-stearns
4e6aa34814 Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4 2018-07-16 13:07:08 -07:00
howard-stearns
ffa5259319 cleanup references to button, tablet 2018-07-16 13:06:12 -07:00
howard-stearns
46061a2a15 initial with pal 2018-07-16 11:54:05 -07:00
Dante Ruiz
20a8275343 min diff 2018-07-16 11:43:29 -07:00
Dante Ruiz
fa2b975e8f undo some wrong changes 2018-07-16 11:42:38 -07:00
Dante Ruiz
0fa2a71d0f actually fix requested changes 2018-07-16 11:35:53 -07:00
Dante Ruiz
d81420542c making PR requests 2018-07-16 11:00:27 -07:00
Dante Ruiz
47eb7a0899 Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab-and-flickering 2018-07-16 10:04:42 -07:00
Qliemillar
511b297be5
Merge pull request #13597 from dback2/entityListDeleteSpamFix
Fix entity list refresh when entity deleted
2018-07-16 09:49:25 -06:00
David Back
46a9521939 fix selecting an edit handle causing selected entity change 2018-07-13 17:40:24 -07:00
Zach Fox
c3ffe7eb97 Fix bubble shading; fix audio loudness calculation 2018-07-13 13:55:32 -07:00
David Back
c225c3deca
Merge pull request #13608 from dback2/alignSelectionToGridFix
Fix aligning selection to grid
2018-07-13 13:33:26 -07:00
Zach Fox
4daa0c6537 CR feedback 2018-07-13 12:47:45 -07:00
David Back
0a738e36a8
Merge pull request #13569 from dback2/hmdHandlesInBoundingBox
Only clamp edit handles in HMD when outside bounding box
2018-07-13 10:55:54 -07:00
unknown
151f948b26 prints 2018-07-12 19:26:20 -07:00
unknown
acae4df3c3 fix align to selection to grid 2018-07-12 19:23:06 -07:00
Alexander Ivash
437f49ac22 16683 Avatar App - Add to Favorites Button Not Working 2018-07-13 03:01:02 +03:00
Zach Fox
fa518b995a Fix my audio level 2018-07-12 15:16:54 -07:00
Zach Fox
92756d81ad Implement MS16562: Massive PAL speedup! 2018-07-12 15:05:31 -07:00
unknown
306a77c039 fix delete event 2018-07-12 12:46:18 -07:00
Zach Fox
ee08ef981d Slightly increase linear damping 2018-07-11 10:44:24 -07:00
Zach Fox
6218f80387 MS14743 again: More bandaids for preventing Snappy printouts from falling thru floor 2018-07-11 10:07:02 -07:00
Zach Fox
2fad55e5d0 Prevent PAL from re-enabling ContextOverlayInterface when it's not supposed to 2018-07-10 15:56:13 -07:00
David Back
7a7b9730ee only clamp handles in hmd outside bounding box 2018-07-09 15:36:22 -07:00