Dante Ruiz
cec2692c77
fixed issues
2017-01-07 00:06:42 +00:00
Dante Ruiz
32938861cd
indentation fix
2017-01-07 00:03:04 +00:00
Dante Ruiz
31e57a0dcd
update branch
2017-01-06 15:35:32 -08:00
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
69082b7c34
Merge pull request #9327 from sethalves/tablet-ui-merge
...
update tablet-ui
2017-01-06 13:32:20 -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
Clément Brisset
0a08563b1f
Merge pull request #9325 from Atlante45/log-dialog
...
Log dialog doesn't float on top
2017-01-06 10:40:09 -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
Atlante45
428a7f3bf8
Log Dialog doesn't float on top
2017-01-05 17:49:39 -08: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
Howard Stearns
3f54428744
Merge pull request #9313 from howard-stearns/pal
...
People Action List
2017-01-05 15:49:56 -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
Seth Alves
ce4dabfcf4
Merge pull request #9320 from sethalves/tablet-ui
...
Tablet ui
2017-01-05 15:43:00 -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
Seth Alves
2ba8a536a4
Merge pull request #9316 from hyperlogic/tablet-ui
...
Added local only spatialized button click sounds to tablet
2017-01-05 15:25:24 -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
Anthony J. Thibault
70078b0e78
Fix for linux build
2017-01-05 15:04:16 -08:00
howard-stearns
ef02c84759
further simplification of letterbox, and use for selection failures
2017-01-05 14:46:32 -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
howard-stearns
0cdeac8736
abstract out letterbox message
2017-01-05 14:32:31 -08:00
Seth Alves
907ffd7e98
Merge pull request #9317 from druiz17/tabletBug
...
Fixed interface crashing when bring up tablet
2017-01-05 14:26:00 -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
Brad Hefta-Gaub
86c0d76955
Merge pull request #9314 from jherico/present_priority
...
Use a higher thread priority for Oculus present
2017-01-05 14:02:50 -08:00
howard-stearns
c4c1ea9578
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-05 14:02:44 -08:00
Howard Stearns
64a706f9e2
Merge pull request #9315 from zfox23/FixModJSAfterPAL
...
Allow for compatibility with old mod.js script after PAL changes
2017-01-05 14:00:41 -08: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
7198cd13b5
added button click wav
2017-01-05 13:56:04 -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
