367 commits

Author	SHA1	Message	Date
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