531 commits

Author	SHA1	Message	Date
Olivier Prat	4edfe6c9ab	Trying to keep track of a better previous correction	2018-02-20 14:48:21 +01:00
Olivier Prat	9cfe53be3e	Merged from orgin taa	2018-02-19 17:50:10 +01:00
Olivier Prat	f5a2557a2e	Merged with master	2018-02-19 17:28:39 +01:00
Brad Davis	8853bd6388	Fix spectator camera crash	2018-02-14 11:11:28 -08:00
Brad Davis	1f2760c4b7	Merge remote-tracking branch 'gcalero/android_ui_bottombar3' into android	2018-02-12 12:39:40 -08:00
Bradley Austin Davis	fd007e845d	Squashed scribe changes	2018-02-07 10:29:29 -08:00
Bradley Austin Davis	0455fb37b6	Merge remote-tracking branch 'upstream/master' into fix/shader_length	2018-02-06 15:55:01 -08:00
Andrew Meadows	96c97547f9	Merge pull request #12205 from jherico/no_widgets ... Remove some unneeded Qt dependencies	2018-02-05 15:32:54 -08:00
Olivier Prat	92279b5939	Merged with master	2018-02-05 18:24:05 +01:00
samcake	f044cf76d6	add the count of compilations of shaders to avoid recompiling them if ot needed	2018-01-30 18:31:30 -08:00
samcake	f078ff611a	Refining the declaraion signatures and adding the binary capture	2018-01-30 15:10:52 -08:00
Gabriel Calero	a5a36b4b8f	Don't show help on android. Hide menu bar	2018-01-30 14:48:37 -03:00
Olivier Prat	5e6300ce46	Merged with master	2018-01-30 09:52:30 +01:00
Brad Davis	0781d8eaf0	Remove some unneeded Qt dependencies	2018-01-28 22:18:24 -08:00
Olivier Prat	1aa41918d0	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-01-26 15:01:30 +01:00
Brad Davis	361b767586	Merge branch 'fix/render_config' into android	2018-01-25 14:50:41 -08:00
ZappoMan	cb01bd14b9	Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription	2018-01-25 10:39:43 -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
Olivier Prat	5af4337b0e	Merged with master	2018-01-25 10:11:53 +01:00
Olivier Prat	f3aac2a7b5	Merged with samcake/black	2018-01-25 09:27:48 +01:00
Olivier Prat	95882e0cde	Merged with master	2018-01-24 10:51:54 +01:00
ZappoMan	027a1e69f4	some settings cleanup, adding description to Send Data	2018-01-20 00:08:06 -08:00
Brad Davis	3e7872637d	Merge branch 'android' into android_new	2018-01-19 14:40:01 -08:00
Brad Davis	d53b8b38ac	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
Alexander Ivash	a74b093b60	FB11109 Preview disabled image swap (Commerce only)	2018-01-18 23:26:43 +03:00
Gabriel Calero	970ca5e08f	Add virtual pad for android	2018-01-17 15:00:43 -03:00
Olivier Prat	efa6a8c0b5	Merged with master	2018-01-17 15:49:46 +01:00
Olivier Prat	49549ced17	Fixed compilation with new shader system	2018-01-17 10:52:58 +01:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Olivier Prat	3911ce59cc	Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code	2018-01-16 19:02:12 +01:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Brad Davis	db30e9c45f	Fixing PR builds	2018-01-15 09:47:31 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Brad Davis	ab7aa52a10	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
Olivier Prat	814de4ab81	Scribe now outputs shaders as cpp files.	2018-01-12 11:59:19 +01:00
Sam Gateau	9bc02ec564	simple changes to try debugging the stereo rendering	2018-01-10 21:01:26 -08:00
Brad Davis	105dffebaf	Fixing UI	2018-01-09 18:36:42 -08:00
Gabriel Calero	6050737e7c	Resolving comments in PR	2018-01-08 17:36:08 -03:00
Sam Gateau	a9f1e4102b	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2018-01-07 22:19:38 -08: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
Gabriel Calero	76b38bebad	Make Interface run in Android	2018-01-03 16:36:11 -03:00
Brad Davis	829e521320	Merge remote-tracking branch 'upstream/master' into HEAD	2018-01-02 11:37:33 -08:00
samcake	403e77b023	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-12-21 09:17:23 -08:00
Andrew Meadows	5c84c5f845	measure average time of 'present'	2017-12-20 17:41:08 -08:00
samcake	d02c2ac8f5	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-12-19 13:39:27 -08:00
samcake	df3b4421f4	Merging	2017-12-18 12:20:56 -08:00
Olivier Prat	0fc496d44c	Fixed merge conflicts with master	2017-12-18 15:23:11 +01:00
Brad Davis	c6bc6f6ef2	Merge remote-tracking branch 'upstream/master' into android_nov	2017-12-16 16:20:16 -08:00
SamGondelman	3477aa57a8	remove extra recycle	2017-12-15 16:36:07 -08:00
Brad Davis	6cff86b0f3	Fix polyvox archive, correct build errors, add additional libraries	2017-12-12 18:29:36 -08:00
Olivier Prat	92e1fe8e5c	Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug	2017-12-08 18:02:27 +01:00
samcake	e0110ff7e6	Merging with upstream	2017-12-07 09:23:38 -08:00
Olivier Prat	1b8821c649	Added option to disable automatic head rotation in HMD simulator	2017-12-07 10:54:48 +01:00
Olivier Prat	1ce1aca79f	Merged with samcake's 'black' branch	2017-12-07 08:59:38 +01:00
SamGondelman	d4a4c8902a	fix reticle depth at different scales and x button click on mouse press	2017-11-27 17:46:19 -08:00
Seth Alves	66e38af1b3	Merge pull request #11671 from ElderOrb/case8553 ... 8380 Mouse Disappears when switching between HMD and Desktop Mode while in Create	2017-10-25 10:31:31 -07:00
beholder	39b2c0f83a	fix for FB 8553 & FB 8380	2017-10-25 01:59:56 +03:00
SamGondelman	046e5ca716	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00
Sam Gateau	ec934335dc	CLeaning up the pr regarding the scripts with my branch blue	2017-10-15 22:34:58 -07:00
SamGondelman	3acbd7820b	build error	2017-10-09 11:48:54 -07:00
SamGondelman	e95ecc3f27	fix missing sensorToWorld matrix	2017-10-06 15:37:23 -07:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
SamGondelman	601b30f062	fix flash when switching display modes	2017-10-05 15:31:45 -07:00
samcake	7f86a4ee28	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-10-04 13:35:31 -07:00
SamGondelman	477dfdff1e	wip hud layering and fix crashes	2017-10-04 11:45:21 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
samcake	6639287418	Merging with master	2017-10-02 17:03:09 -07:00
Andrew Meadows	8d2153d2f3	cleanup debug stats, use more correct names	2017-10-02 13:08:17 -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
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
samcake	3adeb80858	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-09-20 10:18:49 -07:00
Anthony J. Thibault	809e986738	Fixes for lasers on 2d HUD	2017-09-20 09:21:14 -07:00
Bradley Austin Davis	bc4193f276	Merge branch 'master' into android_new	2017-09-19 14:27:31 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Anthony J. Thibault	7e2b2960ed	Fix for lighting as IPD scale changes. ... (cherry picked from commit a260aaaae8)	2017-09-18 12:15:32 -07:00
samcake	dbeb4e9b27	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-09-11 15:25:58 -07:00
Anthony J. Thibault	b81f85e1ae	Merge branch 'master' into feature/ant-man	2017-09-11 15:14:03 -07:00
Anthony J. Thibault	2f850826f2	Allow override of near/far clip planes in Oculus and OpenVR plugins	2017-09-06 11:02:44 -07:00
samcake	e70f261de4	Adding the full code path, starting debugging the problems in hmd,	2017-09-05 18:09:46 -07:00
Anthony J. Thibault	f0912987a3	Fix ray picks against HUD sphere at different sensor scale factors	2017-09-05 10:03:19 -07:00
Bradley Austin Davis	d0fdf175fd	Fix access to menu on background thread	2017-08-31 16:30:17 -07:00
humbletim	9348048387	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-08-24 16:23:47 -04: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
humbletim	3bcbec87e0	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-30 16:15:34 -04:00
SamGondelman	e3288a9004	fix flicker, scissor warning, and handControllerGrab sphere size	2017-07-27 11:17:30 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
SamGondelman	6e78238f58	warning	2017-07-25 15:48:41 -07:00
SamGondelman	658acd91f2	experimenting with drawHUDLayer depth testing	2017-07-25 14:17:39 -07:00
SamGondelman	0117950546	can edit drawHUDLayer property	2017-07-25 12:57:52 -07:00
SamGondelman	3149c3e16c	warnings	2017-07-25 10:16:50 -07:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
Andrew Meadows	8dafc30bf9	fix debug build: stub pure virtual function	2017-07-18 15:57:00 -07:00
humbletim	f9e0e616f7	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-18 17:34:39 -04:00
David Kelly	88a449c1af	Fixes hmd preview when resizing	2017-07-12 16:49:26 -07:00
David Kelly	e1df3feb5c	fix hmd preview	2017-07-11 10:54:35 -07:00
David Kelly	f18e64ed1a	first pass at blitting correct hmd preview (in mono)	2017-07-07 15:53:29 -07:00
David Kelly	b41c470064	first cut, still stereo	2017-07-06 15:59:24 -07:00
David Kelly	2a3b4b3bfb	minor cleanup, and adjusted includes per austin's suggestion	2017-07-03 15:54:54 -07:00
David Kelly	373bd0cc8a	aspect ratio preserved upon blitting, minor qml tweak, warnings fixed	2017-07-03 14:23:23 -07:00