Commit graph

18993 commits

Author SHA1 Message Date
Ryan Huffman
97719cd128 Update scriptengine update rate to match displayPlugin target framerate 2017-02-03 10:01:02 -08:00
Chris Collins
bac5bd5c0e Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes
tablet-ui: Bug fixes
2017-02-02 17:53:47 -08:00
Anthony J. Thibault
b44e5b5a1f tablet-ui: preferences for tablet ui scaling
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
2017-02-02 14:05:07 -08:00
Dante Ruiz
2cc1ee008d added clicking sounds to tablet menus 2017-02-02 17:46:42 +00:00
Seth Alves
f907af1b9b Merge pull request #9587 from hyperlogic/bug-fix/tablet-ui-network-2d-tablet
Tablet-ui: fix tablet orientation for users in 2d desktop mode
2017-02-01 20:17:40 -08:00
Anthony J. Thibault
de55a5dfe6 tablet-ui: reduced volume of button click 2017-02-01 18:47:50 -08:00
Anthony J. Thibault
9d124983a6 Tablet-ui: fix tablet orientation for users in 2d desktop mode
Double 180 flip.  Once before to account for -z forward of camera.
Once after to account for avatar 180 flip.
2017-02-01 17:48:28 -08:00
Chris Collins
eabd41d0e9 Merge pull request #9579 from hyperlogic/bug-fix/tablet-ui-keyboard-focus
tablet-ui: Fix for keyboard focus
2017-02-01 15:26:02 -08:00
Anthony J. Thibault
2760065ee1 Bug fix for previous commit 2017-02-01 13:51:31 -08:00
Anthony J. Thibault
9be6fe2192 tablet-ui: Fix for keyboard focus box still being visible sometimes 2017-02-01 13:44:12 -08:00
Zach Fox
8b1161b0b0 Fix it 2017-02-01 12:32:30 -08:00
Anthony J. Thibault
ca79397ee8 tablet-ui: Fix for keyboard focus
Don't allow clicks on non-web entities from stealing focus away from web overlays.
2017-02-01 11:22:17 -08:00
Seth Alves
ab8be15ce0 Merge pull request #9570 from highfidelity/tablet-ui
Tablet ui
2017-02-01 09:38:13 -08:00
Anthony J. Thibault
8f362861eb tablet-ui: button icon images now work with http urls. 2017-01-31 16:53:25 -08:00
Seth Alves
645aad7bb0 Merge pull request #9557 from hyperlogic/tablet-ui
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -08:00
Brad Hefta-Gaub
2fc6b4b0af Merge pull request #9544 from humbletim/fix-rightclick-menu
Hide webview context menus when clicked
2017-01-31 13:03:50 -08:00
Anthony J. Thibault
0f75668923 Moved Model setting of _spatiallyNestableOverride to constructor 2017-01-31 09:36:21 -08:00
Seth Alves
7c2957cfa7 merge from upstream 2017-01-31 08:57:36 -08:00
Brad Hefta-Gaub
b597f3e098 Merge pull request #9267 from AndrewMeadows/report-all-collision-events
fix for missed START collision events
2017-01-31 08:54:58 -08:00
Seth Alves
7d80679652 Merge pull request #9566 from sethalves/tablet-ui
Tablet ui
2017-01-31 05:03:51 -08:00
Seth Alves
39d195fce2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-31 05:02:07 -08:00
Alan Z
6e7260207f Fix label typo in help graphic
fixes #2748 in Fogbugz
2017-01-30 16:51:22 -08:00
Anthony J. Thibault
0962a15a06 Fix for one-frame lag in the tablet stylus. 2017-01-30 15:39:55 -08:00
Andrew Meadows
0809149a8c harvest collision events before disowning 2017-01-30 13:21:23 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode.
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Anthony J. Thibault
a9b478888c First cut of Web3DOverlays without FXAA applied. 2017-01-30 11:24:58 -08:00
Seth Alves
ac475300f6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-30 08:15:29 -08:00
humbletim
8c0d7f9e28 hide context menu on item click 2017-01-28 14:37:49 -05:00
humbletim
8f4586b9b8 hide webview context menu when clicked 2017-01-28 10:46:50 -05:00
Zach Fox
5cba928540 Do it! 2017-01-27 16:30:59 -08:00
Seth Alves
fa61bbe2a6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 18:21:39 -08:00
ZappoMan
4c80422a73 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 14:34:58 -08:00
Seth Alves
db38503d57 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 13:48:59 -08:00
samcake
19858bda78 Merge pull request #9493 from AndrewMeadows/otherAvatars
optimize, prioritize, and timebox processing of avatar updates
2017-01-26 13:30:51 -08:00
Seth Alves
0b51b1d566 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub
5ada689ab7 Merge pull request #9497 from ctrlaltdavid/fix-clara-download
Fix intermittent Clara.io download crashes
2017-01-26 10:58:27 -08:00
Seth Alves
e2b1f4b2ab include tablet fbx with interface distribution rather than get it from s3 2017-01-26 10:20:46 -08:00
Andrew Meadows
5783db910b remove some unhelpful trace profiling data 2017-01-26 08:35:26 -08:00
Andrew Meadows
82f52b9658 fix bug: Avatar instance not getting deleted 2017-01-26 08:35:26 -08:00
Andrew Meadows
2264c29604 less magic 2017-01-26 08:35:26 -08:00
Andrew Meadows
0f09e60acd remove unhelpful comment 2017-01-26 08:35:26 -08:00
Andrew Meadows
01e14eec47 remove commented out cruft 2017-01-26 08:35:26 -08:00
Andrew Meadows
ac180758ad sort, optimize, and timebox process avatar updates 2017-01-26 08:35:26 -08:00
Andrew Meadows
d3dcc2b415 remove cruft: billboard option for Head::simulate() 2017-01-26 08:35:26 -08:00
Andrew Meadows
887707426e remove cruft: Head::getScalePivot() 2017-01-26 08:35:26 -08:00
Andrew Meadows
69a7b1ef76 move some stuff out of Avatar::simulate()
call it explicity in AvatarManager::updateOtherAvatars()
2017-01-26 08:35:26 -08:00
Andrew Meadows
b8afc87ad9 remove cruft 2017-01-26 08:35:26 -08:00
Andrew Meadows
e65d9309b3 remove cruft: Avatar::setShouldDie() 2017-01-26 08:35:26 -08:00
Andrew Meadows
e363423992 compute priority of avatar and sort before update 2017-01-26 08:35:26 -08:00
Andrew Meadows
88bf126168 remove old avatar culling and LOD logic 2017-01-26 08:35:25 -08:00