David Rowe
e26147fc94
Do a reset at the end of calibration
2015-05-08 18:17:59 -07:00
David Rowe
b3b735032d
Automatically calibrate if Use Camera is enabled
...
Do at start up or when Use Camera is first enabled per program run.
2015-05-08 18:16:59 -07:00
David Rowe
9f6bc080c9
Default face tracking to Use Camera for first-time users
...
First time start up with face tracking enabled.
2015-05-08 17:45:21 -07:00
Brad Hefta-Gaub
a517e773f4
Merge pull request #4786 from ctrlaltdavid/20530
...
CR for #20530 - Add DDE calibration
2015-05-08 16:25:02 -07:00
Brad Hefta-Gaub
bfb2b278ee
Merge pull request #4791 from jherico/scale
...
Fixing scale resolution issues
2015-05-08 15:54:24 -07:00
Atlante45
6d0ca40aae
Set pointer to nullptr after delete
2015-05-08 18:21:42 +02:00
Clément Brisset
55bcb992d9
Merge pull request #4796 from sethalves/fix-octree-max-pps
...
Fix octree max pps
2015-05-08 16:28:42 +02:00
Clément Brisset
cc4ec8edda
Merge pull request #4799 from ctrlaltdavid/destroy-trackers
...
Delete Leap and RealSense devices on shutdown
2015-05-08 16:17:00 +02:00
David Rowe
e20df0e2bf
Delete Leap and RealSense devices on shutdown
...
Leaving them running prevents a clean shutdown on Windows when running
Interface.exe from a command line: the interface.exe process stays alive
preventing Interface from being run again from the command line without
manually terminating the running process.
2015-05-07 18:28:49 -07:00
Andrew Meadows
0942ed5654
Merge pull request #4790 from ctrlaltdavid/face-mute-shortcut
...
Add shortcut key for face tracker muting
2015-05-07 16:56:19 -07:00
Seth Alves
c1e3500f3c
voxelDetailsForCode returns a ratio, cubeinfrustrum takes meters
2015-05-07 16:01:08 -07:00
David Rowe
cac6ae1148
Merge branch 'master' into 20530
2015-05-07 13:34:42 -07:00
Bradley Austin Davis
c31d36be59
Fixing scale resolution issues
2015-05-07 12:01:56 -07:00
Seth Alves
d52a45b57e
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-07 11:30:46 -07:00
Atlante45
f761ba521a
Quiet compiler
2015-05-07 20:16:03 +02:00
Seth Alves
ddec6d5207
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-07 09:54:09 -07:00
David Rowe
0eeff526d5
Add shortcut key for face tracker muting
2015-05-07 08:51:59 -07:00
Atlante45
cafaeed822
Restore polygon mode after entities rendering
...
Default setting are causing issues so we just reset the polygon mode
since this won't matter once everything has moved to the new rendering
pipeline.
2015-05-07 13:34:22 +02:00
Atlante45
00571dad00
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 10:13:59 +02:00
Sam Gateau
bba7dcfe5f
Try to fix the transform stack issue in 1st person
2015-05-06 23:32:02 -07:00
Seth Alves
fabff7fdf4
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-06 18:26:00 -07:00
David Rowe
afce981d83
Merge branch 'master' into 20530
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/DdeFaceTracker.cpp
interface/src/devices/DdeFaceTracker.h
2015-05-06 16:27:33 -07:00
Seth Alves
e73503a53d
Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1
2015-05-06 16:05:13 -07:00
Andrew Meadows
584b643791
lock entitySimulation during physics simulation
2015-05-06 16:01:00 -07:00
Philip Rosedale
72da678bc2
Merge pull request #4785 from jherico/scale
...
Fix ensmallened overlay UI
2015-05-06 15:30:01 -07:00
Bradley Austin Davis
561d275dda
Fix ensmallened overlay UI
2015-05-06 15:18:17 -07:00
Seth Alves
a057d7dfa3
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-06 14:41:54 -07:00
Brad Hefta-Gaub
5551997cdc
Merge pull request #4780 from samcake/blue
...
Add support for Skybox and rendering path of background according to Zones
2015-05-06 14:41:06 -07:00
Seth Alves
fe06ce2931
pull from upstream
2015-05-06 14:31:22 -07:00
Bradley Austin Davis
3c10d29d53
Removing another reference to oculus manager
2015-05-06 14:09:43 -07:00
Bradley Austin Davis
351246fac1
Fixing new image texture use from last upstream merge
2015-05-06 12:50:20 -07:00
David Rowe
4cd4dee84d
Use average coefficient values to zero out bias
...
Adjust control thresholds to suit.
2015-05-06 12:26:44 -07:00
Sam Gateau
1b5185abeb
fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome
2015-05-06 12:19:19 -07:00
Seth Alves
a72ac3ead2
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-06 12:19:04 -07:00
Bradley Austin Davis
ea6f840fdb
Merge remote-tracking branch 'upstream/master' into plugins_pt1
2015-05-06 12:18:04 -07:00
Brad Hefta-Gaub
4de6d645e5
Merge pull request #4701 from jherico/infoview
...
Infoviews & Browser in QML
2015-05-06 12:12:21 -07:00
Bradley Austin Davis
fc73676b4d
Merge branch 'master' into plugins_pt1
2015-05-06 11:43:25 -07:00
David Rowe
a6dd08fea8
Calculate average coefficient values
2015-05-06 11:38:14 -07:00
Bradley Austin Davis
4c22e637d7
Merge remote-tracking branch 'upstream/master' into off_axis
2015-05-06 11:28:03 -07:00
Bradley Austin Davis
c832fd969a
Removing off-axis projection from menu
2015-05-06 11:26:46 -07:00
Seth Alves
238a41f2b9
pull from upstream
2015-05-06 11:22:18 -07:00
Clément Brisset
9f8e52652b
Merge pull request #4771 from ctrlaltdavid/20526
...
CR for #20526 - Fix Mixamo avatar clipping in HMD view
2015-05-06 20:17:07 +02:00
David Rowe
e1b5e7caf6
Add DDE calibration count-down
2015-05-06 11:13:19 -07:00
Brad Hefta-Gaub
b27154186b
Merge pull request #4779 from jherico/hmd_tools
...
Fix for HMDTools targeting wrong screen on OSX
2015-05-06 10:46:55 -07:00
Bradley Austin Davis
de49057f17
Fix for HMDTools targeting wrong screen on OSX
2015-05-06 10:32:45 -07:00
David Rowe
eb438e9ccb
Can use same clipping calc for non-Oculus
2015-05-06 09:58:14 -07:00
Philip Rosedale
e2541c4243
Merge pull request #4740 from ctrlaltdavid/20518
...
CR for #20518 - Mute camera button next to mute audio button
2015-05-06 09:54:42 -07:00
Sam Gateau
c86a8b3944
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-06 09:54:08 -07:00
Sam Gateau
dc81a3ecc2
Cube texture are working with the GL backend, useing it in SKybox successfullly
2015-05-06 09:53:36 -07:00
Seth Alves
7a5fe8a34e
quiet compiler
2015-05-06 09:05:13 -07:00
