214 commits

Author	SHA1	Message	Date
Wayne Chen	6f49914167	Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature	2019-01-25 12:19:20 -08:00
Wayne Chen	635c7533b9	more code review feedback	2019-01-25 12:15:38 -08:00
Wayne Chen	c136f24181	Merge branch 'master' into oculusLoginFeature	2019-01-25 11:44:14 -08:00
Wayne Chen	0928b1bff1	code review feedback	2019-01-25 11:36:58 -08:00
Wayne Chen	9da7465698	readding render session, adding newlines for oculus failure	2019-01-24 15:33:50 -08:00
Wayne Chen	512805d48f	removing leftover variable	2019-01-23 14:45:41 -08:00
Wayne Chen	4cf90050b5	reverting old code	2019-01-23 14:39:58 -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
SamGondelman	59fafa1f5c	only do entitlements check once	2019-01-17 11:47:12 -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	d38a657c54	filling username with oculus username, checking create error	2019-01-16 17:05:54 -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	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
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
Seth Alves	6a88941166	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:07:06 -08:00
David Rowe	84c6bb4797	Introduce optional timestamp into internal Controller axis values ... This can be used to determine if consecutive identifical values should be output.	2018-12-31 12:15:51 +13:00
Brad Hefta-Gaub	4bafcd2cfa	Merge pull request #14271 from SamGondelman/oculus ... Case 19475: Fix various Oculus Store test failures	2018-11-13 11:06:39 -08:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00
SamGondelman	dd96881724	don't submit frames while oculus says it's not visible	2018-10-30 12:15:46 -07:00
SamGondelman	83fba2ee41	shutdown when oculus display lost	2018-10-30 11:23:36 -07:00
SamGondelman	799db33b34	reenable entitlements check	2018-10-29 17:22:45 -07:00
John Conklin II	e21e7d30d7	Merge pull request #14126 from amantley/squattyPottyFix ... Sit State for the seated user in HMD: Squatty Potty Fix	2018-10-23 15:20:49 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
amantley	c4187f0d60	Merge remote-tracking branch 'upstream/master' into squattyPottyFix	2018-10-08 17:07:55 -07:00
amantley	90feeffa9d	cleaning up. putting squat fix in vertical recenter	2018-10-01 14:21:00 -07:00
amantley	fa9abf0fff	added the floor at 0.0 in sensor space for oculus. to do: vive	2018-09-26 18:08:00 -07:00
amantley	ad6bbc7ff6	latest squatty changes	2018-09-25 11:22:44 -07:00
David Rowe	11b85e30db	Merge branch 'master' into M17217-a	2018-08-04 09:44:39 +12:00
David Rowe	41c4ecd465	Add HMD play area to API; Oculus and Vive	2018-08-01 15:20:51 +12:00
David Rowe	a3e677e64f	Code review	2018-07-20 08:32:21 +12:00
David Rowe	5e624246a8	Fix HMD.mountedChanged() API signal	2018-07-19 13:00:57 +12:00
Brad Davis	197fb469eb	Fix touch controller button handling when Oculus remote is paired	2018-06-15 10:16:32 -07:00
Bradley Austin Davis	e38059797d	Update Oculus integration	2018-06-06 17:27:30 -07:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
Brad Davis	72526781d9	Additional work on splash screen	2018-05-04 16:40:05 -07:00
David Rowe	748052614f	Doc review	2018-04-21 12:45:00 +12:00
David Rowe	9f83c606e9	Controller API JSDoc	2018-04-17 11:46:40 +12:00
SamGondelman	21381a7295	fix building with gles on desktop (still crashes)	2018-03-14 11:44:00 -07:00