328 commits

Author	SHA1	Message	Date
Wayne Chen	4f738a5b42	code review feedback/formatting issues	2019-04-04 12:03:48 -07:00
r3tk0n	7a8dfe0aaf	Fix run speeds.	2019-03-21 15:06:21 -07:00
r3tk0n	543d53ecde	Add ability to toggle strafing.	2019-03-21 13:12:15 -07:00
r3tk0n	39342b9771	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-11 16:27:05 -07:00
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