665 commits

Author	SHA1	Message	Date
Wayne Chen	bb61334c0d	Merge branch 'master' into oculusLoginFeature	2019-01-16 17:24:22 -08:00
Wayne Chen	a24ebe2718	oculus functions live in the display plugin; display plugins update	2019-01-16 17:05:49 -08:00
vladest	a99ba052b8	Remove duplicate signals	2018-12-18 20:30:53 +01:00
vladest	c05e3e7d09	Fix Avatar apps warnings. Added notification for HMD.active property	2018-12-08 19:12:02 +01:00
John Conklin II	0a80c16686	Merge pull request #14419 from SamGondelman/splash ... Case 19740: Improve startup times by pre-compiling shaders with splash screen	2018-12-07 16:10:52 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
SamGondelman	287878ff98	merge with master	2018-12-05 10:35:08 -08:00
SamGondelman	1f354f813c	rework shader pre-compilation	2018-11-27 14:38:02 -08:00
SamGondelman	c99a8101f7	trying to fix build errors	2018-11-21 01:56:46 -05:00
SamGondelman	58408497d1	hopefully fix hud crash	2018-11-19 21:27:23 -05:00
SamGondelman	0fccb4c73c	move to batch, try to use static	2018-11-17 01:45:16 -08:00
SamGondelman	cbe5814c64	shader compilation prototype	2018-11-16 15:18:56 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
Brad Hefta-Gaub	153b8920be	Merge pull request #14348 from sabrina-shanman/hfm_library ... (case 19302) Create the HFM library and namespace	2018-11-13 12:03:53 -08: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
sabrina-shanman	2801f324b7	Switch references to HFM to the HFM lib and remove HFM classes in FBX	2018-11-05 12:47:34 -08:00
SamGondelman	dd96881724	don't submit frames while oculus says it's not visible	2018-10-30 12:15:46 -07:00
SamGondelman	dc9405775f	more branching removal	2018-10-29 16:42:46 -07:00
Brad Davis	a3a952265a	Fix android crash	2018-10-26 11:23:30 -07:00
Bradley Austin Davis	28b45ce1d9	Resolve compositing glitches	2018-10-26 11:23:29 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
Sam Gondelman	5b6e7b2566	Merge branch 'master' into scriptvec3	2018-10-02 08:58:04 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
SamGondelman	c522d1bc93	merge with master	2018-09-14 00:57:13 -07:00
Bradley Austin Davis	fade3a8de0	Fixing shader implicit type conversions	2018-09-06 09:08:36 -07:00
Cristian Luis Duarte	8839a3b027	Android - Virtual Pad - make jump button references generic	2018-09-03 20:07:30 -03:00
Cristian Luis Duarte	1891b0fd81	Android - Virtual Pad - Refactor in Basic2D..Plugin code for multiple buttons	2018-09-03 19:19:55 -03:00
Cristian Luis Duarte	4f3a730d6d	Android - Handshake implementation - two important notes - IK was disabled on android and this enables it (needs a well thought review) - TouchscreenVirtualPadDevice buttons code does not scale well, it needs a refactor	2018-08-29 18:53:14 -03:00
Sam Gondelman	6730635931	Merge branch 'master' into scriptvec3	2018-08-27 10:43:52 -07:00
Sam Gondelman	f0986a7f5a	Merge branch 'master' into scriptvec3	2018-08-20 10:56:45 -07:00
Brad Davis	f03370c826	Migrating to scribe program descriptors	2018-08-09 17:58:34 -07:00
Brad Davis	a1cd39f4c2	Fix some explicit bindings that should be binding, not location	2018-08-03 14:58:12 -07:00
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Brad Davis	04e84f1d23	Moving to cmake time shader compiling	2018-08-03 14:58:11 -07:00
Sam Gondelman	7772e8adf2	Merge branch 'master' into scriptvec3	2018-08-03 14:57:49 -07:00
John Conklin II	fcf32dbc6b	Merge pull request #13642 from ctrlaltdavid/M13352 ... Fix HMD.mountedChanged() API signal	2018-08-01 11:28:11 -07:00
SamGondelman	2ca217eb4a	merge with master	2018-07-30 17:43:15 -07:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07: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
SamGondelman	845ddda695	parabola-overlay and -avatar intersection, handle case where acceleration == 0	2018-07-17 12:41:03 -07:00
SamGondelman	9929529f30	vec3 conversion	2018-07-11 14:18:22 -07:00
Olivier Prat	9f4fd47b85	Not using render resolution scale in application and display plugin	2018-07-11 10:11:49 +02:00
Anthony J. Thibault	84601446bf	Add main thread id & machine fingerprint to crashpad annotations	2018-06-14 12:57:30 -07:00
Gabriel	649ffbe259	Don't hide jump button while moving	2018-06-12 16:15:54 -03:00
Brad Davis	7e16325805	Unit testing cached and uncached shader loading	2018-05-24 12:42:34 -07:00
SamGondelman	484bda0f3c	check for null texture	2018-05-18 15:34:07 -07:00
SamGondelman	c57c15f22c	fix resolution option	2018-05-17 16:58:35 -07:00
John Conklin II	aca261af3e	Merge pull request #12939 from Cristo86/android_places_goto ... Android Search & Go To	2018-05-15 16:43:38 -07:00
Gabriel Calero	306b8cc68a	Set HomeActivity transparent to avoid texture corruption (black and white)	2018-05-15 15:14:17 -03:00
Cristian Luis Duarte	f97155b6cd	Revert virtualpad code. It works on Pixel XL	2018-05-11 20:34:43 -03:00
Gabriel Calero	0f8c666647	Trying to fix virtualpad textures corruption	2018-05-11 19:50:00 -03:00
Gabriel Calero	1cc0a52597	Fix the joystick texture corruption	2018-05-09 11:20:47 -03:00
Brad Davis	72526781d9	Additional work on splash screen	2018-05-04 16:40:05 -07:00
MiladNazeri	8e214d8ee8	Merge pull request #13049 from ctrlaltdavid/21856-d ... List which contexts each namespace and class is available in	2018-05-03 01:29:14 -07:00
Gabriel Calero	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
David Rowe	eeb511c359	Reticle JSDoc fix	2018-04-23 10:20:04 +12:00
David Rowe	8e22941ad7	Interim JSDoc for Reticle	2018-04-23 09:22:45 +12:00
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Brad Davis	d478204722	Working on splash rendering	2018-04-17 14:17:41 -07:00
Gabriel Calero	bd4a7ce4fa	Hide jump button while moving. Fix jump button right alignment in pixel	2018-04-12 19:02:03 -03:00
David Rowe	c2f0f7ef5f	Doc review	2018-04-12 10:54:35 +12:00
David Rowe	7a9e3388fa	Merge branch 'master' into 21801	2018-04-12 09:48:51 +12:00
Cristian Luis Duarte	ffb8b0a60e	Android fly - Use new asset and screen position	2018-04-04 18:19:01 -03:00
Cristian Luis Duarte	1ea056a8a9	Android - Initial Jump button implementation	2018-04-03 16:07:40 -03:00
David Rowe	f27e8868eb	Add HMD JSDoc	2018-03-28 12:25:12 +13:00
SamGondelman	a19f71e759	fix tonemapping on android	2018-03-23 14:16:47 -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
SamGondelman	4bef033d6f	cleanup, don't compress rcc file to fix corruption	2018-03-12 13:05:03 -07:00
Olivier Prat	da6bd92ff6	Merged with master	2018-03-09 10:07:25 +01:00
Cristian Luis Duarte	bde2ba9272	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
Brad Davis	9e8368e50e	Disable virtual trackpad rendering on non-Android builds	2018-03-02 11:12:44 -08:00
Cristian Luis Duarte	55d52f92df	Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)	2018-02-28 15:55:50 -03:00
Cristian Luis Duarte	428f4b7b9d	Android - Make the virtual pad (joystick) position fixed. Change assets.	2018-02-27 21:24:21 -03:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Olivier Prat	d316b6e074	Fixed broken TAA on desktop... grrr.	2018-02-23 11:28:00 +01:00
Olivier Prat	4636f43728	Simplified camera view history and TAA is now working in all circumstances.	2018-02-23 10:19:05 +01:00
Olivier Prat	7432c8361e	Added some comments to try to help understand the correction pipeline	2018-02-23 09:11:17 +01:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
Olivier Prat	ae63610582	Added history of view to try to adjust for GPU slower than game	2018-02-22 23:03:33 +01:00
Olivier Prat	dca7b7aaba	TAA is working on HMD! Still some issues when game rate is low	2018-02-21 17:34:51 +01:00
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