Seth Alves
668bc35227
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge
2017-01-06 13:31:13 -08: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
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
Seth Alves
2bff5582bc
Merge pull request #9321 from hyperlogic/tablet-ui
...
Made back button entity collisionless
2017-01-05 15:43:14 -08:00
David Kelly
1f3c2bb271
Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL
2017-01-05 16:35:47 -07:00
Anthony J. Thibault
baf2fce2c3
Made back button entity collisionless
2017-01-05 15:33:21 -08:00
Seth Alves
d072b1524a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-05 15:27:11 -08:00
Anthony J. Thibault
f63ee4ffe0
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-05 15:06:35 -08: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
Dante Ruiz
879fb93def
bug fixed
2017-01-05 22:00:09 +00: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
Anthony J. Thibault
85de0d3bbf
Added local only spatialized button click sounds to tablet
2017-01-05 13:54:06 -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
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
Anthony Thibault
c972e9ac51
Merge pull request #9301 from fayeli/tablet-button-states
...
Tablet Button Active State's Text and Icon
2017-01-05 10:00:10 -08: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
Howard Stearns
12fffe8530
messages
2017-01-04 20:37:56 -08:00
Brad Hefta-Gaub
368f48f0a7
Merge pull request #9247 from huffman/feat/tutorial-touch-grip
...
Add support for new Touch grip mappings to tutorial
2017-01-04 17:58:05 -08:00
howard-stearns
9709bedca7
checkpoint
2017-01-04 16:55:58 -08:00
howard-stearns
97780ac97e
color, infront
2017-01-04 16:09:15 -08:00
howard-stearns
d78b7d9a28
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-show-lastEditedBy
2017-01-04 15:48:45 -08:00
Howard Stearns
3d8da683db
Merge pull request #9290 from zfox23/PersonalMute
...
Personal mute; Quasi-ignore; Reversible PAL actions
2017-01-04 14:37:09 -08:00
Zach Fox
675159be45
Last commit to fix final bugs
2017-01-04 14:33:02 -08:00
Zach Fox
ac41e8abc4
Bugfix re: population; remove user image for now
2017-01-04 14:06:51 -08:00
Zach Fox
03fbfc85f9
Short delay before populating PAL when changing domains
2017-01-04 13:50:37 -08:00
Zach Fox
c695878025
Clear local ignored list upon domain change
2017-01-04 13:31:16 -08:00
Faye Li Si Fi
934b56bd50
replace redundant toggle logic
2017-01-04 12:41:49 -08:00
Zach Fox
dde5f69ac9
More CR & simplifications
2017-01-04 12:41:30 -08:00
Faye Li Si Fi
475430c1e0
testing new active state with mute.js
2017-01-04 12:25:27 -08:00
howard-stearns
c79c489002
selecting user in pal shows entities lastEditedBy user this session
2017-01-04 11:19:32 -08:00
Dante Ruiz
4dd8a8aa0d
added new model
2017-01-04 11:09:27 -08:00
Dante Ruiz
3f34cb863e
removed whitespace
2017-01-04 11:09:26 -08:00
Dante Ruiz
f81402fb0f
improved tablet position
2017-01-04 11:09:26 -08:00
Zach Fox
14def61eb8
More CR comments; 1 bug remaining re: sig slot
2017-01-03 17:32:47 -08:00
Anthony Thibault
9502a8b0c4
Merge pull request #9294 from fayeli/tablet-mic-level
...
Audio level calculation in tabletUI.js
2017-01-03 16:12:04 -08:00
Faye Li
fc186a281f
update audio bar only when tablet is shown
2017-01-03 14:37:25 -08:00
Faye Li
4391e9eaee
send the mic level from js
2017-01-03 12:57:08 -08:00
Brad Hefta-Gaub
d440532cff
make sure RPC is timely
2017-01-03 11:10:07 -08:00
