David Kelly
e36f6b6521
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-12 08:40:04 -07:00
Howard Stearns
48304a3cc2
Merge pull request #9361 from howard-stearns/fix-laser-vs-mouse-again
...
Fix laser vs mouse again
2017-01-11 19:38:54 -08:00
howard-stearns
88c2c534ad
don't set bogus values
2017-01-11 17:01:46 -08:00
howard-stearns
9298bcf628
remove log spam
2017-01-11 16:32:15 -08:00
howard-stearns
5c06841732
use update signal instead of timer
2017-01-11 16:24:05 -08:00
howard-stearns
357b4db1db
fix mouse vs lasers, again
2017-01-11 14:24:24 -08:00
howard-stearns
a808a8c749
revert "fix competition between seek mouse and lasers"
2017-01-11 14:23:18 -08:00
David Kelly
1e3a00d1fb
Enable the LT and RT signals, use them
...
A bit cleaner. Still have to keep track of which hand is the mouse, but
this removes some of the hacky code.
2017-01-11 14:43:37 -07:00
Brad Hefta-Gaub
db5e4db79f
Merge pull request #9355 from kencooke/audio-hrtf-gainadj
...
Add a local HRTF gain adjustment
2017-01-11 10:21:07 -08:00
Ken Cooke
083c7bc523
Add a local HRTF gain adjustment. Gain adjustments are persistent and properly interpolated.
2017-01-11 10:05:39 -08:00
samcake
8b45afecde
Merge pull request #9342 from jherico/trace_detail
...
More tracing support
2017-01-10 17:55:50 -08:00
David Kelly
0a018e133d
Blue laser should be enough to hover
2017-01-10 18:23:39 -07:00
David Kelly
4fade3a53e
CR feedback
2017-01-10 16:12:02 -07:00
David Kelly
5fd11ade9c
minor tweak to hover color for glow effect
2017-01-10 16:00:19 -07:00
David Kelly
2d55ed2658
Fix hover - probably my merge didn't get this line
2017-01-10 15:51:24 -07:00
David Kelly
17333ee307
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-10 15:24:31 -07:00
Zach Fox
0b574e170a
Merge pull request #9348 from howard-stearns/talking-glow-node
...
Talking glow node
2017-01-10 14:12:09 -08:00
Brad Davis
31f39d7eef
Allow scripts to inject tracing events
2017-01-10 14:06:39 -08:00
David Kelly
5c6ae6fe95
HMD hover working now
...
Had to hack a bit -- the trigger mappings were not firing so instead I
just get the hand that is triggering (when HMD is active) and handle the
hover almost as before, with mouse move events. Some thought about how
to map a 'mouse move' event into something where 2 triggers can both be
pressed at same time was in order.
2017-01-10 14:47:34 -07:00
howard-stearns
e67675ac36
color nodes by audio level
2017-01-10 13:24:38 -08:00
howard-stearns
42b2b2154e
store audio level in overlay data object (so that they gc properly and we
...
have the data to color with).
2017-01-10 13:08:07 -08:00
David Kelly
a855bc60e0
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-10 12:12:48 -07:00
Brad Davis
1dd2747ef9
Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.
2017-01-10 10:44:04 -08:00
Brad Davis
7ce4277b4c
Merge pull request #9341 from samcake/blue
...
Add profiling in Context batch execution and shortcuts for trace names
2017-01-10 09:56:51 -08:00
samcake
8c7ec8b0c5
Add profiling in COntext batch execution and shortcuts for trace names
2017-01-09 18:05:02 -08:00
Ryan Huffman
39070fe0d1
Merge pull request #9065 from huffman/fix/script-engine-abuse
...
Fix deleteLater() vulnerability in scripts
2017-01-09 11:02:28 -08:00
Chris Collins
30d5f70e11
Merge pull request #9278 from jherico/cpu_opt_scene
...
More low level optimizations
2017-01-09 10:10:40 -08:00
David Kelly
fef8c8900f
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-09 08:51:42 -07:00
David Kelly
409e785aa3
fix un-hover, add some comments
2017-01-09 08:42:43 -07:00
Brad Hefta-Gaub
a1ee76d250
Merge pull request #9332 from cozza13/21123
...
Change default scripts to include clara
2017-01-08 09:15:41 -08:00
Chris Collins
215659c695
Enabled the ability to have other marketplaces.
...
Enabled the ability to have other marketplaces.
2017-01-07 08:17:13 -08:00
Brad Hefta-Gaub
1a7b5ab520
Merge pull request #9326 from jherico/oculus_budget_stats
...
Adding tracking of Oculus renders, submits, and frames that are over budget
2017-01-06 18:18:16 -08:00
David Kelly
5eff12af34
add hover effect to PAL
2017-01-06 18:09:23 -07:00
Howard Stearns
b432ffa78d
Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction
...
Fix the PAL & Space Bubble interaction
2017-01-06 16:47:43 -08:00
Zach Fox
afa6d54ac4
Actually fix the behavior...
2017-01-06 14:20:25 -08:00
Zach Fox
dec41f67cc
Fix bugs and generally fix behavior
2017-01-06 13:58:23 -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
Brad Davis
15b9e750f9
Adding tracking of Oculus renders, submits, and frames that are over budget
2017-01-06 10:51:26 -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
Zach Fox
b7d64804c1
Remove errant //FIXME
2017-01-05 21:55:09 -08: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
Zach Fox
495925a017
This behavior was harder to change than expected...
2017-01-05 16:58:32 -08:00
