David Rowe
8f376247f0
Fix calculation of corrected look-at position in HMD view
2015-08-11 20:25:02 -07:00
David Rowe
0f56285283
Fix HMD look-at positions and lines
2015-08-11 18:54:55 -07:00
David Rowe
3e8d0ad712
Fix to use new HMD methods
2015-08-11 13:40:08 -07:00
David Rowe
e6473fc8b9
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.h
tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
Brad Hefta-Gaub
b726769f15
Merge pull request #5402 from highfidelity/plugins
...
New plugins architecture
2015-08-11 11:11:27 -07:00
Seth Alves
cbe38d5fa5
Merge pull request #5533 from ctrlaltdavid/20637
...
CR for 20637 - Add WebWindow setPosition() method
2015-08-11 11:03:14 -07:00
Brad Hefta-Gaub
35d6528d08
Merge pull request #5550 from jherico/marge
...
PLUGINS - Cleaning up HMD tools
2015-08-11 10:46:59 -07:00
David Rowe
84feaeb703
Merge branch 'master' into 20639
2015-08-11 10:33:17 -07:00
Bradley Austin Davis
7694c1c0a6
Cleaning up HMD tools
2015-08-10 21:39:36 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -07:00
David Rowe
2c1ba9b6b1
Fix avatar lean forwards and sideways per HMD movements
2015-08-10 21:25:18 -07:00
David Rowe
f7dc5480b7
Fix #include path for OSX/Linux
2015-08-10 20:20:51 -07:00
David Rowe
80e296edd0
Merge branch 'master' into 20639
2015-08-10 19:25:12 -07:00
David Rowe
8b326414ac
Start eye tracker streaming such that don't block Interface
...
Start method is called in a separate thread.
2015-08-10 19:19:29 -07:00
Bradley Austin Davis
61ecee93b8
Fix mis-positioning of QML elements when moving from retina to non-retina display
2015-08-10 15:18:49 -07:00
Seth Alves
74287c3cf5
Merge pull request #5482 from ericrius1/polyLineInProgress
...
Added PolyLine Entity and painting scripts to demonstrate its functionality (WARNING: protocol change) Test this please
2015-08-10 14:57:52 -07:00
David Rowe
81d8edae5f
Add missing 5 point calibration
2015-08-10 13:23:14 -07:00
David Rowe
e7beb544f6
Log successfully loading eye tracker calibration
2015-08-10 13:22:46 -07:00
David Rowe
658434e020
Automatically save and restore eye tracker calibration
...
Automatically saves and restores just a single calibration so that user
doesn't have to manually save or load, which isn't very convenient to do
with an HMD on.
2015-08-10 13:20:42 -07:00
David Rowe
4f3c4a5312
Tidy up handling of eye tracker streaming
2015-08-10 12:52:47 -07:00
Howard Stearns
88505c180d
Merge branch 'master' of https://github.com/highfidelity/hifi into restore-eye-joint-rotations
2015-08-10 12:34:59 -07:00
Howard Stearns
964d04d24f
Restore correct space for eye joint rotations.
...
Also, do not correct for camera position on my avatar. (That will be done by zero or one receivers.)
2015-08-10 12:34:01 -07:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
Brad Davis
57408c4338
Automatically show HMD tools when switching an HMD plugin
2015-08-09 12:14:29 -07:00
Brad Davis
5515b9d8ee
Decouple Application and plugin definitions, cleanup container usage
2015-08-08 17:51:16 -07:00
Bradley Austin Davis
2878950dbe
Fix crash on startup on mac
2015-08-08 15:26:38 -07:00
Brad Davis
751db23bc8
Fixing naming, and improving viewport handling
2015-08-08 14:19:43 -07:00
Brad Davis
639a0822fe
Fixing aspect ratio
2015-08-08 14:08:41 -07:00
Brad Davis
ba498e8f33
Fixing plugin construction after removing OVR dependency from interface
2015-08-08 14:02:26 -07:00
Brad Davis
ccc4a59992
Cleanup and PR comments
2015-08-08 13:54:37 -07:00
Brad Davis
4b5c71e16d
Merge fixes
2015-08-08 13:37:46 -07:00
Brad Davis
caf93d1aff
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
2015-08-08 13:18:13 -07:00
David Rowe
051a398fa2
Merge branch 'master' into 20639
2015-08-07 18:26:56 -07:00
David Rowe
90637272c5
Add WebWindow setPosition() method
2015-08-07 17:38:41 -07:00
Andrew Meadows
331c8c0967
Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements
...
Improvements to FloatingUIPanels.
2015-08-07 17:21:51 -07:00
David Rowe
b54c2526c1
Fix rendering own look-at vectors in HMD mode
...
Vectors now originate at user's physical eyeballs rather than at user
avatar's eye separation.
2015-08-07 16:13:25 -07:00
Andrew Meadows
c0d287f48d
Merge pull request #5527 from ZappoMan/lod
...
change LOD dialog to no longer reset when you close the dialog box
2015-08-07 16:10:24 -07:00
Andrew Meadows
48c5a227a7
Merge pull request #5528 from ZappoMan/removeBrokenShadows
...
remove shadow menu items
2015-08-07 16:09:00 -07:00
Bradley Austin Davis
fb2c84484e
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-07 15:26:43 -07:00
David Rowe
3995c4476d
Add temporary debug info for tracking down invalid scale value assert
2015-08-07 14:38:43 -07:00
Seth Alves
b1e69537f3
Merge pull request #5524 from howard-stearns/cleanup-jointstate
...
Clean Up JointState
2015-08-07 13:50:02 -07:00
David Rowe
b70c1a4960
Merge branch 'master' into 20639
2015-08-07 12:33:13 -07:00
David Rowe
ea03067a02
When eye tracking data is lot for > N seconds handle as "not tracking"
...
Revert to default look-at behaviour and saccades until tracking resumes.
2015-08-07 12:23:43 -07:00
David Rowe
e2bf5cad3e
Resume eye tracking at start-up if was running at shut-down
2015-08-07 11:59:11 -07:00
Zander Otavka
743e73874f
Add back the anchor to panel transform names.
...
position -> anchorPosition
rotation -> anchorRotation
scale -> anchorScale
2015-08-07 11:38:33 -07:00
ZappoMan
87f609b9af
remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows
2015-08-07 11:26:07 -07:00
Ryan Huffman
41e68b1c52
Disable back-face culling when rendering BillboardOverlay
2015-08-07 10:59:54 -07:00
Sam Gateau
0e3e0d05f1
Introducing the Normal fitting algorithm for better normal in the deferred buffer
2015-08-07 10:59:51 -07:00
ZappoMan
8441868e74
change LOD dialog to no longer reset when you close the dialog box
2015-08-07 10:32:03 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
