howard-stearns
3138c4041b
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse
2016-06-08 11:54:00 -07:00
Howard Stearns
b21fbe5d99
Merge pull request #8037 from howard-stearns/button-content
...
new hmd button content and initial positions
2016-06-08 11:28:26 -07:00
Howard Stearns
7588579ec3
Merge pull request #8026 from jherico/steamvr_keyboard
...
SteamVR keyboard functionality
2016-06-08 11:21:07 -07:00
howard-stearns
f8353fb082
New button content and initial positions.
2016-06-08 11:11:18 -07:00
howard-stearns
bd24a07750
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-08 10:50:03 -07:00
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
Howard Stearns
bf48099286
Merge pull request #8032 from jherico/pin-button
...
Add a constant hud toggle button to the UI
2016-06-08 10:33:11 -07:00
Howard Stearns
8bf6ed8b7a
Merge pull request #8025 from hyperlogic/feature/vive-ui-equip-hotspot
...
Render equip hotspot when trigger is squeezed
2016-06-08 09:42:33 -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
Brad Davis
29d9f51b58
Adding missed file
2016-06-07 16:46:17 -07:00
Brad Davis
ba61491ee6
PR feedback
2016-06-07 15:33:00 -07:00
Brad Davis
b9ee0c087e
Add a constant hud toggle button to the UI
2016-06-07 13:45:23 -07:00
howard-stearns
61c4277f38
Merge branch 'AndrewMeadows-walk-follows-camera' into vive-ui
2016-06-07 10:44:13 -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
howard-stearns
8894c731da
Merge branch 'walk-follows-camera' of https://github.com/AndrewMeadows/hifi into AndrewMeadows-walk-follows-camera
2016-06-07 10:36:16 -07:00
howard-stearns
74c5ddd49f
fix paused interactions with mouse
2016-06-07 09:50:10 -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
Anthony J. Thibault
b836a580ff
Updated some debug print information
2016-06-06 14:40:58 -07:00
Anthony J. Thibault
6d462a477d
Change equip-hotspot to a green sphere.
2016-06-06 14:40:57 -07:00
Anthony J. Thibault
c9f440a49d
handControllerGrab: initial rendering of equip hot-spots
...
* When trigger is depressed, any entities that are marked with a wearable equip-point
will become highlighted by a wireframe box (temporary art).
* The grab state machine is now defined by the CONTROLLER_STATE_MACHINE object.
this includes each state's name and updateMethod name.
* Support was added for entry and exit methods when changing states, this
functionality is used to draw and delete the hot spots when entering
and exiting the searching state.
2016-06-06 14:40:57 -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
