Commit graph

45047 commits

Author SHA1 Message Date
samcake
a8dd06ad38 Better groupint of the diffuseion of the curvature for easier fix for mini mirror 2016-07-18 19:24:43 -07:00
samcake
34f2a96888 Adding the check for Obscurrance 2016-07-18 18:11:51 -07:00
samcake
80587ca8a3 using the textureGather lookup 2016-07-18 12:52:21 -07:00
samcake
be4839d46c a better depth filter 2016-07-18 12:26:04 -07:00
samcake
a4ad4659c4 Fixing build warnings 2016-07-18 11:17:06 -07:00
samcake
a44aee84ce Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 10:16:55 -07:00
Brad Hefta-Gaub
2cd38064a5 Merge pull request #8235 from jherico/more_shapes
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-18 09:05:24 -07:00
samcake
86d9ee56d2 Downsampling shader pass 2016-07-18 03:56:11 -07:00
samcake
5a0ce81516 Performing the curvature generation and diffusion at half the resolution 2016-07-18 03:54:05 -07:00
samcake
378f4576fa a bit better making the curvature and diffusion passes 2016-07-17 20:18:06 -07:00
samcake
cfa51ae1f5 REmoving problematic timers for mac 2016-07-17 18:32:43 -07:00
samcake
9332f82d54 Carrefully improving the curvature generation performances 2016-07-17 17:13:07 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Brad Hefta-Gaub
dc2741950a Merge pull request #8259 from kencooke/improved-hrtf
Fix the AudioMixer distance attenuation.
2016-07-15 22:36:51 -07:00
Ken Cooke
b03686c37f Change the default domain attenuation level to 0.5 2016-07-15 22:02:56 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
Ken Cooke
1ee608ad2c Cleanup 2016-07-15 18:23:12 -07:00
Ken Cooke
59ac2a789f Fix the AudioMixer distance attenuation.
The zone settings are still used, and still match the documentation where 0 = no attenuation and 1 = max attenuation.  The default is now 0.5 which corresponds to -6dB per doubling of distance. This is the attenuation for a spherical wave in the free field.
2016-07-15 18:07:19 -07:00
Brad Davis
cf1c954edc Merge pull request #8257 from jherico/toolbar_hover
Fix hover states for toolbar buttons
2016-07-15 18:02:58 -07:00
Philip Rosedale
4925980cbb Merge pull request #8255 from jherico/search_circle
Make search line termination a circle, like 2D UI
2016-07-15 17:51:50 -07:00
samcake
076b8cd297 Instrumenting the GPU git status 2016-07-15 17:47:54 -07:00
Brad Davis
1145c3b590 Smaller and hotter circle, per Philip 2016-07-15 17:45:16 -07:00
Seth Alves
a0e6654ac6 Merge pull request #8247 from hyperlogic/feature/grab-script-polish-part-deux
Grab Script Polish (part deux)
2016-07-15 17:34:50 -07:00
Brad Davis
9ebc0c28c8 Fix hover states for toolbar buttons 2016-07-15 17:12:49 -07:00
Brad Hefta-Gaub
b9e11f23dd Merge pull request #8256 from jherico/decorations2
Fix decoration inflation
2016-07-15 17:10:32 -07:00
Brad Davis
b31300406a Don't extend glow line length 2016-07-15 16:20:05 -07:00
Brad Davis
317dee1b23 Fix decoration inflation 2016-07-15 16:15:53 -07:00
Anthony Thibault
e4794450c2 Disable attach point saving 2016-07-15 15:36:20 -07:00
Sam Gondelman
e24b064ccd Merge pull request #8244 from BingShearer/logrolling
Delete Old Interface Logs If the Sum Size of Those Logs Exceeds Reasonable Size
2016-07-15 14:14:44 -07:00
Brad Davis
0d811c489a Removing debug logging 2016-07-15 14:05:16 -07:00
Brad Davis
c462b8c387 Make search line termination a circle, like 2D UI 2016-07-15 13:51:14 -07:00
Bing Shearer
9ee64d114b Sam's space. 2016-07-15 13:47:36 -07:00
Brad Hefta-Gaub
72739cb6d9 Merge pull request #8228 from jherico/render-perf-updates
More render performace testing work
2016-07-15 12:50:38 -07:00
Brad Hefta-Gaub
574aaa9f28 Merge pull request #8248 from jherico/edit_toolbar
Migrate edit.js toolbar to the new toolbar API
2016-07-15 12:42:13 -07:00
Brad Hefta-Gaub
bc647a15ec Merge pull request #8250 from BingShearer/dice
Removed button color declarations on createDice.js to make icons visible
2016-07-15 12:39:44 -07:00
Brad Hefta-Gaub
496f3b14c7 Merge pull request #8205 from AndrewMeadows/model-cache-cleanup
decouple Geometry from its GeometryResource in ModelCache
2016-07-15 12:38:46 -07:00
Brad Hefta-Gaub
7bb31fe075 Merge pull request #8240 from jherico/hand_controller
Menu & hand controller polish
2016-07-15 12:36:31 -07:00
Brad Davis
90299a98fe PR feedback 2016-07-15 12:19:02 -07:00
Brad Davis
d084623662 PR feedback 2016-07-15 12:15:23 -07:00
Brad Davis
846c2457a3 Merge pull request #8236 from huffman/fix/atp-reliable
Update all asset server responses to be reliable
2016-07-15 10:33:11 -07:00
samcake
a3f6ed6a89 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-15 09:22:34 -07:00
samcake
800d2db8f1 New plots to watch the GPU load"
"
2016-07-15 09:13:55 -07:00
samcake
22ac95d463 REvisiting the RangeTimer to measure the real gpu duration 2016-07-15 09:12:16 -07:00
Brad Hefta-Gaub
878a01cbaf Merge pull request #8242 from kencooke/improved-hrtf
Improved HRTF
2016-07-15 09:02:15 -07:00
Ken Cooke
2674df6095 Fix the distance-attenuation model (for injectors only)
The original attenuation model seems wrong, under-attenuating at close distance but completely muting after 45m.

This uses a physics-based model of -6dB per doubling of distance in free space, for the injectors. The AudioMixer model and domain settings still need to be reworked in a future PR.
2016-07-14 18:34:07 -07:00
samcake
89ec547161 Trying to get the gpu timer to work correctly 2016-07-14 18:20:20 -07:00
Brad Davis
cd6abadc41 Make sure buttons get removed when shutting down scripts 2016-07-14 17:40:05 -07:00
Brad Davis
43e045c22a Restore mouseover events for items in windows 2016-07-14 17:40:05 -07:00
Brad Davis
a6d71f508e Fix edit toolbar button vanishing, persistent edit button 2016-07-14 17:40:04 -07:00
Brad Davis
1adf96c8df Move edit.js to new toolbar API 2016-07-14 17:40:03 -07:00