David Rowe
8a3c8e0d9a
Merge branch 'master' into 20532
...
Conflicts:
interface/src/devices/DdeFaceTracker.cpp
2015-05-12 17:41:12 -07:00
Philip Rosedale
349886c146
Merge pull request #4847 from birarda/domain-paths
...
add initial support for local paths in domain
2015-05-12 17:09:13 -07:00
Philip Rosedale
65277e0573
Merge pull request #4836 from ctrlaltdavid/20535
...
CR for #20535 - Improve DDE eyelid control
2015-05-12 17:00:02 -07:00
Brad Davis
8c4f802dbf
Merge remote-tracking branch 'upstream/master' into web-entity
...
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
Stephen Birarda
8c9a14cd9d
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths
2015-05-12 15:04:59 -07:00
Brad Davis
f42e0c696a
Merge branch 'master' into menu
2015-05-12 14:58:42 -07:00
Brad Davis
41d587bd2e
Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff""
...
This reverts commit 6e8c067bcb
2015-05-12 14:47:44 -07:00
Brad Davis
32c1b5e4c5
Merge remote-tracking branch 'upstream/master' into dk1
...
Conflicts:
interface/src/Camera.h
2015-05-12 14:46:34 -07:00
Brad Davis
02a6b557dd
Restoring position as a slot
2015-05-12 14:45:38 -07:00
Brad Davis
64d0aa39dd
Merge branch 'master' into dk1
2015-05-12 14:43:33 -07:00
samcake
6e8c067bcb
Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"
2015-05-12 14:34:43 -07:00
Stephen Birarda
332601b91c
final fixes for path query from DS
2015-05-12 14:34:14 -07:00
samcake
7c255738af
Merge pull request #4837 from jherico/dk1
...
Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff
2015-05-12 12:30:32 -07:00
Brad Davis
f844dcd25f
Only display new menu in VR mode
2015-05-12 09:05:24 -07:00
Atlante45
00864afe53
Quiet compiler
2015-05-12 17:06:40 +02:00
Clément Brisset
91939ff4ed
Merge pull request #4832 from jherico/magnifier
...
Fix magnifier location
2015-05-12 14:32:23 +02:00
Clément Brisset
9bf4cf1262
Merge pull request #4830 from ZappoMan/moreZoneProperties
...
New Zone Features
2015-05-12 14:28:01 +02:00
Brad Davis
666caf0d59
Working on fixing DK1 and santizing the transform stuff
2015-05-12 00:44:30 -07:00
Brad Hefta-Gaub
f56b5fcdcd
Merge pull request #4833 from samcake/blue
...
Clean the cube map loading behavior
2015-05-11 18:40:42 -07:00
Seth Alves
866a6fba9b
Merge pull request #4823 from birarda/master
...
repairs to AC stop and clean shutdown
2015-05-11 18:11:52 -07:00
David Rowe
5832259643
Add preferences slider for webcam eyelid closing threshold
2015-05-11 17:11:52 -07:00
David Rowe
667ad9b0cb
Add menu option to enable/disable binary webcam eyelid control
2015-05-11 17:11:51 -07:00
ZappoMan
a2a1bf4e8c
make stars fade in as sun drops below horizon
2015-05-11 16:32:27 -07:00
Stephen Birarda
68af209417
call Setting::init from Interface setupEssentials
2015-05-11 16:20:03 -07:00
Brad Davis
69937d21f2
Addressing the actual gcc bug
2015-05-11 14:40:10 -07:00
Brad Davis
44238d02ae
Tweak the tv 3d manager to get around apparent GCC bug
2015-05-11 14:30:59 -07:00
ZappoMan
73428ec12d
add support to not displace very large clipboards on import
2015-05-11 14:21:58 -07:00
Sam Gateau
f2c4e04a5a
clean up for pr
2015-05-11 14:06:10 -07:00
Brad Davis
b29fbfe693
Merge branch 'magnifier' into plugins_pt2
2015-05-11 13:59:07 -07:00
Brad Davis
e58976fe5a
Fix magnifier location
2015-05-11 13:56:49 -07:00
Brad Davis
abab54aed8
Working on display plugins
2015-05-11 13:08:53 -07:00
Brad Davis
6a5c7b8b42
Merge remote-tracking branch 'upstream/master' into plugins_pt2
...
Conflicts:
libraries/script-engine/src/MenuItemProperties.cpp
2015-05-11 12:40:17 -07:00
Brad Davis
1624ca4120
Merge branch 'master' into plugins_pt2
2015-05-11 12:32:49 -07:00
Seth Alves
ead200b77a
remove unneeded code
2015-05-11 12:03:10 -07:00
Seth Alves
9bd101ee2a
oops
2015-05-11 12:01:59 -07:00
Seth Alves
de9e74a725
put max-octree-pps in Application rather than in the Octree
2015-05-11 12:01:13 -07:00
Seth Alves
83748096ef
max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree
2015-05-11 11:37:53 -07:00
Stephen Birarda
8c6715e4fc
resolve conflicts on merge with upstream/master
2015-05-11 11:10:22 -07:00
Sam Gateau
72c3270ec6
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-11 10:48:29 -07:00
Clément Brisset
421ebeb3d7
Merge pull request #4795 from birarda/sequence-numbers
...
add sequence number support to NL, don't double send data from AvatarMixer
2015-05-11 19:23:33 +02:00
Philip Rosedale
c3828e4152
Merge pull request #4782 from ctrlaltdavid/20531
...
DO NOT MERGE - QA for #20531 - Don't flash whole screen when audio clips
2015-05-11 10:18:07 -07:00
Sam Gateau
d51904b7b3
fixing file
2015-05-09 11:43:21 -07:00
Sam Gateau
5a11143a5d
Using the skybox cubemap for ambient lighting
2015-05-09 11:40:46 -07:00
David Rowe
5092e385b1
Disable "calibrate" menu item if webcam isn't enabled
2015-05-08 18:39:22 -07:00
David Rowe
15b8dc4144
Don't start calibration if the camera is muted
2015-05-08 18:18:15 -07:00
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
Stephen Birarda
ddb52348bc
don't force use of Settings to all QCoreApplication
2015-05-08 16:24:39 -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
Bradley Austin Davis
03bd17ed49
Rebasing onto scale changes
2015-05-08 15:09:46 -07:00
Bradley Austin Davis
0751443a01
Merge branch 'master' into scale
2015-05-08 15:03: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
c4e9807259
Merge branch 'master' into 20531
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2015-05-07 21:01:22 -07: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
Stephen Birarda
305835ea79
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-07 15:38:35 -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
David Rowe
1fdf2c7803
Don't flash whole screen when audio clips
2015-05-06 13:35:53 -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
Stephen Birarda
5b1514a390
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-06 10:12:17 -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
