Brad Hefta-Gaub
0de5c1cf71
don't capture the mouse if you're not the active window or if a menu is popped up
2016-02-18 17:11:40 -08:00
Brad Hefta-Gaub
adcadedc65
slight rework of handleRealMouseMoveEvent
2016-02-18 14:40:55 -08:00
Brad Hefta-Gaub
843039f741
fix mac warnings
2016-02-18 12:04:38 -08:00
Brad Hefta-Gaub
935af6d2cc
clean up debug logs
2016-02-18 12:01:03 -08:00
Brad Hefta-Gaub
0467930c57
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
examples/controllers/handControllerGrab.js
2016-02-18 10:30:43 -08:00
Brad Hefta-Gaub
c4fc3e4057
more work on dragging in hmd
2016-02-18 10:07:37 -08:00
Brad Hefta-Gaub
279519b6d5
hmd mouse check point
2016-02-18 08:44:22 -08:00
Brad Hefta-Gaub
8b8b99c7e0
HMD mouse checkpoint
2016-02-17 21:19:01 -08:00
Anthony Thibault
e863da5a68
Merge pull request #7118 from jherico/hmd_mono
...
Remove distortion on HMD previews, both mono and stereo
2016-02-17 15:39:48 -08:00
Seth Alves
784dc2b538
Merge pull request #7124 from samcake/red
...
Fixing the disappearing avatars maybe ?
2016-02-17 12:05:04 -08:00
Brad Hefta-Gaub
38430d8d2c
Merge pull request #7112 from howard-stearns/snap-turn-preference
...
Snap turn preference
2016-02-17 09:19:38 -08:00
Howard Stearns
6d70584b5a
Change name and use only when in HMD.
2016-02-16 18:09:56 -08:00
samcake
640bf81339
Forcing an update from teh avatar manager to the avatar renderItems when beeing updated
2016-02-16 17:19:31 -08:00
Brad Hefta-Gaub
a25581c656
clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor)
2016-02-16 12:11:58 -08:00
Brad Davis
56fc9ea301
Remove distortion on HMD previews, both mono and stereo
2016-02-15 21:46:29 -08:00
Brad Hefta-Gaub
0d873c7732
consolidate all calls to QCursor::pos() and QCursor.setPosition() to use common ControllerScriptingInterface
2016-02-15 16:11:25 -08:00
Zach Pomerantz
0d29f59e39
Remove drawOnHUD from 3d overlays
2016-02-15 14:04:02 -08:00
howard-stearns
4150d318d3
"Leave it on by default" (and change name of route variable to SnapTurn).
2016-02-15 13:39:53 -08:00
howard-stearns
20406a5a14
Remove comfortMode menu item, but add a Settings for snapTurn within MyAvatar.
2016-02-15 13:26:40 -08:00
Zach Pomerantz
8feace62b7
Conform text3d initializers to coding standard
2016-02-15 13:05:19 -08:00
Zach Pomerantz
5d1aedf707
Update scene items on overlay3d edits
2016-02-15 13:05:19 -08:00
Zach Pomerantz
452b6f4e59
Fix opacity check for Overlay ItemKey
2016-02-15 13:02:29 -08:00
Zach Pomerantz
f2b716f90a
Alias text3d's backgroundAlpha to alpha
...
getAlpha(), across 3d overlays, refers to the behavior
of the overlay as a whole. This conforms text3d, and
adds a new property, textAlpha, to replace the old
alpha semantic.
2016-02-15 13:02:29 -08:00
howard-stearns
7057d5c40c
Snap Turn avatar preference. (Still tied to Developer menu item.)
2016-02-15 12:38:40 -08:00
samcake
0c0089f736
REnamed Octree.h/cpp to SpatialTree and fixing some coding guidelines
2016-02-15 11:08:12 -08:00
samcake
545f276fdf
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-15 09:29:00 -08:00
Brad Davis
b5cba79f0c
Merge pull request #7095 from ZappoMan/hmdHacking
...
Various bug fixes in related to HMD overlay support
2016-02-12 17:50:42 -08:00
Andrew Meadows
6baf181453
Merge pull request #7093 from hyperlogic/tony/input-poses-in-avatar-space
...
Controller Pose values are relative to Avatar.
2016-02-12 17:13:36 -08:00
Brad Hefta-Gaub
d85a8a4fb9
Merge pull request #7103 from jherico/render-rate
...
Don't drop to half the vsync rate when we can't keep up
2016-02-12 17:11:03 -08:00
Brad Davis
df225afd05
PR feedback
2016-02-12 16:25:46 -08:00
Brad Hefta-Gaub
df6437236e
some CR feedback
2016-02-12 16:13:12 -08:00
Brad Davis
908e153c36
Don't drop to half the vsync rate when we can't keep up
2016-02-12 15:57:27 -08:00
samcake
9bfeb4a1d5
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-12 11:31:47 -08:00
Brad Hefta-Gaub
1160ecb335
improvements in HMD UI behavior
2016-02-12 10:51:33 -08:00
samcake
ef92a52777
Merge pull request #7051 from zzmp/feat/graphics-dialog
...
Move graphics settings to a new dialog
2016-02-12 10:46:00 -08:00
samcake
f12030c1a4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 18:41:02 -08:00
Anthony J. Thibault
8bde897cee
Application: removed unused myAvatar local variable.
2016-02-11 18:14:42 -08:00
Anthony J. Thibault
111ed65bf8
Controller Pose values are relative to Avatar.
...
Pass a InputCalibrationData to each inputPlugin and inputDevice.
This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix.
Each input plugin can use this data to transform it's poses into Avatar space
before sending it up the chain.
This fixes a bug in the handControllerGrab.js script that relied on the hand controller
rotation/positions being in the avatar frame.
2016-02-11 17:18:01 -08:00
Seth Alves
90d81bc17b
Merge pull request #7091 from jherico/overlayCrash
...
Prevent overlay cleanup from crashing the app
2016-02-11 16:26:07 -08:00
Andrew Meadows
b6456889ef
Merge pull request #7050 from Atlante45/fix/audio-stats
...
Fix audio stats
2016-02-11 15:56:45 -08:00
Brad Davis
e06bc26896
Prevent overlay cleanup from crashing the app
2016-02-11 15:17:58 -08:00
Chris Collins
c6bc91f8b2
Merge pull request #7084 from jherico/toolTabs
...
Allow closed tabs to delete properly
2016-02-11 13:20:20 -08:00
Brad Hefta-Gaub
894c75f8fc
Merge pull request #7066 from zzmp/fix/circle3d-radii
...
Add radius as property to circle3d
2016-02-11 13:07:24 -08:00
Brad Hefta-Gaub
d14b9ab9b6
Merge pull request #7065 from zzmp/fix/circle3d-click
...
Fix circle3d FindRayIntersection
2016-02-11 13:07:00 -08:00
Chris Collins
ca15638463
Merge pull request #7080 from ZappoMan/fixPersistMono
...
add support for persisting the mono preview mode option
2016-02-11 13:03:49 -08:00
Chris Collins
38ba852c2e
Merge pull request #7075 from Atlante45/fix/add-to-scene
...
Fix "Add to scene" option while dropping model
2016-02-11 13:02:36 -08:00
Brad Davis
2ee1f18e06
Allow closed tabs to delete properly
2016-02-11 10:27:24 -08:00
Zach Pomerantz
a7778daed2
Change graphics dialog to persisted dropdowns
2016-02-11 10:15:13 -08:00
Stephen Birarda
62e842bf2b
Merge pull request #7052 from huffman/bugsplat
...
BugSplat integration
2016-02-11 10:10:44 -08:00
samcake
31230e81bb
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 10:05:58 -08:00