437 commits

Author	SHA1	Message	Date
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
Brad Davis	8f85c7650b	Make sure loaded components get the right parent context	2017-11-13 14:16:04 -08:00
SamGondelman	2c0272f304	(mostly?) fix touch events	2017-11-13 12:58:31 -08:00
Brad Davis	5cf9c1bb33	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 10:48:21 -08:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
beholder	5fcde1186a	hide keyboard before showing to solve clearing 'mirrorText' on jumping between input fields without hiding keyboard	2017-11-10 21:20:00 +03:00
beholder	db3ed81513	adjust to changed requirements: ... 1. The keyboard collapse button is moved to the lower right, replacing the keys there 2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift 3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right	2017-11-10 21:20:00 +03:00
beholder	a9fe3596cf	4684 Add collapse button on the virtual keyboard	2017-11-10 21:20:00 +03:00
Elisa Lupin-Jimenez	119c662899	fixed null file path in file dialog call	2017-11-09 11:46:19 -08:00
Brad Davis	1a58aee385	Fix scripting URL injection, I hope	2017-11-08 12:00:29 -08:00
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
SamGondelman	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -07:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
luiscuenca	c834cf1cf3	Comments and corrections	2017-11-01 21:55:31 -07:00
SamGondelman	657a0fb036	Merge remote-tracking branch 'upstream/pointers' into ui	2017-10-31 17:41:14 -07:00
SamGondelman	64665c87b2	replace ids with unsigned ints	2017-10-31 17:07:48 -07:00
SamGondelman	3c779f1528	HUD events WIP, fix entity/overlay hover, no hover for empty renderState	2017-10-31 14:42:31 -07:00
luiscuenca	8d5c95b1d6	Various corrections	2017-10-30 16:47:59 -07:00
luiscuenca	f32282afdd	Clean update bug 8027	2017-10-27 11:03:02 -07:00
Zach Fox	002141724b	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Dante Ruiz	92f765fe52	property set echomode for keyboard for wallet and webviews	2017-10-24 13:53:50 -07:00
Zach Fox	c64c2e17c8	First pass at consolidation	2017-10-24 12:01:05 -07:00
Dante Ruiz	0242e8e4ba	fixed crash and login password	2017-10-23 16:33:49 -07:00
vladest	fa349a694c	Code style fixes	2017-10-20 15:12:09 +02:00
vladest	ea6c2e1bb5	Merge branch 'master' into tablet_extended_sounds	2017-10-20 14:46:02 +02:00
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
beholder	e8589d53dd	updated code based on code review	2017-10-18 03:45:50 +03:00
Andrew Meadows	25818fc5e9	Merge pull request #11613 from jherico/feature/qml_whitelist ... Support for custom functionality for specific QML URLs	2017-10-17 17:34:22 -07:00
Bradley Austin Davis	f53a74b515	Support for custom functionality for specific QML URLs	2017-10-17 11:53:30 -07:00
beholder	fa7892e5c6	8217 Search in tablet doesn't update	2017-10-17 02:02:21 +03:00
beholder	f83040c572	updating code accordingly to the comments	2017-10-14 12:29:06 +03:00
beholder	c31aa6bcdb	8213 Keyboard Input Field: Reveals Passwords	2017-10-12 22:08:46 +03:00
vladest	145149fedd	Merge branch 'master' into tablet_extended_sounds	2017-10-12 18:01:23 +02:00
Zach Fox	ea3da6c9dd	Merge pull request #11495 from zfox23/pop_interfaceChanges2 ... Commerce: One step closer!	2017-10-03 11:56:00 -07:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
vladest	e360c1363e	Merge branch 'master' into tablet_extended_sounds	2017-10-02 18:03:49 +02:00
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Zach Fox	b5dc6b791b	Fix commerce setting handle	2017-09-28 10:42:45 -07:00
Andrew Meadows	dafadf82bb	Merge pull request #11458 from jherico/fix/tablet_latency ... Fix long tablet lag on first load	2017-09-26 16:18:31 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
Brad Davis	40c42d35a5	Fix long tablet lag on first load	2017-09-25 17:50:04 -07:00
vladest	074362b228	Remove logging	2017-09-25 23:10:26 +02:00
vladest	1a2d38e31f	Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds	2017-09-25 17:11:44 +02:00
vladest	5a452fa981	Merge branch 'master' into tablet_extended_sounds	2017-09-25 15:40:40 +02:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
Brad Davis	549cb77902	Fix dimensions of rendered web entities	2017-09-21 20:59:01 -07:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Andrew Meadows	6b3b3a7448	Merge pull request #11382 from ElderOrb/case6618 ... 6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-21 08:54:11 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
vladest	50ee41e095	Fix file loading dialogs	2017-09-19 22:42:15 +02:00
beholder	8b39c56aa1	rename 'target' to 'targetOverride' to indicate that parameter overrides default target	2017-09-18 20:40:22 +03:00
vladest	e26118254f	Implemented Audio injector in Tablet scripting interface. Added missed sound events	2017-09-18 19:40:06 +02:00
vladest	bb214d7bf3	Merge branch 'master' into tablet_extended_sounds	2017-09-17 16:16:03 +02:00
vladest	1cde504c74	Memleak fix. Cleanup	2017-09-16 22:57:26 +02:00
vladest	5585265349	Merge branch 'master' into modal_dialogs_async	2017-09-16 22:06:49 +02:00
vladest	3ceeb0d83e	Rework all c++ calls	2017-09-16 22:04:53 +02:00
beholder	871b169128	6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-16 16:17:36 +03:00
vladest	de4f34aacb	Add resizable flag. Use the flag for Create only	2017-09-15 21:49:38 +02:00
vladest	0bfa29d0d4	Merge branch 'master' into modal_dialogs_async	2017-09-14 20:21:29 +02:00
vladest	7c1827d672	use AduioEvent instead of string	2017-09-14 20:21:11 +02:00
vladest	61b283743e	Merge branch 'master' into tablet_extended_sounds	2017-09-14 19:52:35 +02:00
David Kelly	7550374f8f	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet	2017-09-13 04:49:13 -07:00
David Kelly	187ed71a8a	more cleanup, plus now keyfile associated with user directly	2017-09-12 10:55:27 -07:00
anshuman64	996277b34c	Merge pull request #11335 from vladest/menu_fix ... Make sure root item is created before lambda gets called for desktop …	2017-09-11 12:47:40 -07:00
vladest	34c1cb6579	Typos and naming fixes	2017-09-11 19:42:05 +02:00
Chris Collins	47a9337aa7	Merge pull request #11323 from jherico/mac_fixes ... Mac fixes	2017-09-11 09:10:50 -07:00
vladest	dfaa8761e5	Make sure root item is created before lambda gets called for desktop loader	2017-09-10 20:08:40 +02:00
vladest	832e4aa5eb	Introducong tablet audio events	2017-09-08 09:51:10 +02:00
Bradley Austin Davis	eb8b892571	Various Mac fixes	2017-09-07 14:45:35 -07:00
Brad Davis	cc3beb3d91	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -07:00
beholder	c62f9007e9	7196 Mouse pointer no longer visible in HMD mode ... The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins. The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins	2017-09-03 15:20:59 +03:00
vladest	681fc529dc	Merge branch 'master' into modal_dialogs_async	2017-09-01 13:31:15 +02:00
vladest	1b5e6fd5f8	Merge branch 'master' into modal_dialogs_async	2017-08-31 20:39:48 +02:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
Zach Fox	271fcbf8b4	Merge pull request #11271 from davidkelly/dk/securityImageIssue ... security image shows up in every qml engine now	2017-08-30 10:52:48 -07:00
David Kelly	72b15b4223	fix comment	2017-08-29 20:28:57 -07:00
druiz17	2a97257698	Merge pull request #11140 from ElderOrb/case6788 ... 6788: You can deselect your current view mode	2017-08-29 17:15:51 -07:00
David Kelly	a2b1cfc7ac	security image shows up in every qml engine now	2017-08-29 17:06:57 -07:00
beholder	a0a43ebf26	show checkbox or radiobutton dependently on exclusiveGroup presence	2017-08-29 23:23:16 +03:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
beholder	cbbe03cee7	6788: You can deselect your current view mode	2017-08-25 02:33:11 +03:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
Howard Stearns	188cbee781	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 ... Asynchronous Ledger Interactions with Server	2017-08-18 15:40:24 -07:00
howard-stearns	bd37679b65	working	2017-08-18 14:03:40 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
vladest	a87a93d991	Implemented input dialog async functions	2017-08-16 15:35:51 +02:00
vladest	757af1e2e5	Added Save, Directory and Assets async methods	2017-08-15 14:44:01 +02:00
vladest	ac7aa609f2	Open file async implemented	2017-08-14 16:23:53 +02:00
vladest	b604b1bbac	Async file dialogs #1	2017-08-13 11:02:29 +02:00
Elisa Lupin-Jimenez	6c2bf63392	Back button works	2017-08-10 17:51:19 -07:00
Elisa Lupin-Jimenez	da5bb03187	Trying to add in a back button	2017-08-10 16:34:37 -07:00
vladest	68e9d335cd	Added async information and critical dialogs	2017-08-10 10:46:06 +02:00
vladest	556569819d	1st stage of moving to async dialogs	2017-08-09 14:00:19 +02:00
Seth Alves	186035dc5d	adjust various things that cause a crash-on-exit on Linux	2017-08-06 11:57:55 -07:00
vladest	a439cc1837	Make connection to tablet shown signal more consistent, eliminates missed signals	2017-08-03 20:58:44 +02:00
vladest	b049b0f415	Merge conflicts	2017-08-03 19:43:42 +02:00