2728 commits

Author	SHA1	Message	Date
SamGondelman	924bf53698	extra check to make sure we remove material from MyAvatar	2019-04-05 16:22:16 -07:00
Sam Gondelman	414a39bd8a	Merge branch 'master' into particleShapes	2019-04-01 22:20:13 -07:00
Shannon Romano	cf7eeb7355	Merge pull request #15285 from danteruiz/avatar-fading ... Case 21415: Avatars stay behind after they disconnect	2019-04-01 18:04:42 -07:00
danteruiz	8115ef6d36	addressing more requested changes	2019-04-01 16:46:15 -07:00
danteruiz	fcb838a71f	addressing review requests	2019-04-01 15:43:04 -07:00
danteruiz	db17f094da	adding entities to fade out list;	2019-03-29 15:23:16 -07:00
Sam Gondelman	968dbb825a	Merge pull request #15243 from SamGondelman/proceduralTime ... Case 21876: New procedural uniforms for time, iEntityTime and iLocalCreatedTime	2019-03-29 11:35:41 -07:00
danteruiz	b9d04c6ebb	adding entity to a faded list	2019-03-28 16:42:29 -07:00
SamGondelman	36921276c6	fix transparent shape flickering	2019-03-27 11:52:37 -07:00
John Conklin II	e5a999b66a	Merge pull request #15256 from SamGondelman/shadow ... Case 21898: Fix shadows when tablet is open and misc threading issues	2019-03-25 15:20:23 -07:00
Sam Gondelman	85024bcc0b	Merge pull request #15214 from SamGondelman/lasers ... Case 21505: Fix laser ghosting	2019-03-25 14:43:52 -07:00
SamGondelman	57a02bc1d5	capture lambda by value	2019-03-25 11:29:25 -07:00
SamGondelman	7db498a130	fix shadows when tablet is open and misc threading issues	2019-03-22 16:20:54 -07:00
Sam Gondelman	40f5a0263c	Merge pull request #15201 from SamGondelman/emit ... Case 21756: Entities.emitScriptEvent works now	2019-03-21 18:05:17 -07:00
Sam Gondelman	04ecdb463f	Merge pull request #15173 from SamGondelman/audio ... Case 21457, Case 16836, Case 15782: Improve AudioInjector threading	2019-03-21 18:03:58 -07:00
SamGondelman	4fd2c4449d	new procedural uniforms for time	2019-03-21 12:15:03 -07:00
Sabrina Shanman	2fd2d2cc5d	Merge pull request #15154 from SamGondelman/parentCollider ... Case 8064: Child of animated model brings collider with it	2019-03-21 11:26:50 -07:00
Sam Gondelman	61b7b8b669	reduce lambda copies	2019-03-21 08:36:32 -07:00
SamGondelman	3ff0770441	model emitters!	2019-03-20 21:25:14 -07:00
SamGondelman	38864e5b6e	plane, circle, cylinders	2019-03-19 18:04:32 -07:00
SamGondelman	194008c77a	box shapeType	2019-03-19 14:14:37 -07:00
SamGondelman	432a3f1610	uniform sampling of ellipsoid points	2019-03-19 12:59:03 -07:00
SamGondelman	7a5bbb8f6f	fix laser ghosting	2019-03-18 14:53:11 -07:00
SamGondelman	ea50133146	working on adding particle shape types	2019-03-18 12:05:17 -07:00
SamGondelman	d4e1ec9741	fix emitScriptEvent	2019-03-15 16:20:01 -07:00
SamGondelman	79dda7a6c7	build errors	2019-03-15 14:29:50 -07:00
SamGondelman	8748a7561b	fix lighting/color grading for everything	2019-03-15 12:48:32 -07:00
SamGondelman	609c4ab52e	try to fix audio injector threading issues	2019-03-12 18:41:43 -07:00
SamGondelman	97b01bad70	tellPhysics to children when animating model	2019-03-11 12:23:26 -07:00
danteruiz	4371723145	fix soft entity popping	2019-03-11 11:27:12 -07:00
SamGondelman	af03fb5f85	try to fix text rendering on amd with transparency	2019-03-07 16:23:12 -08:00
SamGondelman	380df059ff	fix shapes app	2019-03-06 18:18:39 -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
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
SamGondelman	3e6061e435	try to not clear my avatar entities on domain switch	2019-03-01 13:45:00 -08:00
amer cerkic	6ebc57994b	Merge branch 'master' into quest-demo	2019-03-01 10:23:41 -08:00
Shannon Romano	33e061b09b	Merge pull request #15022 from danteruiz/fix-tablet-scaling ... Case 21424: Tablet does not properly resize when scaling avatar.	2019-03-01 09:37:47 -08:00
Andrew Meadows	ed9ebf84c9	remove unuseful log entry	2019-02-28 14:21:14 -08:00
amerhifi	35dc13e06a	Merge branch 'master' into quest-demo	2019-02-28 14:06:47 -08:00
danteruiz	f715dbe243	fix tablet scaling	2019-02-28 13:32:12 -08:00
amer cerkic	19d584f0af	added Sams suggestions to the logic	2019-02-26 15:28:28 -08:00
amer cerkic	f5852139f7	fixing comment since the original check was correct	2019-02-26 15:05:58 -08:00
amer cerkic	5a7c8c3126	removed debugg helpers	2019-02-26 14:53:44 -08:00
amer cerkic	4c6bea48b2	fixed a case where _widths = 0 and widths-1 is not valid.	2019-02-26 14:48:34 -08:00
Sam Gondelman	f1541c3df4	Merge pull request #15023 from SamGondelman/web ... Case 21171: Web entity thread safety and fixes	2019-02-26 11:37:46 -08:00
SamGondelman	f482ae3b63	Merge remote-tracking branch 'upstream/master' into untexture	2019-02-25 16:26:14 -08:00
SamGondelman	f235d04601	trying to fix web crashes	2019-02-25 15:40:17 -08:00
John Conklin II	6af2b25767	Merge pull request #14980 from AndrewMeadows/dont-clear-space ... Case 21309: don't corrupt workload system	2019-02-25 09:52:15 -08:00
SamGondelman	dbc3ae3793	hmmm not working	2019-02-22 14:18:59 -08:00