8025 commits

Author	SHA1	Message	Date
NissimHadar	577ff9695f	TEST!!!	2019-03-11 13:53:19 -07:00
Shannon Romano	a8f6e74ca4	Merge pull request #15135 from SamGondelman/text81 ... Case 21628: Fix text rendering on AMD/Mac	2019-03-08 14:59:37 -08:00
Roxanne Skelly	c33d2aafda	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-08 11:41:34 -08:00
Roxanne Skelly	750dbfae21	Stand-alone Tags: Throw up popup for first unoptimized domain ... Throw up a popup in stand-alone builds when user attempts to go to an unoptimized domain.	2019-03-08 10:48:42 -08:00
SamGondelman	af03fb5f85	try to fix text rendering on amd with transparency	2019-03-07 16:23:12 -08:00
Shannon Romano	76958ffda2	Merge pull request #15102 from danteruiz/keyboard-for-web-entities ... Case 21144: Can't enter text in a Web Entity with the new keyboard	2019-03-07 15:46:31 -08:00
Roxanne Skelly	b38fc65372	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-07 10:06:05 -08:00
Shannon Romano	4f3d593d90	Merge pull request #15072 from SamGondelman/clear ... Case 11775: Don't clear my avatar entities on domain switch	2019-03-05 15:42:51 -08:00
danteruiz	e6a63a9a69	add keyboard for html content	2019-03-05 14:24:38 -08:00
SamGondelman	f2c248c0a2	disable href and entity script events when in edit mode	2019-03-04 17:10:20 -08:00
SamGondelman	12f5a735d9	simplifying mouse events and fix mouse on create	2019-03-04 14:50:09 -08:00
Shannon Romano	d56b460d11	Merge pull request #15030 from wayne-chen/clockOnTablet ... Case 21456, Case 21463: Clock On Tablet (81.0/master)	2019-03-04 10:45:34 -08:00
Sam Gateau	cc9a3e2541	Merge pull request #15052 from amerhifi/quest-demo ... case 21485: removing quest-demo specific changes	2019-03-01 15:03:44 -08:00
SamGondelman	3e6061e435	try to not clear my avatar entities on domain switch	2019-03-01 13:45:00 -08:00
Shannon Romano	20d65ab183	Merge pull request #15064 from danteruiz/another-login-fix ... Case 21451: HMD Login Encouragement Screen is not Usable	2019-03-01 12:57:17 -08:00
amer cerkic	6ebc57994b	Merge branch 'master' into quest-demo	2019-03-01 10:23:41 -08:00
Shannon Romano	d68f82eb7d	Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities ... Case 21494: Avoid mem leaked entities	2019-03-01 09:34:20 -08:00
danteruiz	7bcf727a83	review changes	2019-02-28 18:11:51 -08:00
danteruiz	9fe0309ae6	another login fix	2019-02-28 17:11:48 -08:00
Andrew Meadows	7d9efe4c09	avoid mem-leak for serverless domains	2019-02-28 14:20:11 -08:00
amerhifi	35dc13e06a	Merge branch 'master' into quest-demo	2019-02-28 14:06:47 -08:00
SamGondelman	15064f0097	fix lasers and keyboard on reload	2019-02-28 14:04:22 -08:00
amer cerkic	faedc61c37	removing quest-demo specific changes	2019-02-28 10:54:30 -08:00
amer cerkic	a425becc8a	clean up of debugging	2019-02-27 15:35:33 -08:00
amer cerkic	92cfa49bfb	adding and testing command line parameter passing to application	2019-02-27 11:42:22 -08:00
danteruiz	2fd94c6bbc	fixing login dialog	2019-02-27 10:08:38 -08:00
Wayne Chen	650b34c463	adding clock	2019-02-25 18:00:56 -08:00
Roxanne Skelly	0636579822	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-22 15:43:42 -08:00
Dante Ruiz	eedd54d0b1	Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo	2019-02-22 15:02:01 -08:00
Dante Ruiz	a87e49bb23	start in quest dev	2019-02-22 15:01:30 -08:00
amer cerkic	9c833f7e64	clean up	2019-02-22 09:21:51 -08:00
amer cerkic	f04fdb2187	added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user	2019-02-22 09:11:24 -08:00
amer cerkic	9097d9c57c	working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing.	2019-02-21 16:33:25 -08:00
SamGondelman	4fdf556d5d	fix billboard mode in secondary camera	2019-02-21 10:29:21 -08:00
Roxanne Skelly	8c058f147e	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-20 14:24:47 -08:00
Brad Davis	79369a0c83	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-20 10:40:49 -08:00
Brad Davis	122a246d2d	Fix typo	2019-02-19 17:30:47 -08:00
Brad Davis	518e480a8b	Fix plugin activation	2019-02-19 17:00:50 -08:00
SamGondelman	6765268998	Merge remote-tracking branch 'upstream/master' into wearables	2019-02-19 16:52:00 -08:00
Brad Davis	d60dcb99d2	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-19 12:37:30 -08:00
Roxanne Skelly	d957b38f10	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-19 12:34:10 -08:00
John Conklin II	d7a5c0bb4f	Merge pull request #14947 from SamGondelman/overlayClick ... Case 21291, Case 21292, Case 21293: Working on overlay bugs	2019-02-19 11:01:19 -08:00
John Conklin II	1348baecc7	Merge pull request #14935 from SamGondelman/matEntity ... Case 20920: Move Material Entity logic to render thread	2019-02-19 10:59:51 -08:00
SamGondelman	06ac2b291b	attachments and wearables cull with avatar parent	2019-02-17 17:52:10 -08:00
SamGondelman	71653f95d7	working on overlay bugs	2019-02-16 20:08:36 -08:00
SamGondelman	3df231f1e0	it's working!	2019-02-15 14:43:22 -08:00
Brad Davis	4409e59682	Add per-android-app preprocessor macros	2019-02-15 14:11:26 -08:00
John Conklin II	b9356e22d8	Merge pull request #14927 from huffman/fix/hide-asset-browser ... Case 16349: Fix asset browser being hidden in incorrect way on server switch	2019-02-15 13:32:27 -08:00
SamGondelman	c92b82e744	merge with master	2019-02-15 12:43:30 -08:00
SamGondelman	87ab255115	finish moving materials to rendering	2019-02-15 11:49:20 -08:00