226 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
Simon Walton	cc6caa61a7	Change common warning to debug	2019-01-23 21:02:52 -08:00
Simon Walton	74748b15fd	Add a filter functor to the plugin manager and use it in AudioMixer	2019-01-23 17:28:18 -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	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	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
Seth Alves	d31cdd3779	review	2019-01-10 15:35:40 -08:00
Seth Alves	e941dbb4a9	review	2019-01-10 15:33:34 -08:00
Seth Alves	fd8702d5a6	use const references when querying plugin metadata	2019-01-10 15:20:53 -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
r3tk0n	34224c4f16	Fix XBox One controller detection.	2018-11-15 14:08:21 -08:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
John Conklin II	4805d3564a	Merge pull request #14075 from ctrlaltdavid/M18586 ... Teleport with play area	2018-10-03 11:02:33 -07:00
John Conklin II	8bd8d05409	Merge pull request #14118 from luiscuenca/handTouchLMFix ... Disable Hand Touch when Leap Motion is running	2018-10-03 09:03:43 -07:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
luiscuenca	5ccbc5c029	Disable Hand Touch when Leap Motion is running	2018-10-01 10:47:06 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
David Rowe	41c4ecd465	Add HMD play area to API; Oculus and Vive	2018-08-01 15:20:51 +12:00
Clement	ba53e7add8	Fix ACs startup crash	2018-06-29 16:29:32 -07:00
Seth Alves	dcebbada28	fix various crashes-upon-exits	2018-06-26 10:08:44 -07:00
Sam Gateau	07f1ab8c98	Merge pull request #13194 from SamGondelman/resolution ... Fix Scale Resolution option	2018-05-18 15:23:01 -07:00
SamGondelman	c57c15f22c	fix resolution option	2018-05-17 16:58:35 -07:00
David Rowe	fb1f7fea90	Steam API JSDoc stubs	2018-05-13 10:32:46 +12:00
Dante Ruiz	5af1ea54d3	Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data	2018-04-16 10:10:55 -07:00
Ken Cooke	f5f4e2a780	Merge pull request #12635 from ctrlaltdavid/21776 ... Fix Window hasFocus(), setFocus(), and raiseMainWindow()	2018-03-21 09:27:51 -07:00
David Rowe	c1e256a4f3	Remove unused methods	2018-03-14 13:58:00 +13:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
Gabriel Calero	25f207a6db	Add hifi audio codec in Android build	2018-03-12 18:29:57 -03:00
Dante Ruiz	95e14446dd	update qml file to show the current OpenVr headset	2018-03-01 09:03:52 -08:00
Dante Ruiz	1bc8484a4b	determine OpenVr headset namme	2018-02-28 11:50:52 -08:00
Olivier Prat	9cfe53be3e	Merged from orgin taa	2018-02-19 17:50:10 +01:00
John Conklin II	d084e58f48	Merge pull request #12328 from Atlante45/fix/misc-bugs ... Misc bug fixes	2018-02-12 14:31:38 -08:00
Atlante45	8ebb3e52d8	Misc bug fixes	2018-02-02 13:10:49 -08:00
Brad Davis	0781d8eaf0	Remove some unneeded Qt dependencies	2018-01-28 22:18:24 -08:00
Olivier Prat	b7b478f640	Using proper inverse projection matrix in velocity buffer computation to reproject to world pos	2018-01-25 17:33:18 +01:00