humbletim
c7a561aff9
trim extra debugging code
2017-01-17 01:23:03 -05:00
humbletim
827aa68d3f
cleanup pass
2017-01-16 19:50:25 -05:00
humbletim
c9fd650e70
update to support click/far-click toggling and userData.disabled setting
2017-01-16 19:37:31 -05:00
David Kelly
e36f6b6521
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-12 08:40:04 -07:00
howard-stearns
88c2c534ad
don't set bogus values
2017-01-11 17:01:46 -08:00
howard-stearns
9298bcf628
remove log spam
2017-01-11 16:32:15 -08:00
howard-stearns
5c06841732
use update signal instead of timer
2017-01-11 16:24:05 -08:00
howard-stearns
357b4db1db
fix mouse vs lasers, again
2017-01-11 14:24:24 -08:00
howard-stearns
a808a8c749
revert "fix competition between seek mouse and lasers"
2017-01-11 14:23:18 -08:00
David Kelly
1e3a00d1fb
Enable the LT and RT signals, use them
...
A bit cleaner. Still have to keep track of which hand is the mouse, but
this removes some of the hacky code.
2017-01-11 14:43:37 -07:00
David Kelly
0a018e133d
Blue laser should be enough to hover
2017-01-10 18:23:39 -07:00
David Kelly
4fade3a53e
CR feedback
2017-01-10 16:12:02 -07:00
David Kelly
5fd11ade9c
minor tweak to hover color for glow effect
2017-01-10 16:00:19 -07:00
David Kelly
2d55ed2658
Fix hover - probably my merge didn't get this line
2017-01-10 15:51:24 -07:00
David Kelly
17333ee307
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-10 15:24:31 -07:00
David Kelly
5c6ae6fe95
HMD hover working now
...
Had to hack a bit -- the trigger mappings were not firing so instead I
just get the hand that is triggering (when HMD is active) and handle the
hover almost as before, with mouse move events. Some thought about how
to map a 'mouse move' event into something where 2 triggers can both be
pressed at same time was in order.
2017-01-10 14:47:34 -07:00
howard-stearns
e67675ac36
color nodes by audio level
2017-01-10 13:24:38 -08:00
howard-stearns
42b2b2154e
store audio level in overlay data object (so that they gc properly and we
...
have the data to color with).
2017-01-10 13:08:07 -08:00
David Kelly
fef8c8900f
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-09 08:51:42 -07:00
David Kelly
409e785aa3
fix un-hover, add some comments
2017-01-09 08:42:43 -07:00
Chris Collins
215659c695
Enabled the ability to have other marketplaces.
...
Enabled the ability to have other marketplaces.
2017-01-07 08:17:13 -08:00
David Kelly
5eff12af34
add hover effect to PAL
2017-01-06 18:09:23 -07:00
Howard Stearns
36c99a604b
Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal
...
Edit button to select in pal
2017-01-06 13:17:29 -08:00
Clément Brisset
48459be13c
Merge pull request #9312 from ZappoMan/fixMouseLasers
...
fix competition between seek mouse and lasers
2017-01-06 13:11:01 -08:00
howard-stearns
2f5f53c8e4
cr
2017-01-06 10:28:09 -08:00
howard-stearns
b149fa3d79
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-06 10:21:22 -08:00
Howard Stearns
220880d6f8
Merge pull request #9311 from davidkelly/dk/prettierPAL
...
Somewhat prettier node overlays for PAL
2017-01-06 09:54:38 -08:00
Brad Hefta-Gaub
349f0763e5
Merge pull request #9310 from PhilipRosedale/chair
...
Simple chair script
2017-01-06 08:18:31 -08:00
David Kelly
a107b2f06e
lost my - sign
2017-01-06 08:44:22 -07:00
David Kelly
88ed96918a
Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL
2017-01-05 18:30:28 -07:00
David Kelly
4504b31c1d
Bugfix, plus minor cr stuff
...
Seems to solve the 'due north' issue - we now have the main overlay as
the sphere, and it is the only thing clickable. The model is no longer
clickable, so you cannot click clouds to select things. Prevents some
confusion when opaque objects have ignoreRayIntersection, allowing you
to select a cloud you cannot see (i.e clicking near but not on the
sphere you can see).
2017-01-05 18:20:40 -07:00
howard-stearns
83685740c4
change wording for common case
2017-01-05 16:37:40 -08:00
howard-stearns
f5c4535115
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-05 16:29:34 -08:00
David Kelly
1f3c2bb271
Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL
2017-01-05 16:35:47 -07:00
David Kelly
ef92a091b2
node overlay model now an asset
2017-01-05 15:19:09 -07:00
David Kelly
c95e880677
scale offsets to avatar height
2017-01-05 15:04:40 -07:00
howard-stearns
0670a4689f
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-05 13:57:44 -08:00
Philip Rosedale
9bd858c1ab
no log spam
2017-01-05 13:49:38 -08:00
Philip Rosedale
07ecf60485
remove sit when close
2017-01-05 13:48:31 -08:00
Howard Stearns
bbf7d16537
process consistent select message
2017-01-05 13:45:03 -08:00
David Kelly
2949560e90
Corrected lame math error
...
so we are centered now, and put the overlay up a bit higher. Still need
to make that scale properly with avatar size.
2017-01-05 14:22:35 -07:00
Philip Rosedale
65b9aaed1b
one more try
2017-01-05 13:13:50 -08:00
Philip Rosedale
a689d52004
wrap far trigger too with seated check
2017-01-05 13:08:50 -08:00
Philip Rosedale
0ad9a8625b
Added far trigger
2017-01-05 12:58:26 -08:00
howard-stearns
47aa1e4f8e
add pal to defaultScripts
2017-01-05 12:23:17 -08:00
Brad Hefta-Gaub
cb69e70781
fix competition between seek mouse and lasers
2017-01-05 11:31:50 -08:00
David Kelly
75aa32ac6a
remove some debugging crap
2017-01-05 12:01:55 -07:00
David Kelly
d5e6afa15a
slightly further forward, a little bigger
2017-01-05 11:54:50 -07:00
David Kelly
f1d6335a24
First stab at making PAL avatar highlighting a bit prettier
...
Working around rendering issues with model-based overlays and the
drawInFront, we use 2 overlays. One is the model, another is
a sphere with drawInFront on. Still need to dial in colors and sizes
but this should be close enough for iteration.
2017-01-05 10:18:58 -07:00
Brad Hefta-Gaub
e78582ebae
Merge pull request #9285 from PhilipRosedale/springAway
...
script to push things with your hands
2017-01-05 08:02:10 -08:00
