7774 commits

Author	SHA1	Message	Date
Wayne Chen	11c40666e4	removing trailing tests	2018-12-05 11:29:58 -08:00
Wayne Chen	27e4e1c245	pitch updates login pos/fix signup errors	2018-12-05 11:24:27 -08:00
Wayne Chen	37beab3ab3	fixing the desktop tablet problem again	2018-12-05 09:36:56 -08:00
Wayne Chen	40053ef13a	make sure android still functions as expected	2018-12-05 09:10:17 -08:00
Wayne Chen	328e1ebc27	autotester param fully functional	2018-12-05 08:51:13 -08:00
Wayne Chen	07599c02c8	true reversion of scrips param	2018-12-05 08:16:54 -08:00
Wayne Chen	4daa943510	fixing scripts param/reverting some qml	2018-12-04 17:17:58 -08:00
Wayne Chen	3951203b55	adding tablet bg/no movement in login state	2018-12-04 16:50:01 -08:00
Wayne Chen	2d8b638370	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 14:19:28 -08:00
Wayne Chen	a24cd41367	getting textfield into focus	2018-12-04 14:19:09 -08:00
Sam Gateau	d2ff4d4674	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-12-03 20:52:43 -08:00
Wayne Chen	dc3381d4a9	updating artwork	2018-12-03 17:28:10 -08:00
Wayne Chen	09bc886c20	Merge branch 'master' into loginInitiative2	2018-11-30 13:05:17 -08:00
Jeff Clinton	0bca290de2	Merge pull request #14485 from sethalves/crash-on-exits ... suppress 'No instance available' messages during shutdown. try a dif…	2018-11-30 10:10:43 -08:00
Shannon Romano	1b24d051f7	Merge pull request #14432 from ctrlaltdavid/M17988 ... Fix memory accumulating while Interface is minimized	2018-11-30 09:39:14 -08:00
Wayne Chen	707339dd2a	allowing clicking any mousearea back to the textfield/disable movement ctrls	2018-11-29 17:18:40 -08:00
Wayne Chen	e033492472	enable mouse capture upon resume	2018-11-29 15:40:00 -08:00
Wayne Chen	62848700f3	disable mouse capture in login state	2018-11-29 15:37:35 -08:00
Sam Gateau	54fa4365b8	FIxing build issue doh...	2018-11-28 22:21:58 -08:00
Sam Gateau	9353745054	MErge with master	2018-11-28 21:40:24 -08:00
Wayne Chen	34fb7159e2	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-28 19:24:20 -08:00
Wayne Chen	b0fb7778cf	fixing some text, turning off lasers until they intersect login overlay	2018-11-28 19:17:30 -08:00
Wayne Chen	9deb15b9f6	Merge branch 'master' into loginInitiative2	2018-11-28 19:10:20 -08:00
Wayne Chen	527f8a2b59	UI feedback + new overlay position update	2018-11-28 15:38:37 -08:00
Seth Alves	fac27553d7	suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient.	2018-11-27 17:02:48 -08:00
Wayne Chen	d5e16ae920	removing login state sound	2018-11-27 13:31:41 -08:00
Seth Alves	8f21ade0c7	make cmake -DDISABLE_QML=1 work again	2018-11-27 12:41:40 -08:00
Wayne Chen	1258676d56	fixing text height/toolbar coming back	2018-11-26 21:01:34 -08:00
Wayne Chen	bf285b3570	adding experimental login state sound	2018-11-21 14:14:07 -08:00
Wayne Chen	51f5942a7f	adding sound to login screen	2018-11-21 13:36:36 -08:00
sam gateau	be03859ed6	Warnings from build	2018-11-21 13:31:54 -08:00
Wayne Chen	d12655ed7b	sfx to login mousearea/hiding desktop toolbar	2018-11-21 12:21:19 -08:00
sam gateau	44b9b92450	Getting ready for merge	2018-11-20 17:32:04 -08:00
Wayne Chen	cdee10d0b8	getting dominant hand laser + sign up working	2018-11-20 16:54:16 -08:00
Wayne Chen	5f658b90ff	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-20 10:44:29 -08:00
Wayne Chen	d55c9467e7	fixing keyboard offset	2018-11-20 10:37:30 -08:00
Wayne Chen	2820328137	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-19 15:21:24 -08:00
Wayne Chen	1419ec907b	adding wip	2018-11-19 13:57:55 -08:00
David Rowe	7ffa70d0ac	Fix memory accumulating while Interface is minimized	2018-11-20 09:36:58 +13:00
Wayne Chen	3555276817	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-19 09:02:30 -08:00
Wayne Chen	b8d8710604	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-19 09:02:16 -08:00
Sam Gateau	5f062bbcf5	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-11-16 20:05:08 -08:00
Jason Najera	da3ea682ba	Merge pull request #14347 from r3tk0n/19550-oculus-store-v2 ... MS19550 - Don't show help for HMDs that aren't plugged in and active	2018-11-16 15:49:46 -08:00
Shannon Romano	6425a474ac	Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading ... Fixing case of interstitial not finishing loading	2018-11-16 14:53:01 -08:00
Wayne Chen	4f1361c0ea	adding keyboard following login dialog	2018-11-16 12:31:22 -08:00
Wayne Chen	a2a09bc2b9	fixing compile error	2018-11-16 11:16:24 -08:00
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
Wayne Chen	27f02c072a	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-15 18:49:49 -08:00
Wayne Chen	02248e77e4	got the overlay to start recentering	2018-11-15 17:03:55 -08:00
r3tk0n	60832b071c	Fix logic for cases with rift headset but no touch controllers.	2018-11-15 14:08:38 -08:00