Commit graph

374 commits

Author SHA1 Message Date
danteruiz
1941e53cc3 track oculus controllers while in oculus home 2019-03-05 15:32:18 -08:00
r3tk0n
a3c4747290 Add leveled controller-relative movement option. 2019-02-21 11:17:31 -08:00
r3tk0n
f45ff3c662 Add menu item for selecting control scheme. 2019-01-28 10:40:43 -08:00
r3tk0n
35818e9b9d Add menu items for 'gear' selection. 2019-01-25 14:28:21 -08:00
r3tk0n
9ea476ea89 Attempt to add acceleration curve. 2019-01-25 14:27:54 -08:00
r3tk0n
6bfe9bf19e Move hand-relative entry in Controls menu. 2019-01-18 14:53:25 -08:00
r3tk0n
0c20107203 Add Controller menu items for hand/head-relative movement. 2019-01-18 12:46:19 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus
Keyboard interaction menus
2018-12-12 17:53:59 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Dante Ruiz
deaf3e8e44 adding option to disable teleportring 2018-12-11 11:06:13 -08:00
Dante Ruiz
29028386c8 Keyboard menu option in general settings 2018-11-27 11:56:07 -08:00
Brad Hefta-Gaub
b5e432bcb1
Merge pull request #14265 from amantley/needToSquat
Bug fix for Users unable to Squat
2018-11-13 12:01:06 -08:00
amantley
f2f4a55c19 removed cruft 2018-11-12 15:07:14 -08:00
David Rowe
c9b3fda724 Merge branch 'master' into M19768
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
2018-11-09 13:56:44 +13:00
Dante Ruiz
358aa547b1 feedback changes 2018-11-08 09:58:53 -08:00
David Rowe
28097933ed Add setting to enable/disable the mini tablet 2018-11-07 14:39:06 +13:00
amantley
e9dae8ebeb added force stand option for avatar lean behavior, you can now squat to your hearts content 2018-10-23 16:07:18 -07:00
amantley
2df9d6c5e9 addressed missing changes for luis 2018-10-23 13:37:56 -07:00
amantley
0d39343be4 changed if statement to switch in preferencesDialog.cpp, also removed print statement 2018-10-23 11:19:47 -07:00
amantley
39a16703e4 updated wording for the radio buttons for avatar leaning model 2018-10-23 10:52:14 -07:00
amantley
8cb09c37ee changed the ui to the settings/controls 2018-10-22 21:26:30 -07:00
David Rowe
9dfbaa9201 Remove "Reset Sensors" button from Settings > Controls 2018-09-29 14:17:55 +12:00
David Rowe
6ae206677d Add Settings > Controls option for displaying play area 2018-09-27 14:55:53 +12:00
David Rowe
b98bd741b8 Indent and reword jumping and flying checkbox 2018-09-26 18:14:02 +12:00
David Rowe
053ae0e0ed Use radio buttons for VR advanced movement options 2018-09-26 17:42:44 +12:00
David Rowe
af1b4fef5d Modify layout of rotation mode settings options 2018-09-25 18:03:57 +12:00
sam gateau
194903692e clening up the code in LODmanager and the associated js/qml 2018-08-30 18:09:11 -07:00
Sam Gateau
cee9b90930 working on the LOD behavior 2018-08-23 16:48:42 -07:00
Wayne Chen
4daa30c1d0 changing text for check preference 2018-08-22 15:58:37 -07:00
Wayne Chen
c32cc1ead2 adding implementation 2018-08-22 15:42:15 -07:00
SamGondelman
e3756a6dae Merge branch 'destroy' of github.com:SamGondelman/hifi into destroy 2018-08-06 11:21:51 -07:00
SamGondelman
9806bce403 weak pointers to nodeList 2018-08-06 11:21:32 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy 2018-08-06 09:51:14 -07:00
Dante Ruiz
9bebd1e623 making changes 2018-08-03 18:11:55 -07:00
SamGondelman
1ba28de5b6 try to fix nodelist not getting destroyed 2018-08-01 17:52:27 -07:00
r3tk0n
f8c611b1d0 Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp 2018-07-26 15:35:12 -07:00
r3tk0n
3108d650de
Restore original menu string for flying
Restore the original menu string for flying as it apparently *does* effect jumping.
2018-07-20 08:29:11 -07:00
MuteTab
b70b424447 Added new menu classification for VR vs non-VR movement. 2018-07-19 14:27:49 -07:00
Alexander Ivash
fb1a2037e3 move specifying custom properties for preferences dialog from C++ to QML (per Dante's request) 2018-07-06 21:00:55 +03:00
Alexander Ivash
2c07aa787f allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request) 2018-07-06 21:00:54 +03:00
Alexander Ivash
56cd4e57a6 add 'reset sensors' to preferences 2018-07-06 21:00:54 +03:00
John Conklin II
58a9bdc86f
Merge pull request #13511 from r3tk0n/mouse_menu2
Fix SpinnerSliderPreference Class, Update Mouse Sensitivity Menu
2018-07-02 12:33:35 -07:00
r3tk0n
39f491d9d0
Update PreferencesDialog.cpp
Removing errant newline
2018-06-29 16:17:15 -07:00
r3tk0n
4feba7e66e
Correction of string literals
Last update to string literals, miscommunication.
2018-06-29 16:12:31 -07:00
r3tk0n
5158a9c4fd
Update Mouse Sensitivity Settings Text
Changed text for clarity to new users.
2018-06-29 16:11:18 -07:00
r3tk0n
9b59dc5809 Changed SpinnerSliderPreference.qml to general-case UI element as originally intended,
updated PreferencesDialog.cpp's Avatar Scale slider to hard-coded bounds [0.25, 4.0].
2018-06-29 15:22:57 -07:00
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -07:00
Dante Ruiz
8a2b54c2b7 fixing mistakes 2018-05-18 17:09:41 -07:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Dante Ruiz
60dd7e49ab making requested changes 2018-05-18 16:41:39 -07:00
Dante Ruiz
6eb5a78611 fixing code that breaks andriod build 2018-05-18 10:33:03 -07:00
Dante Ruiz
e760912fd2 fix warning 2018-05-17 13:33:19 -07:00
Dante Ruiz
201b8a5140 fixing the graphics preference 2018-05-17 11:35:34 -07:00
Dante Ruiz
f8e9afb115 fixing damn build issues 2018-05-16 15:08:09 -07:00
Dante Ruiz
3be4b01d2c move overlays menu back 2018-05-16 14:36:55 -07:00
Dante Ruiz
237b0d7483 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 13:49:02 -07:00
Dante Ruiz
fbc3d97af3 adding back overlay menu and avatar size 2018-05-16 13:48:29 -07:00
vladest
7501b8818e removed shadows quality 2018-05-16 21:01:50 +02:00
Dante Ruiz
37c51a7246 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 10:41:40 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -07:00
vladest
72838f6d34 Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons 2018-05-16 17:06:31 +02:00
vladest
a9930d53a9 Reorder VR menu 2018-05-16 14:25:58 +02:00
vladest
dd05afa974 Remove double setting 2018-05-15 21:43:43 +02:00
Dante Ruiz
c6ff301aac Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-15 11:32:23 -07:00
Dante Ruiz
71633105de adding back some menus 2018-05-15 11:31:58 -07:00
vladest
e2a8ee2a4c Fixed About date format. Increased space between logo and build info 2018-05-15 20:02:29 +02:00
Zach Fox
a54ce96ac2 Clement's CR 2018-05-14 17:46:58 -07:00
vladest
f8ebe7e669 remoed no more used LOD dialogs. Fixed Slider properties min and max settings 2018-05-12 16:01:43 +02:00
vladest
a3f8148165 Added enable disable shadows menu 2018-05-10 12:40:13 +02:00
vladest
617b49fe14 Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode 2018-05-01 21:22:48 +02:00
vladest
4adfe94ed5 Removed check for updates menu item. POC: settings for advanced movements mappings 2018-04-30 20:43:36 +02:00
vladest
fffd4eec41 Avatar enable flying added 2018-04-19 08:46:20 +02:00
vladest
ee1738adac Add stubs for graphics settings. Add avatar collision setting 2018-04-17 21:58:53 +02:00
vladest
8a5d80de31 Fix Desktop double windows 2018-04-17 19:51:24 +02:00
vladest
6d53512c6c Merge 2018-04-15 15:24:16 +02:00
Alexia Mandeville
31ab398344 Moving user height and clarifying verbiage 2018-03-29 11:20:01 -07:00
Alexia Mandeville
8c9c7248d4 Reorganize of menu action items as well as QML categories 2018-03-12 12:52:12 -07:00
samcake
fec30b8363 Fixing the menu for Shadow and AO to do the correct path to engine config 2018-03-09 15:04:14 -08:00
ZappoMan
4ad5d34a10 more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel 2018-01-20 17:20:42 -08:00
ZappoMan
ab9041bcab remove LOAD DEFAULT SCRIPTS from General Preferences, since it already exists on Running Scripts 2018-01-20 00:14:44 -08:00
ZappoMan
027a1e69f4 some settings cleanup, adding description to Send Data 2018-01-20 00:08:06 -08:00
David Rowe
138092ac37 Remove "Prefer Avatar Finger Over Stylus" setting 2018-01-04 15:12:34 +13:00
David Rowe
901af8896f Add "Prefer Stylus Over Laser" setting 2018-01-03 17:54:43 +13:00
Zach Fox
c64c2e17c8 First pass at consolidation 2017-10-24 12:01:05 -07:00
Dante Ruiz
74f9e07f1a Merge pull request #11361 from vladest/move_tablet2toolbar_to_developer_menu
Move Tablet becomes toolbar menu from General to Developer menu
2017-09-26 11:26:42 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
vladest
2f86658308 Move Tablet becomes toolbar menu from General to Developer menu 2017-09-14 16:37:02 +02:00
Anthony J. Thibault
f4f9c29bff Fix for avatar scale preferences 2017-09-07 15:30:16 -07:00
Stephen Birarda
7859b3b11f remove image compression choices from Interface settings 2017-09-07 12:07:57 -07:00
Anthony J. Thibault
c9cdaadeb5 Better scale support in SpatiallyNestable class.
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.

Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field.  a new _dimensions member variable is used instead.  The SpatiallyNestable scale
field for entities should always be one.

Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.

Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.

Added qDebug stream support for Transform class.
2017-08-30 15:46:36 -07:00
Anthony J. Thibault
80b660b258 Added userHeight accessors and preference
Also made Avatar::getHeight thread-safe
2017-08-21 17:42:23 -07:00
Sam Gateau
2a75cde48a Merge pull request #11185 from samcake/blue
Fixing the graphics setting for Ambient Occlusion
2017-08-15 09:26:45 -07:00
samcake
05b78b0df0 Just fixing the ao combo box field 2017-08-14 10:46:33 -07:00
samcake
ff98dedbb2 Debugging the graphics fields activation 2017-08-11 18:10:44 -07:00
Seth Alves
1d07bc3b4e try, try again 2017-08-10 14:32:52 -07:00
Brad Hefta-Gaub
9b3be6d164 Merge pull request #10808 from humbletim/21400
WL 21400 -- Setting that lets you switch from cursor to reticle
2017-07-27 13:16:58 -07:00
Andrew Meadows
9d1fba3a3b Merge pull request #10821 from ctrlaltdavid/21418
Don't execute body of controllers' plugin update methods if not enabled
2017-07-25 08:51:17 -07:00
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Cain Kilgore
a4cf27402d Tabs and Cleanup of Code 2017-07-24 06:27:14 +01:00