2763 commits

Author	SHA1	Message	Date
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
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
Bradley Austin Davis	d45d87031d	Merge pull request #14782 from SamGondelman/NOverlaysFinal ... Case 20723, Case 20334: Internally, replace all overlays with local entities	2019-02-14 13:49:47 -08:00
SamGondelman	bed2732d34	start moving materials to rendering only	2019-02-14 12:59:16 -08:00
SamGondelman	3f8bfc5475	CR and fix deadlock	2019-02-13 16:19:39 -08:00
SamGondelman	77a8ddb3f0	Merge remote-tracking branch 'upstream/master' into materialMapping	2019-02-11 16:35:05 -08:00
SamGondelman	4202685a4b	Merge remote-tracking branch 'upstream/master' into fst	2019-02-11 16:07:36 -08:00
SamGondelman	f53ccf7363	fix create, working on mini tablet	2019-02-11 14:54:53 -08:00
SamGondelman	d988de4a17	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-11 10:27:12 -08:00
John Conklin II	78f0a3feaa	Merge pull request #14739 from SamGondelman/animations ... Case 20398: Fix animation URL change	2019-02-08 14:40:24 -08:00
John Conklin II	851b968501	Merge pull request #14737 from SamGondelman/zone ... Case 19291: Fix zone bugs	2019-02-08 14:07:26 -08:00
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -08:00
Jeff Clinton	54109deab9	Merge pull request #14825 from SamGondelman/fall ... Case 20829: Always fall when flying is not allowed	2019-02-07 14:39:46 -08:00
John Conklin II	dda310c0b9	Merge pull request #14835 from SamGondelman/textures ... Case 20944: Fix Model textures property	2019-02-07 14:19:01 -08:00
SamGondelman	25ca52d892	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:48:13 -08:00
SamGondelman	3ee448a89a	fix scattering and working on resource cache bug	2019-02-05 17:32:15 -08:00
SamGondelman	31cf623252	fix keyboard focus	2019-02-04 12:44:04 -08:00
SamGondelman	391cca787f	fix keyboard textures and text display	2019-02-01 15:33:53 -08:00
SamGondelman	b80d2a9b06	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-01 13:33:04 -08:00
SamGondelman	50bfe84aa7	fix keyboard intersection, laser alpha	2019-02-01 12:11:00 -08:00
SamGondelman	0955512a80	add billboard mode to web entities and fix picking/culling	2019-01-31 15:45:10 -08:00
SamGondelman	ee1552661c	fix textures	2019-01-31 12:04:46 -08:00
SamGondelman	2d0c1184e4	only domain zone entities control flying and ghosting	2019-01-30 18:27:17 -08:00
Clement	283dabc622	Fix reload mechanic for entity server scripts	2019-01-30 17:29:28 -08:00
SamGondelman	834e44dd3a	make polyline's with faceCamera not depend on normal	2019-01-30 11:02:24 -08:00
Jeff Clinton	3b84580e88	Merge pull request #14794 from SamGondelman/colors ... Case 20888: Fix color space	2019-01-30 09:09:07 -08:00
SamGondelman	56096708d3	one more try	2019-01-29 15:26:49 -08:00
SamGondelman	e41f5617e9	fix color space	2019-01-29 14:52:57 -08:00
SamGondelman	7fa676a846	don't render text parts if alpha == 0	2019-01-29 08:25:17 -08:00
SamGondelman	a8dbe5e761	working on build errors	2019-01-28 21:10:24 -08:00
SamGondelman	6ad0b3412a	showKeyboardFocusHighlight + fixes	2019-01-28 20:43:47 -08:00
SamGondelman	7b88efa42c	trying to fix web surfaces??	2019-01-28 18:29:09 -08:00
SamGondelman	0d1e4bed66	merge with master	2019-01-28 18:13:05 -08:00
SamGondelman	13cb70a6a5	Merge remote-tracking branch 'upstream/master' into NOverlays12	2019-01-28 11:37:15 -08:00
Sam Gondelman	4d83c7f6df	fix line rendering mode	2019-01-27 00:02:06 -08:00
SamGondelman	8f0bd2449b	pointerevents are working!	2019-01-26 21:53:46 -08:00
SamGondelman	abd7d6bddf	some stuff is working!	2019-01-26 01:39:13 -08:00
SamGondelman	a10f52c66d	merge with master	2019-01-25 14:16:07 -08:00
Jeff Clinton	d92d256cfc	Merge pull request #14656 from SamGondelman/matFallthrough ... Case 20241: Material entity fallthrough	2019-01-25 14:01:27 -08:00
SamGondelman	ca8d64bc05	removing overlays wip	2019-01-24 14:59:45 -08:00
SamGondelman	0bfcde67ea	remove overlays from application.cpp	2019-01-24 14:11:24 -08:00
SamGondelman	5d19666f60	merge with master	2019-01-23 17:58:56 -08:00
SamGondelman	9a734b2011	merge with master	2019-01-23 17:48:24 -08:00
SamGondelman	ac513df103	ring gizmo entities	2019-01-23 17:46:04 -08:00
SamGondelman	618146e885	fix animation url change	2019-01-18 15:36:10 -08:00
SamGondelman	d17e04967a	fix zone bugs	2019-01-18 13:49:16 -08:00
SamGondelman	8d2e81a13b	Merge remote-tracking branch 'upstream/master' into matFallthrough	2019-01-17 10:27:43 -08:00
SamGondelman	62b853816a	deprecate the new property so that people hopefully don't use it	2019-01-16 19:35:15 -08:00