Andrew Meadows
c060fd6a68
restore updateClusterMatrices() in render()
2017-01-11 17:33:30 -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
Andrew Meadows
e2130d33d9
speedup cauterizedClusterMatrices math
2017-01-11 15:10:44 -08:00
Andrew Meadows
b3e336de3d
remove cruft: unused function arguments
2017-01-11 15:02:18 -08:00
Brad Davis
27293c342c
Change present rate to be an average over 1/10th of a second
2017-01-11 14:27:46 -08:00
Brad Davis
e256f7cccc
Remove sendqueue spam in traces
2017-01-11 14:27:27 -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
Brad Davis
f235a52a6d
Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet
2017-01-11 14:21:29 -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
Andrew Meadows
87bdaae05a
remove scale from ModelMeshPartPayload's transform
2017-01-11 12:38:47 -08:00
David Rowe
9bdcdf73c1
User must be logged into Clara.io site to download
2017-01-12 09:15:01 +13:00
Seth Alves
bf304a815a
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-11 10:48:03 -08:00
Seth Alves
c76987c179
Merge pull request #9351 from sethalves/tablet-ui-show-lasers-when-scrolling
...
update lasers when distance-scrolling a web entity/overlay
2017-01-11 10:45:25 -08: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
Seth Alves
bf1bd1d859
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-11 09:56:08 -08:00
Seth Alves
9be2f26407
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-11 09:55:58 -08:00
Seth Alves
493985ac2a
Merge pull request #9354 from sethalves/update-tablet-ui-again
...
Update tablet ui again
2017-01-11 09:55:46 -08:00
Seth Alves
bacc796730
Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again
2017-01-11 09:54:26 -08:00
Seth Alves
2886d7f7a4
Merge pull request #9353 from druiz17/tabletPositionUpdate
...
updated tablet position
2017-01-11 09:52:57 -08:00
Dante Ruiz
2d8d5401dc
updated tablet position
2017-01-11 08:41:07 -08:00
Andrew Meadows
bd16824d55
remove cruft: Model::_pupilDilation
2017-01-11 06:57:05 -08:00
Andrew Meadows
1804f33b98
add assert and TODO comment
2017-01-11 06:56:35 -08:00
Andrew Meadows
5d880487a0
cleanup class method declarations
2017-01-11 06:56:07 -08:00
Andrew Meadows
e88f02d7b6
remove cruft
2017-01-11 06:55:13 -08:00
Andrew Meadows
1b5fd52165
Merge pull request #1 from samcake/model-cleanup
...
Factorization of the modelTransform out of the cluster matrices
2017-01-11 06:33:59 -08:00
sam
7a01b856f7
Factorization of the modelTransform out of the cluster matrices
2017-01-11 02:33:56 -08:00
David Rowe
71d6a5cb1d
Implement model request and download
2017-01-11 21:33:03 +13:00
David Rowe
530b176d09
Replace Clara download button with own
2017-01-11 16:36:18 +13: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
Seth Alves
c93d83dadd
update lasers when distance-scrolling a web entity/overlay
2017-01-10 16:41:07 -08:00
Andrew Meadows
44699fc661
modelToWorld rotation not in cluster matrices
2017-01-10 16:21:13 -08:00
Seth Alves
0c06832be4
Merge pull request #9350 from druiz17/hombutton2.0
...
Home button works with stylus
2017-01-10 15:38:34 -08:00
Dante Ruiz
0b3a7d90f1
removed committed code
2017-01-10 23:26:37 +00: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
Dante Ruiz
d0baa0e303
home button works with the stylus
2017-01-10 14:51:46 -08:00
David Kelly
2d55ed2658
Fix hover - probably my merge didn't get this line
2017-01-10 15:51:24 -07:00
druiz17
ad48e79053
Merge pull request #9346 from hyperlogic/tablet-ui
...
In desktop mode, tablet is in front of camera.
2017-01-10 14:48:15 -08: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
druiz17
85c143e64d
Merge pull request #9347 from sethalves/tablet-ui-grab-no-patch
...
remember previous parentID in the script and try to put it back when releasing
2017-01-10 14:08:08 -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
Anthony J. Thibault
3f0860f9c3
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-10 13:35:29 -08:00
Anthony Thibault
e7a88b5a3c
Merge pull request #9343 from druiz17/menuApp
...
Moved the context menu to the tablet
2017-01-10 13:34:44 -08:00
