54 commits

Author	SHA1	Message	Date
David Rowe	868a3a9219	Tweak vertical spacing	2018-09-28 15:42:48 +12:00
David Rowe	4813f4d042	Show/hide jumping & flying checkbox depending on movement mode	2018-09-28 13:02:27 +12:00
David Rowe	5ab22a1f40	Change play area option text for Oculus	2018-09-27 17:07:42 +12:00
Dante Ruiz	ff52639bc3	fix update	2018-09-14 14:10:36 -07:00
Dante Ruiz	4eb5c9714b	fix snapshot settings	2018-09-14 12:59:28 -07:00
David Rowe	398724de73	Make Save in HMD settings dialogs return to previous dialog ... Same as Cancel key does.	2018-09-06 10:23:45 +12:00
David Rowe	c29c9f98c1	Make Cancel in HMD settings dialogs return to Settings dialog	2018-08-28 11:15:57 +12: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
David Back	6b7d9586d1	apply fixes to other file dialogs and fix tablet dialog buttons	2018-06-04 15:56:10 -07:00
Wayne Chen	81eea5d8d1	Merge pull request #13213 from wayne-chen/filebrowser-case-14515 ... Adding showHidden properties to file dialogs to allow for showing hidden files/folders	2018-05-30 10:43:58 -07:00
Wayne Chen	345138f4ff	Changing showHidden property to be always true	2018-05-23 10:30:08 -07:00
Wayne Chen	e3414c320e	changing property to alias to reflect folderListModel	2018-05-22 11:03:31 -07:00
Wayne Chen	1774b401c8	allowing file dialogs to show hidden files/folders via showHidden property	2018-05-22 10:24:04 -07:00
vladest	72838f6d34	Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons	2018-05-16 17:06:31 +02:00
Dante Ruiz	82422edb59	fixinig the controller settings page and have menu option on by default	2018-05-14 18:51:39 -07:00
vladest	fe5d7463fe	Merge branch 'master' into move_to_qqc2	2018-03-10 14:42:51 +01:00
Zach Fox	d0cc64f63d	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
vladest	148faa3a93	Merge branch 'master' into move_to_qqc2	2018-03-04 14:16:21 +01:00
Zach Fox	67034274fa	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
vladest	b3b7a7636f	Merge branch 'master' into move_to_qqc2	2018-01-16 21:08:49 +01:00
Zach Fox	6920e57613	Fix 'Browse Avatars' button from Avatar Settings	2018-01-12 13:31:58 -08:00
vladest	0c13c2b6e2	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
vladest	b1601dcd4c	fix typo in tablet avatar browser	2017-10-28 12:07:29 +02:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Cain Kilgore	f9204a7034	Now it should appear..	2017-07-25 09:03:47 +01:00
Cain Kilgore	f91a8c0f53	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
Cain Kilgore	247e7b8bed	indentation!!!	2017-07-13 19:25:31 +01:00
Cain Kilgore	43782a29c7	Avatar Scaler - WIP	2017-07-12 22:04:58 +01:00
Vladyslav Stelmakhovskyi	30714d5d25	Make background with default color. Fix few warnings	2017-06-22 16:47:40 +02:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Dante Ruiz	a45bea2c90	fixed merge conflicts	2017-05-27 00:57:09 +01:00
Dante Ruiz	4365907462	drop down puck configuration for gernal settings	2017-05-10 22:12:11 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
druiz17	92bb7f2329	saving work	2017-04-09 18:55:53 -07:00
Vladyslav Stelmakhovskyi	9822193644	Set z-order of comboboxes to make sure lowest will no overlap higher ones	2017-03-29 14:41:18 +02:00
David Rowe	f1947769d6	Fix tablet settings dialogs' titles and make QML consistent	2017-03-17 11:15:56 +13:00
Seth Alves	f8a6a82371	Merge pull request #9881 from ctrlaltdavid/21197 ... Browse for avatar in Marketplace from tablet avatar settings dialog	2017-03-14 05:33:11 -08:00
David Rowe	43687d4773	Tidying	2017-03-14 21:41:04 +13:00
David Rowe	d141d5b683	Add keyboard	2017-03-14 21:36:57 +13:00
David Rowe	f3a99a2437	Implement avatar browser for tablet avatar settings	2017-03-14 15:36:51 +13:00
David Rowe	4dd7667fd7	Merge branch 'tablet-ui' into 21209 ... # Conflicts: # interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-14 08:50:01 +13:00
David Rowe	6a8d0b1064	Refactor some tablet dialog headers	2017-03-11 16:55:22 +13:00
David Rowe	189eee01a6	Refactor TabletComboBox.qml into ComboBox.qml	2017-03-11 11:02:09 +13:00
Dante Ruiz	b63ab05eec	improved general settting coloring	2017-03-10 19:33:14 +00:00
David Rowe	0333122b23	Make Save and Cancel buttons close preferences dialog	2017-03-04 15:27:31 +13:00
David Rowe	53cfad65cd	Add keyboard to preferences dialogs	2017-03-04 13:01:02 +13:00
David Rowe	ebe41bb443	Add a title to the tablet settings dialogs	2017-03-02 14:11:56 +13:00
Dante Ruiz	968ba1e03d	updated file headers	2017-02-14 16:08:25 +00:00
Dante Ruiz	773ade5b61	removing qml errors	2017-02-14 07:46:34 -08:00