16 commits

Author	SHA1	Message	Date
vladest	dbd6ec0dff	Port Edit.qml to QQC2 as well as some tablet preferences compinents	2017-11-17 20:46:21 +01:00
David Rowe	07697c5083	Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.	2017-07-01 11:19:00 +12:00
David Rowe	be0e1a75a4	User-friendly SDL2 controller name	2017-06-29 10:03:58 +12:00
David Rowe	72d712ac76	Add "enabled" setting for Sixense; bail in update if note enabled	2017-06-26 16:43:06 +12:00
David Rowe	31714675c3	Remove unused Sixense preference and associated methods	2017-06-26 16:14:57 +12:00
David Rowe	361bc1ce03	Add "enabled" setting for SDL2 joystick; bail in update if not enabled	2017-06-26 16:00:18 +12:00
David Rowe	febd0eaf98	Add Leap Motion settings	2017-06-16 10:58:11 +12:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Dante Ruiz	4365907462	drop down puck configuration for gernal settings	2017-05-10 22:12:11 +01:00
Zach Pomerantz	532284f779	fix tablet resolve typo	2017-04-26 16:28:42 -04:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
David Rowe	069e66b875	Fix stack functions	2017-03-17 11:19:50 +13:00
David Rowe	f1947769d6	Fix tablet settings dialogs' titles and make QML consistent	2017-03-17 11:15:56 +13:00
Dante Ruiz	8a973dae3c	fixed bring menu dialogs in tablet	2017-03-10 23:21:29 +00:00
David Rowe	ebe41bb443	Add a title to the tablet settings dialogs	2017-03-02 14:11:56 +13:00
David Rowe	9f56d2f6f6	Make tablet general settings dialog naming more consistent with desktop	2017-03-02 12:30:36 +13:00

Renamed from interface/resources/qml/hifi/tablet/TabletGeneralSettings.qml (Browse further)