75655 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
NissimHadar	7d5bb6eaf8	Added AppData folder copy.	2019-01-16 14:46:52 -08:00
SamGondelman	9727c8fd38	CR	2019-01-16 14:14:01 -08:00
SamGondelman	3835796419	deprecate the new property so that people hopefully don't use it	2019-01-16 14:01:05 -08:00
SamGondelman	611998f799	add pulse group properties to shapes, particles, text, web, image, and grid	2019-01-16 13:34:10 -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
Simon Walton	024cb70fce	Change member-initializer order to fix warnings	2019-01-16 12:58:13 -08:00
Ken Cooke	7cade1e354	Clamp attenuation zone coefficients to a more reasonable limit of -60dB per doubling of distance	2019-01-16 12:16:20 -08:00
Simon Walton	b53fcb2c3d	Pass udt::Socket pointer in initializer-list for udt::Connection	2019-01-16 12:08:02 -08:00
Brad Davis	0bd6f9e26b	Fix JNI signature	2019-01-16 12:03:56 -08:00
Ken Cooke	328809f008	More robust approximation of distance attenuation at extreme settings. ... Fixes artifacts that occur when attenuation zone coef = 1.0 and distance > 32m.	2019-01-16 11:10:38 -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
NissimHadar	b0fc794426	Trying to get Jenkins to build correctly.	2019-01-16 10:42:49 -08:00
birarda	a63c2b3e29	pepper AssociatedTraitValues with some needed comments	2019-01-16 10:15:04 -08:00
luiscuenca	67cc5bd7f2	Fix warnings and wrong shapes position for myAvatar	2019-01-16 10:52:34 -07:00
Wayne Chen	7868d013d0	filling username with oculus username, checking create error	2019-01-16 09:43:48 -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
Anthony Thibault	104084d811	Avatar Mixer Protocol: Normalize translation before compression	2019-01-15 18:56:09 -08:00
John Conklin II	7c06c18fe4	Merge pull request #14699 from ingerjm0/api-directory ... JSDoc > Grav directory change	2019-01-15 18:15:11 -08:00