75270 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Wayne Chen	4cf90050b5	reverting old code	2019-01-23 14:39:58 -08:00
Wayne Chen	049282e2b3	fixing text alignment issues, adding some oculus user log	2019-01-23 14:38:06 -08:00
Wayne Chen	e6426cb680	fixing bug with cancel button	2019-01-23 10:26:51 -08:00
Wayne Chen	1ae2ddd926	dont setup another oculus session	2019-01-22 11:08:15 -08:00
Wayne Chen	4d61a65bbf	wrapping request nonce and userID with conditional	2019-01-21 09:48:12 -08:00
Wayne Chen	238f020392	remove trailing whitespace	2019-01-17 14:20:47 -08:00
Wayne Chen	2859784e17	Merge branch 'master' into oculusLoginFeature	2019-01-17 14:20:00 -08:00
John Conklin II	d64858b1c7	Merge pull request #14724 from sethalves/fix-excessive-cauterization-update ... case 15942: fix bug that caused avatar cauterization code to run constantly	2019-01-17 12:59:57 -08:00
John Conklin II	19e4a7389b	Merge pull request #14676 from wayne-chen/updateLoginUserLogging ... case 20654: Updating user activity logging for login experience	2019-01-17 12:59:12 -08:00
Wayne Chen	123f2d71e5	dismissing login dialog on popup if bad linking	2019-01-17 11:38:42 -08:00
John Conklin II	45ec44423b	Merge pull request #14694 from danteruiz/delete-only-domain-entities ... case 20595: case 20563: Do not delete local entities when switching domains.	2019-01-17 11:25:58 -08:00
Adam Smith	f955313afc	Merge pull request #14687 from SamGondelman/cancel ... Case 20580: Trying to fix wearables and avatar app	2019-01-17 11:25:30 -08:00
Wayne Chen	79ffc311e1	code cleanup + adding password error	2019-01-17 10:19:40 -08:00
Wayne Chen	ef63213d28	fixing linking account problems on oculus/steam, changing callback	2019-01-16 21:07:54 -08:00
Wayne Chen	bb61334c0d	Merge branch 'master' into oculusLoginFeature	2019-01-16 17:24:22 -08:00
Wayne Chen	673c4ad434	fixing error message spacing	2019-01-16 17:22:00 -08:00
Wayne Chen	3ad0f60dd5	fixing error message spacing	2019-01-16 17:20:01 -08:00
Wayne Chen	116a15afe8	removing oculus userID to server - no need	2019-01-16 17:15:40 -08:00
Wayne Chen	6d10d9d043	Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature	2019-01-16 17:08:24 -08:00
Wayne Chen	8e916ea41b	linking oculus acct creation to spinner	2019-01-16 17:05:59 -08:00
Wayne Chen	f4d4220e58	adding final create failure message handling, ui improvements	2019-01-16 17:05:56 -08:00
Wayne Chen	c54bce3953	fixing desktop login page crash	2019-01-16 17:05:55 -08:00
Wayne Chen	d38a657c54	filling username with oculus username, checking create error	2019-01-16 17:05:54 -08:00
Wayne Chen	671f15b63c	removing isLogIn	2019-01-16 17:05:53 -08:00
Wayne Chen	3b3b86888e	adding blur to login bg	2019-01-16 17:05:53 -08:00
Wayne Chen	fbc2dc5103	adding changes to forms	2019-01-16 17:05:52 -08:00
Wayne Chen	5c54930910	adding tablet close upon login	2019-01-16 17:05:52 -08:00
Wayne Chen	2d16e71e74	adding sending oculus ID including username	2019-01-16 17:05:52 -08:00
Wayne Chen	7e674ba3c4	better check for if oculus is running	2019-01-16 17:05:51 -08:00
Wayne Chen	ca0916886a	adding more qml for oculus login	2019-01-16 17:05:51 -08:00
Wayne Chen	39a68a88f0	fixing typos in callback implementation	2019-01-16 17:05:51 -08:00
Wayne Chen	ed39b43d3b	changing request to have a callback function passed	2019-01-16 17:05:51 -08:00
Wayne Chen	6bc1164d58	more wip on oculus login	2019-01-16 17:05:50 -08:00
Wayne Chen	4320f4cbe4	migrating platform plugin	2019-01-16 17:05:50 -08:00
Wayne Chen	a905310a58	more staging	2019-01-16 17:05:49 -08:00
Wayne Chen	704f005604	changing user id variable type	2019-01-16 17:05:49 -08:00
Wayne Chen	a24ebe2718	oculus functions live in the display plugin; display plugins update	2019-01-16 17:05:49 -08:00
Wayne Chen	970798705c	improving flow from Oculus API to login dialog wip	2019-01-16 17:05:48 -08:00
Wayne Chen	1af57bdba6	staging	2019-01-16 17:05:48 -08:00
Wayne Chen	ebb9cd7de6	adding new plugin	2019-01-16 17:05:48 -08:00
Wayne Chen	db06533018	adding more staging	2019-01-16 17:05:48 -08:00
Wayne Chen	c22ad2b15a	staging some oculus helper code	2019-01-16 17:05:47 -08:00
Wayne Chen	1fc51445d0	adding files for staging login	2019-01-16 17:05:47 -08:00
Wayne Chen	f983d16cc1	linking oculus acct creation to spinner	2019-01-16 17:03:44 -08:00
Wayne Chen	8c2dee20a0	adding final create failure message handling, ui improvements	2019-01-16 15:23:56 -08:00
SamGondelman	9727c8fd38	CR	2019-01-16 14:14:01 -08:00
Seth Alves	1104e56bc3	fix bug that caused tablet to be constantly hooked and unhooked from avatar at SpatiallyNestable level	2019-01-16 13:23:27 -08:00
Stephen Birarda	0a9ac72e7b	Merge pull request #14720 from birarda/add-comments-to-atv ... pepper AssociatedTraitValues with some needed comments	2019-01-16 10:59:08 -08:00
Wayne Chen	aa6b819149	fixing desktop login page crash	2019-01-16 10:50:29 -08:00
birarda	a63c2b3e29	pepper AssociatedTraitValues with some needed comments	2019-01-16 10:15:04 -08:00