7813 commits

Author	SHA1	Message	Date
Wayne Chen	db06533018	adding more staging	2019-01-16 17:05:48 -08:00
Wayne Chen	50902080ce	fixing typos	2018-12-17 16:48:02 -08:00
Wayne Chen	816733b55f	reverting to master	2018-12-17 16:47:11 -08:00
Wayne Chen	5d89ed2a81	matching master	2018-12-17 13:46:55 -08:00
Wayne Chen	28fd1380df	adding target scale and default avatar to login state	2018-12-17 13:37:28 -08:00
Wayne Chen	899918006f	fixing for autotester	2018-12-14 17:12:27 -08:00
Wayne Chen	befca68917	fixing keyboard position offset	2018-12-14 10:57:42 -08:00
Wayne Chen	e744f40d54	fixing url to login overlay	2018-12-13 16:43:12 -08:00
Wayne Chen	1d86f3816d	fixing build error	2018-12-13 15:43:42 -08:00
Wayne Chen	502de63d3f	fixing bug	2018-12-13 14:59:40 -08:00
Wayne Chen	3806914e76	fixing variable names to match coding standard	2018-12-13 14:34:25 -08:00
Wayne Chen	0daa909192	more dev feedback	2018-12-13 14:25:52 -08:00
Wayne Chen	1ce7d8a31c	dev feedback	2018-12-13 13:47:07 -08:00
Wayne Chen	4116f6ca9a	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
Zach Fox	735be62271	Merge pull request #14562 from zfox23/portalPrototype ... Add a "Portal" mode to the Secondary Camera	2018-12-12 09:27:55 -08:00
Wayne Chen	2f07a0eb5d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-11 20:01:19 -08:00
Wayne Chen	dbebf1a67f	having stats mirror master	2018-12-11 19:29:17 -08:00
Wayne Chen	4b8200d5bb	forcing stats to be false until login determined	2018-12-11 17:27:54 -08:00
Shannon Romano	a3c870ed90	Merge pull request #14479 from sabrina-shanman/hfm_mimetype ... (case 20037) Add robust MIME type detection for loading models in ModelCache	2018-12-11 18:41:55 +00:00
Wayne Chen	4c9c785c24	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-10 07:57:44 -08:00
Wayne Chen	7ab1d649f1	fixing limit for overlay too far/close	2018-12-09 07:49:48 -08:00
Wayne Chen	9fd1b7fb2d	cancel pitch and check if overlay too far/close	2018-12-07 17:25:55 -08:00
John Conklin II	0a80c16686	Merge pull request #14419 from SamGondelman/splash ... Case 19740: Improve startup times by pre-compiling shaders with splash screen	2018-12-07 16:10:52 -08:00
sabrina-shanman	7cbe3776f5	Simplify serializer registration process	2018-12-07 12:05:27 -08:00
Wayne Chen	a2572d5710	fix switch display mode crash/keyboard spawn problem	2018-12-07 11:17:06 -08:00
Wayne Chen	2f4805dc04	adding focus disable signal to fix focus	2018-12-06 16:38:10 -08:00
Wayne Chen	1ddba8e787	KB following updated login screen/keep login screen active	2018-12-06 14:58:06 -08:00
Wayne Chen	30f1016f1c	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-06 09:55:00 -08:00
Jeff Clinton	e8c1c4a27b	Merge pull request #14536 from danteruiz/fix-audio-switching ... Respect changed audio settings when switch displays (Master)	2018-12-06 09:13:47 -08:00
Wayne Chen	037abd9b5e	don't allow PC keyboard in HMD login/fix sign up password	2018-12-05 18:14:59 -08:00
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
SamGondelman	287878ff98	merge with master	2018-12-05 10:35:08 -08:00
Dante Ruiz	3123bb37e4	fix audio switching issue	2018-12-05 10:34:47 -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
sabrina-shanman	243a1d6598	Add ModelFormatRegistry for handling model loading on the application side	2018-11-30 16:50:53 -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