665 commits

Author	SHA1	Message	Date
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
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
David Kelly	5f015ec77f	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:25 -07:00
David Kelly	133af0b522	jittery, still not working in tablet	2017-06-30 12:55:11 -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
humbletim	f6262ad54d	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-06-23 16:37:10 -04: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
Zach Fox	cbdffce88e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619	2017-06-19 13:53:29 -07:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
David Kelly	0f799e52f4	blit entire texture. Only issue is that it is upside down	2017-06-16 15:30:36 -07:00
humbletim	fc33e95e2d	Merge branch 'master' into 21180-C++	2017-06-16 16:16:42 -04:00
David Kelly	f75cbfa087	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-15 15:45:03 -07:00
David Kelly	3d922f5db6	works, sorta, but blinks like crazy, cursor gets f-ed up...	2017-06-15 14:17:43 -07:00
Zach Fox	d7a9354b37	More CR comments; rename function	2017-06-15 13:25:16 -07:00
Zach Fox	1088d248e3	Howard's CR comments	2017-06-15 13:13:58 -07:00
Zach Fox	834a2a5c3b	Ensure monitor never shows frozen SpectatorCamera preview	2017-06-15 12:49:09 -07:00
Zach Fox	7d1a7f4c0b	Merge branch 'master' of https://github.com/highfidelity/hifi into ... spectator-camera - INCLUDING MERGE CONFLICT FIXES	2017-06-13 09:42:14 -07:00
howard-stearns	d15657616a	comments	2017-06-08 10:40:20 -07:00
howard-stearns	bc1eb5c4a3	sizing	2017-06-07 16:18:04 -07:00
samcake	1b45276de2	Adjust the preview to avoid seeing the masked pixels in HMD mode	2017-06-07 15:55:38 -07:00
howard-stearns	51982b1294	display textures in plugins	2017-06-07 14:39:18 -07:00
NeetBhagat	c3621d7c32	Resolved two issues: ... 1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on. 2) Menu sync problem while switching modes.	2017-06-06 22:31:14 +05:30
humbletim	7cab0363a9	standalone 21180 branch with just the C++ changes	2017-06-05 15:57:54 -04:00
NeetBhagat	6228ff19bf	Resolve the reviewed comments of @ZappoMan	2017-06-02 15:23:21 +05:30
volansystech	0920dbc1a8	Resolve the comments of @ZappoMan.	2017-05-29 15:53:33 +05:30
volansystech	a2851b5bcb	Put proper comments and indentation.	2017-05-25 18:47:59 +05:30
volansystech	8d51be644d	Merge branch 'master' into 21255	2017-05-25 17:48:48 +05:30
volansystech	1f24e38585	Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift.	2017-05-25 14:56:06 +05:30
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
Sam Cake	29545f0918	FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend	2017-04-13 23:53:56 -07:00
samcake	c3c73b209a	Fixing the bad rendering of the instanced primitives on 4.1	2017-04-03 11:49:00 -07:00
samcake	b6504bba56	Moving the num mips per texture to the creator so it s immutable and simpler	2017-03-29 17:58:56 -07:00
Brad Davis	e94f803b84	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
Bradley Austin Davis	ce9d637b3f	Expose ASW activation status, provide normalized present rate information	2017-03-03 10:46:05 -08:00
Brad Davis	27e8750b9b	Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction	2017-02-19 18:11:56 -08:00
Bradley Austin Davis	7fb7aa87eb	Working on new texture management strategy	2017-02-17 07:53:16 -08:00
Ryan Huffman	f2638637f7	Add thread names to traces	2017-02-03 09:18:58 -08:00
Brad Davis	1ef4ac9a6c	Additional trace details for GPU timing, frame data updates	2017-01-18 16:19:32 -08:00
Brad Davis	27293c342c	Change present rate to be an average over 1/10th of a second	2017-01-11 14:27:46 -08:00
Brad Davis	1dd2747ef9	Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.	2017-01-10 10:44:04 -08:00
Brad Davis	9bf4804d3d	Use a higher thread priority for Oculus present	2017-01-05 11:04:50 -08:00
Brad Hefta-Gaub	dbbed462b4	cleanup naked qDebug() calls	2016-12-19 22:24:25 -08:00
Brad Davis	30a9961362	tracing polish	2016-12-16 14:02:27 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00
Bradley Austin Davis	2ca4d0ab29	Fix drop in text rendering quality on texture memory constrained systems	2016-12-05 14:12:57 -08:00
Brad Davis	63b3b7250d	Restore correct pipeline shader slot setup	2016-11-29 14:02:58 -08:00
Brad Davis	362976645b	Fix HMD UI glow lines	2016-11-18 17:42:56 -08:00
Brad Davis	3074be7ad0	Glow line replacement without geometry shader	2016-11-18 17:42:55 -08:00
Seth Alves	92e24e6ded	code review	2016-11-13 16:09:57 -08:00
Seth Alves	9868ddd602	global/static QStrings in plugins appear to cause crashes during shutdown	2016-11-13 10:22:14 -08:00
Seth Alves	804f25740d	these qDebugs happen too late and cause a crash	2016-11-13 10:21:27 -08:00
Brad Davis	162f24decd	Add stutter tracking for Oculus	2016-11-11 10:12:41 -08:00
Brad Hefta-Gaub	2c28316e39	CR feedback	2016-10-24 20:40:43 -07:00
Brad Hefta-Gaub	ed4279783d	CR feedback	2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub	779f326452	cleanup	2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub	a25d50387e	gak	2016-10-24 14:47:10 -07:00
Brad Hefta-Gaub	0f8967970a	Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers	2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub	a282d83546	more work on extra lasers	2016-10-24 07:46:04 -07:00
Brad Davis	861b69aa94	Add free GPU memory to the displayed stats	2016-10-23 13:07:38 -07:00
howard-stearns	0141110805	fix flicker in system (inside the hud) hand-lasers.	2016-10-20 15:42:19 -07:00
Brad Hefta-Gaub	1a28732b64	Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers ... Conflicts: libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h	2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub	bf732127ca	Merge pull request #8856 from jherico/geometry_ids ... Remove the use of implicit ids in geometry cache	2016-10-20 08:14:49 -07:00
Anthony J. Thibault	55c062098a	Adjustment to position and visibility of grab sphere. ... * The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm. * The visual representation of this grab sphere is always hidden, by default. * This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.	2016-10-19 17:33:05 -07:00
Anthony J. Thibault	bcd31e3d99	Adjust size and offset of grab balls to better align with hand controllers. ... (cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)	2016-10-19 15:59:26 -07:00