193 commits

Author	SHA1	Message	Date
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
Brad Hefta-Gaub	7a3835eb33	Merge pull request #11945 from jherico/android_nov ... Updating android toolchain for QML	2018-01-05 13:34:03 -08:00
Andrew Meadows	5c84c5f845	measure average time of 'present'	2017-12-20 17:41:08 -08:00
Bradley Austin Davis	9df9cf7a47	Adding more libs, ifdefs for android incompatible code	2017-12-11 13:18:23 -08:00
SamGondelman	046e5ca716	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
Zach Fox	ecd1f13197	Allow users to take a snapshot from the secondary camera	2017-08-16 15:34:06 -07:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
David Kelly	5f015ec77f	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:25 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
David Kelly	b73102d063	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-28 08:57:04 -07:00
Bradley Austin Davis	960017ddd7	Fix static plugin initialization on Linux	2017-06-24 22:22:47 -07:00
Brad Davis	fe7d4b1d23	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07:00
Dante Ruiz	f369303bfe	removed warning	2017-06-21 18:12:31 +01:00
Dante Ruiz	b7286db523	fixed merge conflict	2017-06-21 01:10:54 +01:00
Dante Ruiz	2c3db0fb91	finished calibration-ui	2017-06-21 01:07:12 +01:00
David Kelly	06b59fe13e	still broken, but added initial cut of GLsync stuff	2017-06-20 15:02:05 -07:00
David Kelly	b4c75c3f87	working, except tablet issue	2017-06-19 14:41:42 -07:00
David Kelly	3d922f5db6	works, sorta, but blinks like crazy, cursor gets f-ed up...	2017-06-15 14:17:43 -07:00
Dante Ruiz	bbe675ab72	making final changes	2017-06-12 22:01:41 +01:00
Dante Ruiz	1b13cd6d45	saving work	2017-06-12 17:31:02 +01:00
Dante Ruiz	067fc9bb98	fixed merge conflict	2017-06-12 16:45:34 +01:00
druiz17	f6ef1443c8	some more clean up	2017-06-11 12:08:45 -07:00
Dante Ruiz	ef1be931dc	preparing to clean code	2017-06-10 00:50:32 +01:00
Zach Fox	a4f5d327a2	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-09 11:38:35 -07:00
Dante Ruiz	73e628461e	confiration update status	2017-06-09 00:44:05 +01:00
Dante Ruiz	c97ea84cbf	saving work	2017-06-08 17:44:55 +01:00
Dante Ruiz	11409aae9b	connect the ui with the input plugins	2017-06-08 00:34:52 +01:00
howard-stearns	51982b1294	display textures in plugins	2017-06-07 14:39:18 -07:00
Seth Alves	b1c7c251ac	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-07 10:09:46 -07:00