213 commits

Author	SHA1	Message	Date
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
David Rowe	9088d1ef9c	Tablet version of recordings browser dialog	2017-04-19 16:15:22 +12:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
Zach Fox	7505b82189	Merge pull request #10046 from Triplelexx/21224 ... 21224 - Allow people to save avatar bookmarks	2017-04-18 11:10:50 -07:00
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Dante Ruiz	d823093ddb	fixed merge conflict	2017-04-11 16:58:25 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
Vladyslav Stelmakhovskyi	7628916db6	Check if dialog was opened from StackView and then pop or just go to home menu	2017-04-09 20:09:15 +02:00
Dante Ruiz	86c67a3017	tablet pages	2017-04-08 02:01:21 +01:00
Lexx	af95741a7e	Merge branch 'master' into 21224	2017-04-04 18:24:49 +01:00
Triplelexx	aa9a2532a9	fix for displaying "Bookmark Avatar" dialog in tablet ui	2017-03-30 13:54:33 +01:00
Triplelexx	50e35a220b	Merge remote-tracking branch 'upstream/master' into 21224	2017-03-30 01:25:27 +01:00
Vladyslav Stelmakhovskyi	209de29b2a	Intial commit. Basically works. Need some testing	2017-03-29 17:36:05 +02:00
Triplelexx	07e6b766b5	rename FILENAME constants	2017-03-26 23:10:50 +01:00
Triplelexx	8f507942cf	change storage location ... still unsure what is best. this is consistent and doesn't require login	2017-03-25 19:10:12 +00:00
humbletim	5d5d947ddb	updates per discussion with triplelexx	2017-03-25 04:01:02 -04:00
humbletim	630afb716f	consolidate QML->C++ triggering workaround to help compartmentalize the problem for later fixin'	2017-03-25 03:01:35 -04:00
humbletim	96f905362b	alternative way to connect the button?	2017-03-25 01:17:27 -04:00
Triplelexx	bda1d54209	create AvatarBookmarks ... derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass at integration, QML issues noted	2017-03-24 22:58:36 +00:00
Vladyslav Stelmakhovskyi	696825580e	Merge branch 'tablet-ui' into tablet-ui-login-logout	2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi	5e162a6447	Implemented login facility for tablet UI	2017-03-18 14:38:49 +01:00
David Rowe	1080e21afd	Tidying	2017-03-16 19:28:28 +13:00
David Rowe	89eb073855	Fix dialog height changing as drop-down value is changed	2017-03-16 19:28:12 +13:00
David Rowe	74db9dc573	Fix drop-down hiding behind buttons	2017-03-16 19:27:47 +13:00
David Rowe	3c1506237a	Fix not all warning text displaying	2017-03-16 19:27:27 +13:00
David Rowe	7efda8bead	Make clicking on dialog background defocus current control	2017-03-16 19:27:06 +13:00
David Rowe	9e458fd180	Fix keyboard in tablet custom query dialog	2017-03-16 19:26:41 +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	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	05e4c2a1bb	MyAvatar is available in tablet now	2017-03-12 09:59:52 +13:00
David Rowe	189eee01a6	Refactor TabletComboBox.qml into ComboBox.qml	2017-03-11 11:02:09 +13:00
Vladyslav Stelmakhovskyi	e27ccab2f4	Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click	2017-03-10 19:53:20 +01:00
druiz17	0069569e96	Merge branch 'tablet-ui' into 21197	2017-03-09 09:31:15 -08:00
Vladyslav Stelmakhovskyi	6d9e7de6dc	Implemented AssetBrowser in Tablet view	2017-03-06 21:45:55 +01:00
David Rowe	09ecb12510	Merge branch 'tablet-ui-edit-js' into 21197 ... # Conflicts: # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-07 08:59:40 +13:00
Dante Ruiz	88c0db969c	added tabletComboBox to tabletFileDialog	2017-03-03 17:14:00 +00:00
Dante Ruiz	5ba89e67af	fixed message dialog bug	2017-03-02 16:50:42 +00:00
David Rowe	62f91b4af6	Work around MyAvatar not being available in avatar preference control	2017-03-02 15:01:31 +13:00
Dante Ruiz	835b23832f	some modal clean up	2017-02-25 00:40:38 +00:00
Dante Ruiz	4a5be4238e	messages and file dialogs in tablet	2017-02-24 00:19:32 +00:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
Anthony J. Thibault	cbf514a738	PreferenceDialogs now preserve the sort order of their showCategories. ... Specifically, this was to fix the issue with the Neuron plugin preferences being the top section in the General Preferences dialog, now it is the last.	2016-11-23 10:11:28 -08:00
howard-stearns	84eb1721e7	fix numeric keyboard for hmd Window.prompt	2016-11-04 17:02:14 -07:00
howard-stearns	e7392acb10	directory picker works when choosing the initial value	2016-10-17 13:50:23 -07:00
David Rowe	a359626316	Merge branch 'master' into 21070	2016-10-13 09:54:59 +13:00
David Rowe	18f19b07d4	Fix checkbox not being disabled per dropdown default ... And tweak checkbox position.	2016-10-13 08:37:30 +13:00
David Rowe	86f6cee2ad	Fix Asset Browser add-to-world drop-down	2016-10-12 20:08:33 +13:00
David Rowe	31b35f0a35	Only raise keyboard if in HMD display mode	2016-10-12 09:43:33 +13:00