27487 commits

Author	SHA1	Message	Date
Wayne Chen	76f33ff853	dont allow auto-switch after display mode change	2018-11-14 13:27:00 -08:00
Wayne Chen	7375840eda	adding 3d keyboard/get anchor id wip for reposition	2018-11-13 17:09:47 -08:00
Wayne Chen	e84361f267	getting hmd/desktop switch working	2018-11-13 14:20:23 -08:00
Wayne Chen	5b021041bb	adding play area center for overlay position	2018-11-13 10:23:28 -08:00
Wayne Chen	206c1d5b53	adding background image	2018-11-12 16:23:12 -08:00
Wayne Chen	ea325acef9	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-12 10:28:03 -08:00
Brad Hefta-Gaub	22dd958582	Merge pull request #14297 from jherico/feature/vcpkg ... Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms	2018-11-12 09:52:02 -08:00
Seth Alves	500b2b7adf	Merge pull request #14381 from zfox23/MS19803_retry ... Actually fix MS19803: Replace missing imports	2018-11-09 16:38:26 -08:00
Jeff Clinton	12b833d121	Merge pull request #14167 from ElderOrb/FB18859 ... Make material entities to be presented in avatarapp	2018-11-09 15:32:27 -08:00
Zach Fox	8d325d8dd9	Actually fix MS19803: Replace missing imports	2018-11-09 15:02:57 -08:00
Wayne Chen	c927cd6287	wip on overlay spawn in play area	2018-11-09 15:02:14 -08:00
Zach Fox	1ce6079c5a	Remove extra as	2018-11-09 11:26:18 -08:00
Wayne Chen	b500a9ebbb	using experimental play area	2018-11-08 17:13:14 -08:00
Wayne Chen	f66326fc4d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-08 15:51:24 -08:00
Wayne Chen	f4ae55d534	adding experimental play area position for overlay	2018-11-08 15:46:27 -08:00
Wayne Chen	fe0bbe19d7	creating login overlay upon startup in HMD/feedback changes	2018-11-08 14:32:11 -08:00
John Conklin II	3fabe557c2	Merge pull request #13948 from danteruiz/3d-keyboard ... 3D Keyboard.	2018-11-08 13:35:13 -08:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00
Jeff Clinton	ea8dc8ae68	Merge pull request #14334 from danteruiz/interstitial-bug-fixes ... Interstitial bug fixes	2018-11-08 11:43:38 -08:00
Wayne Chen	e266532888	Merge branch 'master' into loginInitiative2	2018-11-08 11:17:24 -08:00
John Conklin II	ab9c494fef	Merge pull request #14367 from SamGondelman/tablet ... Case 17284: Fix tablet culling	2018-11-08 11:14:12 -08:00
Jamil Akram	7c22a1954c	Merge pull request #14237 from NissimHadar/addNoLogin ... case 18450: Do not show login dialog if requested not to on the command line.	2018-11-08 10:43:21 -08:00
Dante Ruiz	358aa547b1	feedback changes	2018-11-08 09:58:53 -08:00
Dante Ruiz	f664421fe0	addressing code review feedback	2018-11-08 09:58:53 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
Wayne Chen	3f7e810eb8	Update LoginDialog.cpp	2018-11-07 16:47:27 -08:00
Wayne Chen	13de13b822	delete unneeded headers	2018-11-07 16:45:59 -08:00
Wayne Chen	f683a51ef5	allowing qApp to load overlay/load default scripts if runningscripts empty	2018-11-07 16:32:06 -08:00
Zach Fox	cee1454f6e	CR feedback - thanks Ken!	2018-11-07 15:09:53 -08:00
SamGondelman	d316fe15ce	fix tablet culling	2018-11-07 15:02:32 -08:00
Zach Fox	48d3450c5a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-07 14:59:23 -08:00
Zach Fox	3cbaec818d	Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug ... Fix MS19743: Fix case where user couldn't update certain items	2018-11-07 14:57:35 -08:00
Wayne Chen	dd1cf1be6c	adding back deprecated UI toolkit	2018-11-07 14:25:39 -08:00
Wayne Chen	a05d70cd8b	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-07 14:21:13 -08:00
Wayne Chen	b837cbd8a0	removing debug statement	2018-11-07 14:05:50 -08:00
Wayne Chen	8e075c2a7c	fixing login qml/using HMD position for overlay	2018-11-07 14:05:06 -08:00
Jeff Clinton	e507e91bfd	Merge pull request #14227 from ElderOrb/FB19396 ... FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…	2018-11-07 13:36:41 -08:00
Wayne Chen	edf16b15e8	missed a file	2018-11-07 12:04:28 -08:00
Wayne Chen	51586625e7	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-07 12:02:38 -08:00
Wayne Chen	fc32ba9ce3	fixing create app window on desktop	2018-11-07 09:26:34 -08:00
Wayne Chen	1ded4b6fb8	hiding previous username/hiding dev menu	2018-11-06 16:45:45 -08:00
Zach Fox	8776028259	Prepend "root" to "currentUpdatesPage"	2018-11-06 16:10:49 -08:00
Zach Fox	f22bbff505	Fix MS19743: Fix case where user couldn't update certain items	2018-11-06 15:47:47 -08:00
Wayne Chen	7c2dd973b7	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-06 15:34:34 -08:00
Wayne Chen	8797c40d94	cleanup unused functions	2018-11-06 15:04:51 -08:00
Wayne Chen	0fcbc11419	forgot file	2018-11-06 14:53:38 -08:00
Wayne Chen	c8071e81b1	sending user to saved address if logged in	2018-11-06 13:32:31 -08:00
Wayne Chen	9beedf9292	changing login overlay size + add keyboard	2018-11-06 12:56:50 -08:00
Zach Fox	378bf911d4	Fix another build error	2018-11-06 12:48:17 -08:00
Zach Fox	c33f9b6ea3	Fix build error	2018-11-06 11:26:09 -08:00