345 commits

Author	SHA1	Message	Date
SamGondelman	9c1b139d5f	merge with master	2019-06-25 23:46:39 -07:00
Sam Gateau	7bf2c5fc8e	Simplify the setting name	2019-06-21 16:22:01 -07:00
Sam Gateau	a856fdb3ca	getting rid of the resolution Scale on the display plugin	2019-06-21 10:36:25 -07:00
Sam Gateau	22cd631a04	Merge And Modifying the Graphics settings and the dev menu	2019-06-20 17:48:36 -07:00
SamGondelman	37feb7f027	merge with master	2019-06-10 10:29:39 -07:00
amer cerkic	049ff8e618	fixed last space	2019-06-07 14:11:13 -07:00
amer cerkic	c61f0bcf3e	more vs cleanup	2019-06-07 14:07:06 -07:00
amer cerkic	64534913af	more vs changes udo	2019-06-07 13:59:18 -07:00
amer cerkic	fd7dd7948f	reverted vs spacing changes	2019-06-07 13:41:14 -07:00
amer cerkic	9498e0a462	addressing comment concerning preferences	2019-06-07 12:47:04 -07:00
SamGondelman	14c38c0fb0	ಠ⌣ಠ	2019-05-16 10:27:59 -07:00
Shannon Romano	32d3014d0d	Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 ... case 22190: Disable triggering away state when interface focus lost	2019-05-13 13:22:28 -07:00
Shannon Romano	a00545b48d	Merge pull request #15361 from SaracenOne/falling_push ... Case 22121: Allow players to disable automatic falling to flight threshold.	2019-04-26 14:03:52 -07:00
Dante Ruiz	0bdc37859d	Refresh Rate Controller	2019-04-24 16:16:08 -07:00
Saracen	3dde53f743	Friendlier and more understandable naming.	2019-04-11 03:57:34 +01:00
Saracen	bce80130bd	Allow players to disable automatic falling to flight threshold.	2019-04-09 21:07:17 +01:00
Wayne Chen	4f738a5b42	code review feedback/formatting issues	2019-04-04 12:03:48 -07:00
Saracen	90e979bda7	Add option to disable triggering an away state when interface ... focus is lost.	2019-03-31 18:44:16 +01: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