Commit graph

50632 commits

Author SHA1 Message Date
Anthony J. Thibault
0962a15a06 Fix for one-frame lag in the tablet stylus. 2017-01-30 15:39:55 -08:00
Anthony Thibault
5a0990fbe4 Merge pull request #9550 from hyperlogic/tablet-ui2
tablet-ui -> master, PR feedback
2017-01-30 14:20:28 -08:00
druiz17
74085452b4 Merge pull request #9551 from hyperlogic/tablet-ui
Improved legibility of tablet in desktop mode.
2017-01-30 13:25:40 -08:00
Anthony J. Thibault
0542945110 Moved SoundEffect into a separate compilation unit.
Also, fixed license header in TabletScriptingInterface, to include proper author and date.
2017-01-30 12:46:22 -08:00
Anthony J. Thibault
98b53d1d29 Don't allow mouse dragging the tablet in HMD mode. 2017-01-30 12:07:18 -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
116eef0a78 Merge pull request #9546 from sethalves/tablet-ui
Tablet ui
2017-01-30 08:17:05 -08:00
Seth Alves
ac475300f6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-30 08:15:29 -08:00
Ken Cooke
ae8d0d1948 Merge pull request #9527 from thoys/fix-ac-playback-audio
Fix AC recording playback audio encoding
2017-01-28 17:43:28 -08:00
Zach Fox
04ad35aeb1 Merge pull request #9542 from zfox23/PAL_NameCount
PAL: Display avatar count in table header
2017-01-28 09:00:53 -08:00
Zach Fox
5cba928540 Do it! 2017-01-27 16:30:59 -08:00
Howard Stearns
6f36015ff6 Merge pull request #9541 from howard-stearns/entity-filter-startup-logging
add debug logging to entity server startup in the case of having a filter
2017-01-27 16:10:22 -08:00
howard-stearns
673ac5680f add debug logging to entity server startup in the case of having a filter 2017-01-27 15:40:17 -08:00
Seth Alves
149fdcd6b4 Merge pull request #9536 from sethalves/tablet-ui
Tablet ui
2017-01-27 13:07:12 -08:00
Seth Alves
1a511272b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-27 13:06:22 -08:00
Seth Alves
fb01342436 Merge pull request #9535 from druiz17/tabletBug
close tablet with mouse in HMD
2017-01-27 13:04:52 -08:00
Dante Ruiz
2c7cbb1bd9 close tablet with mouse in HMD 2017-01-27 20:58:36 +00:00
Thijs Wenker
a2da1e3dc1 Merge branch 'master' into fix-ac-playback-audio 2017-01-27 21:00:57 +01:00
samcake
45dd09e941 Merge pull request #9531 from jherico/temp_disable_sparse
Disable sparse textures
2017-01-27 11:38:15 -08:00
Brad Hefta-Gaub
898c9b176d Merge pull request #9533 from zzmp/fix/sleep_until
Fix audio-mixer timing for WIN32
2017-01-27 11:35:02 -08:00
Seth Alves
b9087f4b04 Merge pull request #9534 from druiz17/tabletBug
Fixed tablet from crashing when clicking on items in the menu
2017-01-27 11:09:50 -08:00
Dante Ruiz
006c3a99dc fix tablet menu crashing 2017-01-27 19:04:53 +00:00
Dante Ruiz
22a40f7ee7 fixed goto bug 2017-01-27 18:32:52 +00:00
Zach Pomerantz
d82c8b251a use sleep_for to avoid WIN32 sleep_until bug 2017-01-27 13:22:50 -05:00
Bradley Austin Davis
8d45f43ba8 Disable sparse textures 2017-01-27 10:06:31 -08:00
Seth Alves
8e1bd70e44 Merge pull request #9528 from sethalves/tablet-ui
Tablet ui
2017-01-26 18:22:55 -08:00
Seth Alves
fa61bbe2a6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 18:21:39 -08:00
Chris Collins
5ed376afc9 Merge pull request #9257 from ZappoMan/tuneAvatarInfo
avatar mixer bandwidth optimization
2017-01-26 17:33:57 -08:00
Thijs Wenker
cdc0f3ddd2 - make AC recording audio play with right encoding
- spelling fix
2017-01-27 01:19:11 +01:00
Howard Stearns
866f9debcd Merge pull request #9526 from highfidelity/edit-entity-filter
Edit entity filter (from branch)
2017-01-26 16:00:48 -08:00
ZappoMan
af426063ac fix bad merge 2017-01-26 15:19:25 -08:00
Seth Alves
b3500047b2 Merge pull request #9525 from sethalves/tablet-ui
Tablet ui
2017-01-26 15:10:43 -08:00
Seth Alves
2edcc7359d Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 15:09:54 -08:00
Seth Alves
95d5c64e83 put a schmitt trigger in place to de-bounce tablet clicks 2017-01-26 15:09:35 -08:00
Howard Stearns
d1a137cd18 Merge pull request #9518 from howard-stearns/entity-filter-resource
Entity filters by URL
2017-01-26 15:06:57 -08:00
Seth Alves
eccf435f01 Merge pull request #9524 from sethalves/tablet-ui
Tablet ui
2017-01-26 14:56:01 -08:00
Seth Alves
f808549675 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 14:54:50 -08:00
Seth Alves
c0f169e242 allow tablet-stabbers to more easily click buttons 2017-01-26 14:54:32 -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
d6dbc4a47d Merge pull request #9523 from sethalves/tablet-ui
Tablet ui
2017-01-26 14:31:42 -08:00
Seth Alves
e3d4cae515 avoid having the snapshot script be multi-activated by a single button-click 2017-01-26 14:29:49 -08:00
Chris Collins
c0ee091946 Merge pull request #9502 from zzmp/audio/throttle
Throttle audio with PI controller, by node
2017-01-26 14:25:44 -08:00
howard-stearns
f9f0a4ea2d fix startup-failure case 2017-01-26 14:05:16 -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
samcake
52cbac0018 Merge pull request #9510 from jherico/sparse_size_estimation
Attempt to account for sparse texture memory overhead
2017-01-26 12:59:15 -08:00
Seth Alves
d85d892057 Merge pull request #9522 from fayeli/PAL-to-PEOPLE
Tablet Button name from PAL to PEOPLE
2017-01-26 12:58:16 -08:00
Faye Li
44fc8a5fbf update button name 2017-01-26 11:23:06 -08:00
Seth Alves
a52b1efca9 Merge pull request #9521 from sethalves/tablet-ui
Tablet ui
2017-01-26 11:01:49 -08:00