2661 commits

Author	SHA1	Message	Date
Jeff Clinton	889f110357	Merge pull request #13925 from sethalves/fix-polyvox-texture-and-single-setter ... fix a bug that broke Entities.setVoxel(). Fix polyvox textures	2018-12-18 12:15:07 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
SamGondelman	6094a2f0a0	add back line entities, undo polyline changes temporarily	2018-12-14 15:41:11 -08:00
SamGondelman	5dd00bed1d	new improved polylines	2018-12-14 14:15:56 -08:00
SamGondelman	770da220d7	cleanup entity properties more and start polyline work, remove lines	2018-12-12 16:47:35 -08:00
SamGondelman	b261665072	working on lines	2018-12-12 09:39:01 -08:00
SamGondelman	250baa9c72	add missing properties to text entities	2018-12-11 15:42:24 -08:00
SamGondelman	fd8245e258	Merge remote-tracking branch 'upstream/master' into NOverlays6	2018-12-11 10:46:39 -08:00
Sam Gateau	d5b127d258	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-10 21:35:41 -08:00
Shannon Romano	bb9a764855	Merge pull request #14517 from luiscuenca/getEntityJointParent ... Add method to check entities joint hierarchy	2018-12-11 01:06:38 +00:00
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00
Sam Gondelman	d21d764131	Merge branch 'master' into NOverlays4	2018-12-06 12:48:05 -08:00
Sam Gondelman	2291c7e5fb	Merge branch 'master' into NOverlays3	2018-12-06 12:37:18 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Sam Gondelman	c38a6966a9	Merge branch 'master' into NOverlays4	2018-12-06 11:25:43 -08:00
Sam Gondelman	d30dd4c26c	Merge branch 'master' into NOverlays3	2018-12-06 11:23:50 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
sam gateau	a267c3115a	drafting more factorisation of render tasks	2018-12-05 17:47:33 -08:00
SamGondelman	9923e76968	cleanup	2018-12-05 17:18:26 -08:00
Sam Gondelman	df6fbefc31	Merge branch 'master' into v3	2018-12-05 16:51:33 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
SamGondelman	305cb6d323	grid entities	2018-12-03 18:04:34 -08:00
SamGondelman	98f9dc0ca4	remove grid entity files	2018-12-03 12:07:26 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -08:00
luiscuenca	ad42f6a590	Add method to check entities joint hierarchy	2018-12-01 12:32:29 -07:00
SamGondelman	2acb6b6857	v3 procedurals and shader fixes	2018-11-28 17:58:27 -08:00
Seth Alves	098440c273	fix a bug that broke Entities.setVoxel(). Fix polyvox textures	2018-11-27 10:43:33 -08:00
SamGondelman	e282d51883	CR	2018-11-26 01:15:07 -05:00
sabrina-shanman	be511378cd	Merge branch 'master' into hfm_serializer	2018-11-20 13:42:24 -08:00
Sam Gondelman	968ffe7ec3	Merge branch 'master' into branching	2018-11-16 10:25:02 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
Clement	7192aed131	Rework audio data memory ownership model	2018-11-14 14:45:18 -08:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
sabrina-shanman	e08bc7296f	Merge branch 'master' into hfm_serializer	2018-11-13 15:41:49 -08:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
sabrina-shanman	83cc90ace0	Re-name GLTFReader to GLTFSerializer and do the same for other model readers	2018-11-12 16:12:20 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
Brad Hefta-Gaub	22dd958582	Merge pull request #14297 from jherico/feature/vcpkg ... Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms	2018-11-12 09:52:02 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08:00
Jeff Clinton	b9c11aad7b	Merge pull request #14259 from SamGondelman/webLock ... Case 18986: Enable interaction with locked web entity	2018-11-09 12:21:13 -08:00
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Brad Davis	8c4237b520	Fix warnings	2018-11-08 12:27:56 -08:00
Zach Fox	58dd690c0a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-06 10:29:05 -08:00
sabrina-shanman	2801f324b7	Switch references to HFM to the HFM lib and remove HFM classes in FBX	2018-11-05 12:47:34 -08:00
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
Zach Fox	b43ad15fa7	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-01 11:32:38 -07:00
sabrina-shanman	becee7f010	Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-10-30 17:28:42 -07:00
SamGondelman	dc9405775f	more branching removal	2018-10-29 16:42:46 -07:00
Bradley Austin Davis	95d160a170	Working on mac GL issues	2018-10-26 11:23:29 -07:00
SamGondelman	0efbdc1ab5	merge with master	2018-10-23 14:33:57 -07:00
Zach Fox	988bca201b	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-23 13:36:46 -07:00
SamGondelman	2755cbcf4f	enable interaction with locked web entity	2018-10-23 12:00:50 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
Zach Fox	1eca1bfd55	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-22 11:18:10 -07:00
SamGondelman	5652fa0b1e	merge with master	2018-10-22 10:18:52 -07:00
Sam Gateau	6005b934ad	Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001 ... minor bug fix and optimization in ModelEntity animation	2018-10-19 17:02:48 -07:00
Brad Hefta-Gaub	e6ec32e515	Merge pull request #14222 from SamGondelman/material ... Fix material entity opacity maps	2018-10-19 16:45:31 -07:00
John Conklin II	9c841db9fb	Merge pull request #14184 from SamGondelman/blendshape ... Move blendshape buffers to render thread	2018-10-19 11:55:44 -07:00
Zach Fox	2a9e0041b2	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-18 10:16:07 -07:00
Sam Gondelman	e3543cf098	Merge branch 'master' into scriptvec3	2018-10-17 13:10:29 -07:00
Andrew Meadows	3b1b64b057	fix logic in readyToAnimate()	2018-10-17 11:45:39 -07:00
Andrew Meadows	da0d70af3f	don't use string comparison when polling for changed animation URL	2018-10-17 11:45:39 -07:00
Andrew Meadows	0c61779331	remove deprecated cruft; stub setAnimationURL() override	2018-10-17 11:45:39 -07:00
Andrew Meadows	148944814b	consolidate two bad string checks into one	2018-10-17 11:45:39 -07:00
SamGondelman	cce0981d6c	Merge remote-tracking branch 'upstream/master' into police	2018-10-17 11:40:01 -07:00
John Conklin II	7b226aa559	Merge pull request #14124 from SamGondelman/particle ... Don't render particles without textures	2018-10-17 11:17:23 -07:00
John Conklin II	eb088772d0	Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls ... Fix "Good" collision not honoring mesh groups in OBJ files	2018-10-17 11:12:21 -07:00
SamGondelman	c5a94a415d	fix material entity opacity maps	2018-10-17 09:59:43 -07:00
SamGondelman	327c2f4e3d	move blendshape buffers to render thread	2018-10-10 15:32:53 -07:00
Zach Fox	7de784ce27	First steps (definitely not working)	2018-10-10 12:32:55 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -07:00
sabrina-shanman	57f67ffe91	Do not have additional compoundMeshes variable in computeShapeInfo	2018-10-08 11:46:46 -07:00
sabrina-shanman	e15a41c839	Fix model being loaded before dimensions are initialized	2018-10-08 09:26:35 -07:00
sabrina-shanman	c8cccc5ec7	Fix "good" collision not subdividing OBJ meshes by group	2018-10-08 09:24:33 -07:00
Dante Ruiz	651f37aceb	Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged	2018-10-04 15:01:39 -07:00
Dante Ruiz	bda9735b5d	fix loading progress	2018-10-04 15:01:16 -07:00
Wayne Chen	0a7102b4d3	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-04 08:59:26 -07:00
Sam Gondelman	4e96c3297b	Merge branch 'master' into scriptvec3	2018-10-03 17:14:15 -07:00
John Conklin II	658c74a1c6	Merge pull request #14080 from huffman/fix/111-models-not-being-resized ... Fix models with 1^3 dimensions never being resized	2018-10-02 14:11:45 -07:00
Sam Gondelman	5b6e7b2566	Merge branch 'master' into scriptvec3	2018-10-02 08:58:04 -07:00
John Conklin II	0ef407a45c	Merge pull request #14116 from sethalves/fix-bad-render-downcasts ... get asan to not complain about invalid downcasts during transaction.updateItem	2018-10-01 16:57:03 -07:00
Brad Hefta-Gaub	edd5db7768	Merge pull request #14042 from thoys/perf/create/getMultipleEntities ... Speed up Entity List properties fetching by adding Entities.getMultipleEntities API	2018-10-01 16:16:48 -07:00
Wayne Chen	8f36bc0850	Merge pull request #4 from danteruiz/interstitialMerged ... Interstitial screen updates	2018-10-01 15:43:04 -07:00
SamGondelman	1ec481922c	don't render particles without textures	2018-10-01 14:54:34 -07:00
Dante Ruiz	652ec2210d	fixing loading issues	2018-10-01 13:58:14 -07:00
Seth Alves	f784b33eed	get asan to not complain about invalid downcast of EntityRenderer UpdateFunctor	2018-09-30 15:25:21 -07:00
John Conklin II	11492ce8ee	Merge pull request #14045 from sethalves/enterEntity-wait-for-script ... don't call enterEntity before the entity's script is loaded	2018-09-28 16:07:08 -07:00
John Conklin II	5d00aa0bdb	Merge pull request #14009 from sethalves/fix-worn-shape-double-scale ... fix scaling of worn shape entities	2018-09-28 13:08:46 -07:00
SamGondelman	09a6053044	cleaning up fragment shaders	2018-09-26 14:10:47 -07:00
Ryan Huffman	af897bdef2	Fix models with 1^3 dimensions never being resized	2018-09-25 09:13:59 -07:00
Seth Alves	6eb3fa251d	guard against null deref	2018-09-21 10:39:41 -07:00
Seth Alves	f6e57f54b0	don't call enterEntity until script preload has finished	2018-09-21 10:26:55 -07:00
Seth Alves	d5c0c05ab2	wait for an entity's script to load before adding it to the contain-avatar list. do this so the script doesn't miss the 'enterEntity' entity-method due to not being loaded.	2018-09-21 10:26:55 -07:00
Thijs Wenker	06491ef12f	API function for retrieving multiple entity properties with better performance	2018-09-20 19:34:00 +02:00
John Conklin II	6c63f92f39	Merge pull request #13933 from SamGondelman/accelerationSpread ... Fix particle acceleration spread	2018-09-19 11:49:42 -07:00
Seth Alves	1e8ae1a294	fix scaling of worn shape entities	2018-09-15 16:36:55 -07:00
SamGondelman	c522d1bc93	merge with master	2018-09-14 00:57:13 -07:00
Sam Gondelman	42ded53b5f	Merge branch 'master' into modelBugs	2018-09-12 14:35:46 -07:00
Wayne Chen	63ad85215b	Merge branch 'master' into interstitalMerged	2018-09-11 17:17:33 -07:00
SamGondelman	3daaa0ce81	empty urls are invalid	2018-09-10 11:45:40 -07:00
SamGondelman	a4605289a2	animation on switch url	2018-09-10 10:03:05 -07:00
Dante Ruiz	200f6d540a	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-09-06 09:59:51 -07:00
Bradley Austin Davis	fade3a8de0	Fixing shader implicit type conversions	2018-09-06 09:08:36 -07:00
Brad Davis	50f4932d9c	PR feedback: structure alignement and size	2018-09-06 09:07:53 -07:00
Brad Davis	5a5e1ad498	Remove uniforms from polyvox	2018-09-06 08:59:06 -07:00
SamGondelman	589e88af4a	Merge remote-tracking branch 'upstream/master' into scriptvec3	2018-09-04 17:54:45 -07:00
SamGondelman	ec0b0ab464	fix acceleration spread	2018-09-04 13:03:42 -07:00
SamGondelman	ade58a52cc	reserve priority sort util vectors	2018-09-04 11:21:43 -07:00
SamGondelman	5f08ed5027	misc perf improvements	2018-08-30 16:55:15 -07:00
SamGondelman	0c8a4cc81e	merge with master	2018-08-28 17:31:51 -07:00
SamGondelman	aae06e8f49	faster aabox ray intersection and pre-computed inverse direction	2018-08-27 15:40:33 -07:00
danteruiz	e2cd695dfb	PR code clean up	2018-08-27 11:01:29 -07:00
Sam Gondelman	6730635931	Merge branch 'master' into scriptvec3	2018-08-27 10:43:52 -07:00
danteruiz	e4293d9ad5	fixing some entity visual problems	2018-08-26 21:50:01 -07:00
Dante Ruiz	92acaade2b	trying to fix problems	2018-08-24 17:13:57 -07:00
Dante Ruiz	af19849a75	fixing merge conflict	2018-08-24 15:48:42 -07:00
Dante Ruiz	3796675123	script update and visuallyReady entities	2018-08-24 15:46:39 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
SamGondelman	b5b7167644	add to stats	2018-08-23 17:56:24 -07:00
Andrew Meadows	3c01433e12	stub for avatars changing workload regions	2018-08-23 12:59:28 -07:00
SamGondelman	283c0c0311	s i m p l i f y	2018-08-23 11:47:56 -07:00
SamGondelman	5c0b12abf6	ordered ray/parabola intersection code	2018-08-22 16:29:17 -07:00
Wayne Chen	acc7d493ec	Merge pull request #13812 from SimonWalton-HiFi/safe-landing ... Safe landing client-side improvements	2018-08-20 20:36:17 -07:00
John Conklin II	b28aa3951f	Merge pull request #13802 from jherico/feature/scribe_programs ... Migrating to scribe program descriptors	2018-08-20 14:48:54 -07:00
Sam Gondelman	f0986a7f5a	Merge branch 'master' into scriptvec3	2018-08-20 10:56:45 -07:00
Simon Walton	3c665b7de8	Don't delete sequence numbers outside of range as range may change	2018-08-10 14:40:08 -07:00
SamGondelman	15070f6374	fixing fading	2018-08-10 10:52:58 -07:00
Brad Davis	f03370c826	Migrating to scribe program descriptors	2018-08-09 17:58:34 -07:00
SamGondelman	bd4a3a5b32	remove unused uniform buffer from polylines	2018-08-09 12:20:36 -07:00
SamGondelman	a0c3c09b05	Merge remote-tracking branch 'upstream/master' into bloom	2018-08-08 14:44:02 -07:00
Sam Gondelman	16b483b338	Merge pull request #13766 from SamGondelman/shaders ... Miscellaneous shader fixes	2018-08-08 11:34:36 -07:00
SamGondelman	0dd8d2d3d4	working on enabling bloom	2018-08-07 18:18:58 -07:00
SamGondelman	de10dfb032	don't bind materials during shadow pass	2018-08-07 11:17:18 -07:00
SamGondelman	82029b4cb0	fix v1 and transparent procedurals	2018-08-07 09:28:40 -07:00
Sam Gateau	00c5b6f5f4	Merge pull request #13743 from SamGondelman/transparent ... Fix primitives always drawing as transparents	2018-08-06 16:28:30 -07:00
SamGondelman	a7dec8fb75	parabola and particle shader fixes	2018-08-06 15:49:52 -07:00
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Brad Davis	04e84f1d23	Moving to cmake time shader compiling	2018-08-03 14:58:11 -07:00
Sam Gondelman	7772e8adf2	Merge branch 'master' into scriptvec3	2018-08-03 14:57:49 -07:00
SamGondelman	2f358f3380	fix shapes always drawing as transparents	2018-08-02 12:16:01 -07:00
John Conklin II	7a635b6a57	Merge pull request #13709 from thoys/fix/require-load-queue ... MS17041: Fix for require fail when the same script loaded simultaneously from another entity script	2018-08-01 11:15:32 -07:00
Thijs Wenker	003e826d60	move over definition so it could be linked in the assignment-client too	2018-08-01 00:23:34 +02:00
SamGondelman	7c8d080050	Merge remote-tracking branch 'upstream/master' into scriptvec3	2018-07-31 14:04:23 -07:00
Thijs Wenker	74343c71d8	CR fixes	2018-07-31 22:29:53 +02:00
Seth Alves	4ff9252b47	Merge pull request #13718 from jherico/fix/fb15963 ... Support rendering of 'about' URLs in web entities	2018-07-31 09:44:31 -07:00
SamGondelman	2ca217eb4a	merge with master	2018-07-30 17:43:15 -07:00
Brad Davis	c991053c93	Support rendering of 'about' URLs in web entities	2018-07-30 11:56:31 -07:00
Seth Alves	a6aaa71d02	Revert "Allow empty web entities to be rendered"	2018-07-30 11:54:52 -07:00
Sam Gondelman	8201997a16	Merge pull request #13660 from SamGondelman/parabolic ... Parabolic Picking + Pointers	2018-07-30 10:49:02 -07:00