788 commits

Author	SHA1	Message	Date
Sam Gondelman	660818aded	Revert "Case 20060: Grab correct stencil masks from display plugins"	2019-04-05 11:59:46 -07:00
Sam Gondelman	85bf1da0a1	Merge pull request #15266 from SamGondelman/stencil ... Case 20060: Grab correct stencil masks from display plugins	2019-04-04 13:36:25 -07:00
Brad Davis	44fc0d21db	Revert "Remove _compositeFramebuffer from display plugins" ... This reverts commit cb311408c6.	2019-04-03 13:43:39 -07:00
SamGondelman	8d2495ef7a	vive coordinates in clip space	2019-03-29 16:24:04 -07:00
SamGondelman	4ed7c09016	grab correct stencil masks from display plugins	2019-03-26 13:42:18 -07:00
Brad Davis	cb311408c6	Remove _compositeFramebuffer from display plugins	2019-03-12 12:20:20 -07:00
danteruiz	1941e53cc3	track oculus controllers while in oculus home	2019-03-05 15:32:18 -08:00
SamGondelman	13ece79476	merge with master	2019-02-13 16:30:22 -08:00
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -08:00
Brad Davis	d3301803d3	Support custom display / input plugin lists and small tweaks	2019-02-07 15:15:26 -08:00
Jeff Clinton	536a76a791	Merge pull request #14787 from wayne-chen/oculusLoginFeature ... MS20874: Only initialize plugin if started through Oculus Store	2019-01-29 10:57:03 -08:00
Wayne Chen	0cbaea4e27	callback return upon request if not running	2019-01-28 14:46:50 -08:00
Wayne Chen	28ab4096d0	optimizing ctor/dtor	2019-01-28 14:44:00 -08:00
Wayne Chen	e4c3011a0b	only init platform if oculus store is running	2019-01-28 14:37:18 -08:00
Wayne Chen	0f1aebea82	adding init/shutdown for plugin init	2019-01-28 14:35:41 -08:00
Wayne Chen	c06f2f337e	adding code for if oculus is running	2019-01-28 14:20:03 -08:00
Wayne Chen	09770920a8	only initialize plugin if oculus store starting	2019-01-28 11:12:12 -08:00
Shannon Romano	f084021fdf	Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type ... Added HMD Avatar Alignment Type	2019-01-25 17:32:41 -08:00
Wayne Chen	1c6521486e	fixing compile errors	2019-01-25 13:56:56 -08:00
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
Anthony Thibault	a7a71e4286	Merge branch 'master' into feature/hmd-avatar-alignment-type	2019-01-23 15:52:20 -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	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
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