2769 commits

Author	SHA1	Message	Date
Andrew Meadows	db3c7b9194	rollback fixes for bugz512	2019-06-13 13:57:18 -07:00
Andrew Meadows	b08bb93ff7	add comment about why WebEntityRenderer::onRemoveFromSceneTyped()	2019-06-13 10:53:55 -07:00
Andrew Meadows	eee52deefe	destroy WebSurfaces on shutdown	2019-06-12 16:07:15 -07:00
Shannon Romano	1982424ee9	Merge pull request #15719 from SamGondelman/crash ... BUGZ-545: Possible fix for Mac PolyLine-related crash	2019-06-10 12:56:31 -07:00
SamGondelman	23f8778feb	possible fix for mac crash?	2019-06-10 11:10:29 -07:00
Sam Gondelman	53e6e00773	Merge branch 'master' into uber	2019-06-10 10:36:54 -07:00
SamGondelman	129d96a997	get rid of lightmapMap	2019-06-07 14:53:31 -07:00
Sam Gateau	4c18ce7ae6	Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state ... (BUGZ-559) Improve transition debugging and transition clean-up	2019-06-06 16:35:04 -07:00
sabrina-shanman	833946ceb3	Clean up transition naming	2019-06-06 13:25:06 -07:00
Seth Alves	7ee64258ec	fix uninitialized read	2019-06-04 13:00:26 -07:00
Seth Alves	766a5c7f81	avoid div by zero	2019-06-04 13:00:26 -07:00
Seth Alves	8a9f3b9508	fix uninitialized read	2019-06-04 13:00:26 -07:00
Seth Alves	50e99cc1fd	fix uninitialized read	2019-06-04 13:00:26 -07:00
SamGondelman	476f0ed012	cleanup and fixing some issues	2019-06-03 20:45:46 -07:00
SamGondelman	6111c8a108	initial work on combining shader variants	2019-06-03 19:36:01 -07:00
SamGondelman	3f42d083f5	fix some transparency issues on amd	2019-06-03 16:14:09 -07:00
Andrew Meadows	bfe809f3f7	local entities should not be in physics	2019-05-29 20:19:12 -07:00
Andrew Meadows	045b0f7cf8	check for unloaded model	2019-05-21 07:49:21 -07:00
sabrina-shanman	03a8e77ade	Move RenderItemStatusIcon to Item.h	2019-05-20 12:07:41 -07:00
sabrina-shanman	5aff4d9f69	Update comment on render item status	2019-05-20 11:58:55 -07:00
Sabrina Shanman	fbe947c8ac	Merge pull request #15558 from AndrewMeadows/fix-crash-bugz178 ... BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model	2019-05-14 13:07:40 -07:00
Andrew Meadows	5a257eb137	avoid crash for RenderableModelEntityItem with invalid model	2019-05-14 09:48:06 -07:00
Sam Gondelman	4c4589271c	Merge pull request #15469 from SamGondelman/switch ... Case 22379: Run-time switch for deferred/forward rendering	2019-05-13 11:14:26 -07:00
SamGondelman	eb8c722080	fix runtime switch	2019-05-13 09:58:55 -07:00
SamGondelman	dfdace8cdc	fix zones for real this time	2019-05-10 15:24:02 -07:00
Shannon Romano	930032bcc6	Merge pull request #15511 from AndrewMeadows/build-shapes-off-mainloop ... case 22166: Build complex shapes in ThreadPool instead of MainLoop	2019-05-09 17:14:50 -07:00
SamGondelman	04198c6bfc	use weak ptrs, add comment about SelectSortItems performance	2019-05-08 13:13:05 -07:00
SamGondelman	da092cc5f0	fix zone issues	2019-05-08 11:04:54 -07:00
Andrew Meadows	915cbb69df	split work out of EntityTree::update(), call it preUpdate()	2019-05-06 17:37:35 -07:00
Andrew Meadows	7dfa8a26a3	cleanup EntityItem::shouldBePhysical() and derivations	2019-05-06 17:35:57 -07:00
Shannon Romano	7fc92a74e0	Merge pull request #15429 from SamGondelman/leave ... Case 20989: Call leaveEntity when script on containing entity stops	2019-05-02 15:42:47 -07:00
SamGondelman	703a4a5700	call leaveEntity when script stops	2019-04-19 15:18:05 -07:00
Olivier Prat	7d412f9109	Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias.	2019-04-19 11:03:43 +02:00
Sam Gateau	e6c76cdb19	Merge pull request #15329 from Zvork/amc ... case 22219: Improved ambient maps	2019-04-17 10:20:53 -07:00
Sam Gateau	51d1c4b1f3	Merge pull request #15357 from SamGondelman/cauterize ... Case 21417: Fix cauterization of entities that are children of MyAvatar's head	2019-04-10 12:29:40 -07:00
SamGondelman	a50cca006e	use # instead of ? for material URL name selection	2019-04-08 23:45:47 -07:00
SamGondelman	27338c3639	fix cauterization of entities that are children of MyAvatar's head	2019-04-08 19:48:11 -07:00
SamGondelman	924bf53698	extra check to make sure we remove material from MyAvatar	2019-04-05 16:22:16 -07:00
Olivier Prat	acded5488e	Merge branch 'master' of https://github.com/highfidelity/hifi into amc	2019-04-04 08:58:49 +02:00
Olivier Prat	eadace70f8	Merge branch 'master' of https://github.com/highfidelity/hifi into amc	2019-04-03 18:19:46 +02: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
Olivier Prat	20f53f5de3	Merge branch 'master' of https://github.com/highfidelity/hifi into amc	2019-04-01 10:04:41 +02: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
Olivier Prat	aa4401801e	Added new texture types : sky and ambient in place of just cube	2019-03-27 11:54:45 +01: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
danteruiz	aa8563f3fe	fix quest ui elements	2019-02-22 10:40:32 -08:00
Andrew Meadows	be2d4272da	remove the other unnecessary _space->clear()	2019-02-21 18:11:16 -08:00
Andrew Meadows	982c4c2bc4	do not Space::clear() in clearNonLocalEntities()	2019-02-21 16:33:31 -08:00
SamGondelman	4fdf556d5d	fix billboard mode in secondary camera	2019-02-21 10:29:21 -08:00
SamGondelman	c8ffb130a3	only update sub items on change	2019-02-19 17:38:47 -08:00
SamGondelman	6765268998	Merge remote-tracking branch 'upstream/master' into wearables	2019-02-19 16:52:00 -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
SamGondelman	06ac2b291b	attachments and wearables cull with avatar parent	2019-02-17 17:52:10 -08:00
SamGondelman	1163cbea70	improving web surface interaction and tablet hiding	2019-02-16 22:03:55 -08:00