28154 commits

Author	SHA1	Message	Date
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	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	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	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	db06533018	adding more staging	2019-01-16 17:05:48 -08:00
Wayne Chen	1fc51445d0	adding files for staging login	2019-01-16 17:05:47 -08:00
SamGondelman	9727c8fd38	CR	2019-01-16 14:14:01 -08:00
Seth Alves	fd09180776	Merge pull request #14645 from ctrlaltdavid/M19774-d ... Make mouselook directly proportional to right-click mouse	2019-01-16 09:09:38 -08:00
Wayne Chen	3b913db609	fixing typo	2019-01-15 14:21:37 -08:00
Shannon Romano	eed53f60ba	Merge pull request #14556 from vladest/avatar_app_warnings ... Fix Avatar apps warnings.	2019-01-15 11:03:43 -08:00
Shannon Romano	0089b91eea	Merge pull request #14609 from sethalves/fb-20280 ... fix a couple shutdown crashes and a class of asan warning	2019-01-15 10:59:08 -08:00
Antonina Savinova	6499c4f0ea	Merge pull request #14700 from SimonWalton-HiFi/update-icons ... New icons for interface and server-console	2019-01-14 16:04:55 -08:00
SamGondelman	68e15c6c07	fixes from 78	2019-01-14 13:36:21 -08:00
Dante Ruiz	e7d3844620	making pre review requests	2019-01-14 11:14:57 -08:00
Dante Ruiz	8252481ce7	Delete domain entities only	2019-01-11 16:00:10 -08:00
Seth Alves	6589db628a	fix a couple shutdown crashes and a class of asan warning	2019-01-11 15:53:49 -08:00
Seth Alves	6cd5770505	Merge pull request #14690 from sethalves/plugin-versioning ... Plugin versioning	2019-01-11 15:20:05 -08:00
Simon Walton	d271bcd6f4	New icons for interface and server-console	2019-01-11 14:50:13 -08:00
Seth Alves	0603431ac8	initialize _logger with null pointer	2019-01-10 15:16:33 -08:00
Seth Alves	c8db50cb20	start up logger before loading plugins. ... put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:06:22 -08:00
Andrew Meadows	16da42723e	use glm::abs() instead of absf()	2019-01-10 10:15:39 -08:00
Andrew Meadows	f7b7db5ab4	fix warning on OSX, use correct format for float literals	2019-01-10 09:14:37 -08:00
Andrew Meadows	9ea6968e35	fix bug where attached AvatarEntities do not update in timely fashion	2019-01-09 17:40:18 -08:00