Commit graph

43831 commits

Author SHA1 Message Date
Brad Davis
40778d7f29 Allow env disabling of the keyboard. Show keyboard after short delay to avoid flickers 2016-06-08 10:41:19 -07:00
Brad Davis
79c68b2ecb Working on positioning of the keyboard 2016-06-07 21:52:22 -07:00
Brad Davis
c2aa9e7f61 Update SteamVR keyboard behavior 2016-06-07 21:52:21 -07:00
Brad Davis
eab611acc0 Enable Steam VR text input 2016-06-07 21:52:20 -07:00
Brad Davis
ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-06-07 21:51:47 -07:00
Brad Hefta-Gaub
338557358d Merge pull request #8035 from Atlante45/master
Fix OS X warning
2016-06-07 18:17:58 -07:00
Brad Hefta-Gaub
80100b1d34 Merge pull request #8000 from Atlante45/feat/plugins
Select/Disable plugins via command line args
2016-06-07 18:17:29 -07:00
Brad Hefta-Gaub
9a0076d4f1 Merge pull request #8028 from ctrlaltdavid/20949
add "Load Defaults" button to Running Scripts dialog
2016-06-07 17:09:29 -07:00
Brad Hefta-Gaub
6603289de9 Merge pull request #8029 from SamGondelman/constantTurn
Fixed constant turn of 22.5 degrees in comfort mode
2016-06-07 17:09:07 -07:00
Atlante45
71fb0e665f Fix OSX warning 2016-06-07 16:46:32 -07:00
Howard Stearns
38d0d28603 Merge pull request #8021 from AndrewMeadows/walk-follows-camera
camera steers avatar when walking
2016-06-07 10:43:01 -07:00
SamGondelman
509f889c0d fixed constant turn of 22.5 degrees 2016-06-06 18:40:12 -07:00
David Rowe
b6af46cac9 Add "Load Defaults" button to Running Scripts dialog
And rename "Stop All" to "Remove All".
2016-06-07 11:30:07 +12:00
Brad Hefta-Gaub
30526374bc Merge pull request #7996 from ctrlaltdavid/get-entity-children
add Entities.getChildrenIDs() method
2016-06-06 16:25:25 -07:00
Atlante45
399517fcbd Activate Inputs after menus are setup 2016-06-06 13:28:36 -07:00
Atlante45
26acc6fd8b Typo 2016-06-06 13:28:36 -07:00
Atlante45
24bbb8db3f Remove input plugin menu dependency 2016-06-06 13:28:36 -07:00
Atlante45
6f75fab298 Revert header changes 2016-06-06 13:28:36 -07:00
Atlante45
b635e32933 Rename Mac only Oculus display plugin 2016-06-06 13:28:36 -07:00
Atlante45
ee62a211ac Remove "Input Devices" menu 2016-06-06 13:28:36 -07:00
Atlante45
992fa63932 Allow ordered list of preferred plugins 2016-06-06 13:28:36 -07:00
Atlante45
932838b1e3 Setup preferred display plugin 2016-06-06 13:28:36 -07:00
Atlante45
d8493f960a Add command line option to enable/disable plugins 2016-06-06 13:28:36 -07:00
Atlante45
3dadb515f3 Add plugins name to their metadata file 2016-06-06 13:28:36 -07:00
Brad Hefta-Gaub
5190d8ab6b Merge pull request #8023 from jherico/settings
Eliminate extraneous writes for unchanged values
2016-06-06 12:22:11 -07:00
Brad Hefta-Gaub
b4721ec57e Merge pull request #7973 from ctrlaltdavid/clipboard-dimensions
add Clipboard.getContentsDimensions() JavaScript method
2016-06-06 12:03:10 -07:00
Brad Hefta-Gaub
11effb6feb Merge pull request #8007 from hyperlogic/feature/avatar-recording-version
Add version number to avatar recording frame
2016-06-06 12:02:49 -07:00
Brad Hefta-Gaub
1782a6ba4a Merge pull request #8011 from hyperlogic/bug-fix/remove-avatar-data-warning
Removed innocuous "AvatarData packet size mismatch" warning
2016-06-06 12:02:34 -07:00
Brad Davis
b7d1659852 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-06 09:32:33 -07:00
Howard Stearns
fc33e1746f Merge pull request #8008 from howard-stearns/goto-button
Basic address bar toggle button.
2016-06-05 11:19:24 -07:00
Howard Stearns
91450addd3 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into goto-button 2016-06-05 10:46:18 -07:00
Howard Stearns
dbc688f445 Merge pull request #8005 from howard-stearns/pointer-cleanup
pointer cleanup -- see comment on #8012
2016-06-05 10:17:36 -07:00
Howard Stearns
8debe494f3 Merge pull request #8012 from howard-stearns/hmd-button
hmd button -- I'm going to go ahead in merge this myself because it's isolated and I want to bring the branch to a consistent/known/planned state for evaluation. (We will be modifying the implementation going forward.) It's too confusing to equivocate as to what functionality "in" the vive-ui branch when this is pending.
2016-06-05 10:16:47 -07:00
Andrew Meadows
e6844e2468 use world-UP rather than head-UP 2016-06-04 21:11:31 -07:00
Brad Hefta-Gaub
f2bedc546f Merge pull request #8019 from jherico/settings
Eliminate file IO contentions for settings
2016-06-04 21:04:50 -07:00
Brad Hefta-Gaub
9ef7e82270 Merge pull request #8020 from highfidelity/revert-7991-aoighost_builddocs_securityfixes
Revert "Update the build docs for a better OpenSSL security posture."
2016-06-04 21:01:03 -07:00
Andrew Meadows
49c835b6fc use camera twist for walk steering 2016-06-04 20:53:30 -07:00
Andrew Meadows
062711b202 Revert "Update the build docs for a better OpenSSL security posture." 2016-06-04 20:51:21 -07:00
Brad Davis
bc81f00dc7 Eliminate extraneous writes for unchanged values 2016-06-04 20:47:10 -07:00
Brad Davis
65d8f65ed7 Fix unix builds, make settings ACID 2016-06-04 18:39:46 -07:00
Brad Davis
39dcd1f9bd Eliminate file IO contentions for the settings 2016-06-04 17:55:30 -07:00
Brad Hefta-Gaub
d9542107c2 Merge pull request #8006 from AndrewMeadows/convexification-2
fix bad convex hull simplification
2016-06-04 16:58:03 -07:00
Brad Hefta-Gaub
5390d50ab8 Merge pull request #8015 from kencooke/master
Replace the linear interpolation embedded in the .WAV/.RAW loader with high quality polyphase resampling.
2016-06-04 16:55:42 -07:00
Brad Hefta-Gaub
eeb08fb401 Merge pull request #8014 from imgntn/leaphands
add leap hands to /system
2016-06-04 16:43:30 -07:00
Brad Hefta-Gaub
0a79ab5ff8 Merge pull request #8017 from ctrlaltdavid/toolbar-positioning
Save toolbar position when moving it only when stopped moving it
2016-06-04 16:00:30 -07:00
David Rowe
b6cb5617d3 Save toolbar position when moving it only when stopped moving it 2016-06-05 08:55:27 +12:00
Brad Hefta-Gaub
5805c0cf9e Merge pull request #8016 from howard-stearns/do-not-send-stale-vive-data-as-valid-for-master
do not send stale vive data as valid after deactivating
2016-06-04 09:26:43 -07:00
howard-stearns
849bee977a Do not send stale vive data as valid after deactivating.
(cherry picked from commit e6cc1fabe0)
2016-06-04 09:07:51 -07:00
Brad Hefta-Gaub
c2a34f24cb Merge pull request #7999 from howard-stearns/do-not-send-stale-vive-data-as-valid
Do not send stale vive data as valid after deactivating.
2016-06-04 08:41:26 -07:00
Ken Cooke
89bfa5bc09 fixed typo 2016-06-03 19:22:29 -07:00