2709 commits

Author	SHA1	Message	Date
danteruiz	db17f094da	adding entities to fade out list;	2019-03-29 15:23:16 -07:00
danteruiz	b9d04c6ebb	adding entity to a faded list	2019-03-28 16:42:29 -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
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
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
SamGondelman	71653f95d7	working on overlay bugs	2019-02-16 20:08:36 -08:00
Sam Gondelman	c8ab7ac37f	fix bad copy	2019-02-16 18:08:05 -08:00
SamGondelman	3e3bd2ffd8	fix transform properties not changing	2019-02-15 16:57:29 -08:00
SamGondelman	6bf1545285	fix build error	2019-02-15 16:44:28 -08:00
SamGondelman	3df231f1e0	it's working!	2019-02-15 14:43:22 -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
Sam Gondelman	9aa99f24f0	Merge pull request #14905 from SamGondelman/materialMapping ... Case 20242: FST materialMapping supports our material JSON format	2019-02-15 11:21:51 -08:00
SamGondelman	25b31cfc72	merge with master	2019-02-15 11:08:24 -08:00
Shannon Romano	f267043953	Merge pull request #14838 from SamGondelman/billboardMode ... Case 20962: Billboard mode improvements	2019-02-14 17:44:48 -08:00