Commit graph

50958 commits

Author SHA1 Message Date
Andrew Meadows
54b4612ee3 fix for missed START collision events 2017-01-30 13:18:26 -08:00
Zach Fox
725cfa8045 Fix it! 2017-01-30 13:00:52 -08:00
Howard Stearns
89cc6ac315 Merge pull request #9548 from howard-stearns/non-blocking-entity-filter-init
fetch entity filter script asynchronously (but reject edits while waiting)
2017-01-30 12:46:23 -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
Ken Cooke
ab0d5ec178 Fix for memory-leak in Windows audio stack (audiodg.exe grows without bound) 2017-01-30 11:59:30 -08:00
Faye Li
8e64de26a9 Merge branch 'tablet-ui' into new-users-js 2017-01-30 11:25:58 -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
howard-stearns
93414d802d fetch entity filter script asynchronously (but reject edits while waiting) 2017-01-30 11:06:36 -08:00
Zach Pomerantz
eb00c7ba11 group constants in audio mixer gain computation 2017-01-30 17:48:03 +00: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
humbletim
8c0d7f9e28 hide context menu on item click 2017-01-28 14:37:49 -05: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
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
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
Faye Li
ff1c4995af removed unused code 2017-01-27 15:44:07 -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
Faye Li
ea366dd227 removed unused code 2017-01-27 15:38:49 -08:00
Ryan Huffman
8acb3f9b53 Update stopwatchServer.js to use self instead of this 2017-01-27 15:30:05 -08:00
Ryan Huffman
47235d24aa Add headers to stopwatch scripts 2017-01-27 15:29:48 -08:00
Ryan Huffman
9df7bf00df Add stopwatch spawner script 2017-01-27 15:19:40 -08:00
Faye Li
8091b0ced4 button style 2017-01-27 13:33:07 -08:00
Zach Pomerantz
e7e550d78c add injector attenuation to audio gain appx 2017-01-27 16:18:10 -05: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
Zach Pomerantz
2da4dce8be rm statics from audio-mixer mixing 2017-01-27 15:46:25 -05:00
Zach Pomerantz
fe1847f965 clean up audio-mixer computeGain helper 2017-01-27 15:46:12 -05:00
Zach Pomerantz
ca727b7920 inline audio mix helpers 2017-01-27 15:28:43 -05:00
Zach Pomerantz
c4190ad4c4 add hrtf adjustment to throttle gain appx 2017-01-27 15:26:49 -05:00
Zach Pomerantz
7bcf136dc9 modularize audio throttle gain appx 2017-01-27 15:26:32 -05:00
Thijs Wenker
a2da1e3dc1 Merge branch 'master' into fix-ac-playback-audio 2017-01-27 21:00:57 +01:00
Zach Pomerantz
38af24ad4a Merge branch 'master' of github.com:highfidelity/hifi into audio/threaded-local 2017-01-27 14:57:27 -05:00
samcake
45dd09e941 Merge pull request #9531 from jherico/temp_disable_sparse
Disable sparse textures
2017-01-27 11:38:15 -08:00
Zach Pomerantz
24ca765a39 add hrtf gain getter 2017-01-27 14:36:59 -05: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
Faye Li
bf51ba7195 button brings up add/remove friends page 2017-01-27 11:34:38 -08:00
Ryan Huffman
f88433b7bb Add tealight.js entity server script 2017-01-27 11:23:17 -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
Faye Li
bfbee20f43 display friends 2017-01-27 10:19:20 -08:00
Bradley Austin Davis
8d45f43ba8 Disable sparse textures 2017-01-27 10:06:31 -08:00
Andrew Meadows
489fbc6299 compute Model's local bounds outside render lambda 2017-01-27 09:35:36 -08:00