Dante Ruiz
19c6a672d9
re-did tablet position
2017-01-06 15:35:32 -08:00
Seth Alves
20a84e7288
Merge pull request #9322 from sethalves/tablet-ui-reenable-web-lasers
...
Tablet ui reenable web lasers
2017-01-06 15:23:16 -08:00
Seth Alves
ad6175857d
Merge pull request #9328 from hyperlogic/tablet-ui
...
Allow Hifi.SoundEffect to be used in all qml
2017-01-06 15:21:08 -08:00
Anthony J. Thibault
0860c50a49
Allow Hifi.SoundEffect to be used in all qml
...
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
2017-01-06 14:01:13 -08:00
Seth Alves
d32866c8cd
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers
2017-01-06 13:32:47 -08:00
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
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
Seth Alves
4b3a5171d3
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers
2017-01-05 15:43:46 -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
Seth Alves
bacaadc7ca
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers
2017-01-05 14:35:14 -08:00
Seth Alves
195b92d05d
lasers on webpage work again
2017-01-05 14:35:02 -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
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
Seth Alves
5e9c37777c
Merge branch 'fixMouseLasers' of github.com:ZappoMan/hifi into tablet-ui-reenable-web-lasers
2017-01-05 12:50:07 -08:00
Seth Alves
52ef22770b
make showing of stylus be proximity based rather than raypick based
2017-01-05 12:49:50 -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
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
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
Philip Rosedale
88429c4033
wrong file
2017-01-04 23:51:05 -08:00
Philip Rosedale
3fd255a7a7
Merge branch 'master' of https://github.com/highfidelity/hifi into chair
2017-01-04 23:49:07 -08:00
Philip Rosedale
ba43a18529
simple chair entity script
2017-01-04 23:48:24 -08:00
Howard Stearns
12fffe8530
messages
2017-01-04 20:37:56 -08:00
