2769 commits

Author	SHA1	Message	Date
Jeff Clinton	16c7619aa7	Merge pull request #14608 from SamGondelman/zone ... Case 19080: Fix zone with invalid script not loading	2018-12-19 08:49:33 -08:00
sam gateau	b8d96d98b8	fixing warnings from the build	2018-12-18 16:25:24 -08:00
sam gateau	265b1591d6	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-18 14:43:12 -08:00
sam gateau	2f18555ee0	removing comments and dead code, rewiring the debug	2018-12-18 14:42:45 -08:00
SamGondelman	7231116e43	fix zone with invalid script not loading	2018-12-18 13:04:56 -08:00
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
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	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
Seth Alves	32ec984f82	Merge pull request #13577 from dback2/invisibleWebEntities ... Allow empty web entities to be rendered	2018-07-30 10:12:32 -07:00
John Conklin II	fc88165e23	Merge pull request #13696 from SamGondelman/particleRot ... Particles don't spin with head roll, new spin + rotateWithEntity properties	2018-07-27 14:54:48 -07:00
Sam Gateau	a95ddb0492	Merge pull request #13616 from AndrewMeadows/remove-cruft-001 ... remove cruft for rendering collision shapes	2018-07-27 19:19:44 +02:00
SamGondelman	1c1b68ee66	emitterShouldTrail fix, review comments, rotateWithEntity	2018-07-26 11:41:16 -07:00
SamGondelman	4750611af9	particles don't spin with head roll, add particle spin properties, negative emitSpeed	2018-07-24 23:47:58 -07:00
SamGondelman	318ef907b8	parabola/polyvox, fixing some bugs	2018-07-24 10:08:35 -07:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07:00
Andrew Meadows	207aea8712	remove cruft from rendering collision shapes	2018-07-16 10:29:34 -07:00
SamGondelman	f9cdfbad7c	cleanup	2018-07-12 17:59:57 -07:00
SamGondelman	16ad9cb5d3	xcolor/rgbcolor conversion	2018-07-11 18:06:06 -07:00
SamGondelman	9929529f30	vec3 conversion	2018-07-11 14:18:22 -07:00
SamGondelman	5bbd5b9e52	vec2 conversion	2018-07-10 16:32:49 -07:00
David Back	c4236d7442	allow rendering empty web entity	2018-07-10 13:53:18 -07:00
SamGondelman	ca5ce888f4	parabola triangle intersection	2018-07-09 18:11:57 -07:00
Dante Ruiz	ae03dcb57a	fix parent grab dropping and cullig flickering	2018-07-06 15:42:21 -07:00
SamGondelman	7130b5aa7f	fixing findRayIntersection bugs	2018-07-05 10:27:12 -07:00
SamGondelman	90091d11e4	parabola picks, started implementing math	2018-07-03 09:47:31 -07:00
John Conklin II	e7d5ea561b	Merge pull request #13469 from hyperlogic/safeLandingFix4 ... Fix for landing on the roof of some domains.	2018-06-27 10:23:35 -07:00
Dante Ruiz	d8834af749	make requested changes	2018-06-26 11:53:45 -07:00
Dante Ruiz	17f4a27ceb	Merge branch 'master' of github.com:highfidelity/hifi into fix-entity-lag-2	2018-06-26 10:55:27 -07:00
Anthony J. Thibault	328a485ad1	Prevent ray-picks against ModelEntity bounding boxes when loading has not yet completed.	2018-06-25 10:38:53 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
Sam Gondelman	afc64a18a1	Merge pull request #13362 from SamGondelman/modelTextures ... Fix transparent textures rendering wrong sometimes	2018-06-21 14:23:49 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
Dante Ruiz	f891c37ac8	fix particle entity	2018-06-20 10:59:19 -07:00
Dante Ruiz	3d4f164a9f	fixing web entity and whitespace cleanup	2018-06-19 16:53:36 -07:00
Dante Ruiz	694c272424	fixed text entity	2018-06-19 16:27:10 -07:00
Dante Ruiz	568ba6f777	fixing shape entity	2018-06-19 14:14:16 -07:00
Andrew Meadows	6d422e4678	Merge 'master' into 'workload'	2018-06-18 10:30:13 -07:00
SamGondelman	7771661948	fix particle spread properties	2018-06-15 17:35:49 -07:00
SamGondelman	9ea65950d5	particles: threadsafe, cleanup, rework initialized logic	2018-06-15 15:45:06 -07:00
SamGondelman	0b79e9f6c7	whoops	2018-06-15 15:13:29 -07:00
Sam Gondelman	225a98129a	Merge branch 'master' into modelTextures	2018-06-15 15:09:32 -07:00
John Conklin II	2483c45f40	Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly ... Remove functionality for rendering collision models directly in the Model class	2018-06-15 14:46:40 -07:00
sabrina-shanman	b2ec7f78c1	Remove signaling and render code for collision models in RenderableModelEntityItem and EntityTreeRenderer	2018-06-14 15:49:40 -07:00
SamGondelman	5ac7ced306	cleanup renderable model entity item, fix crash on reload, fix different transparent bug	2018-06-13 17:14:52 -07:00
Ryan Huffman	a558f71fcd	Fix resoruces path URLs not working with Script.resolvePath ... Depending on the context, "/~/" means different things. The ScriptEngine resolves this path to `/scripts`, but everywhere else it resolves to `/resources`. This change forces us to expand those paths instead of storing the "/~/" path, which will be incorrectly resolved once the ScriptEnging is using it.	2018-06-12 16:55:31 -07:00
sabrina-shanman	4c39d08358	Remove "Draw Collision Shapes" option from developer physics menu	2018-06-11 11:03:57 -07:00
sabrina-shanman	440c77905a	Remove functionality for rendering collision meshes directly in the Model class	2018-06-11 11:03:57 -07:00
Brad Davis	380137a660	Fix particle entity shader	2018-06-10 12:15:00 -07:00
SamGondelman	c18602d22e	fix models starting as green boxes	2018-06-07 13:03:56 -07:00
Andrew Meadows	4329ea5240	Merge master' into 'workload'	2018-06-04 16:11:25 -07:00
SamGondelman	86ee5c12d8	merge and update based on sam's changes	2018-05-31 17:53:36 -07:00
samcake	386c0f9ab2	Re review adjustments	2018-05-31 12:16:57 -07:00
Sam Gateau	513acc529e	INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine	2018-05-30 23:31:54 -07:00
samcake	2e9076c71e	Clean up and trying to get ready for merge	2018-05-30 11:14:49 -07:00
Sam Gateau	678effdb48	Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey	2018-05-26 23:28:59 -07:00
SamGondelman	e6741a363e	add local-only isVisibleInSecondaryCamera flag to entities	2018-05-23 16:35:21 -07:00
Andrew Meadows	a23126a6b2	Merge 'master' into 'workload'	2018-05-18 07:38:02 -07:00
John Conklin II	a6cda2166a	Merge pull request #13158 from highfidelity/stable ... RC67.1 stable mergeback to master	2018-05-15 14:01:06 -07:00
Andrew Meadows	c7c4324b3c	Merge 'master' into 'workload'	2018-05-15 10:22:50 -07:00
SamGondelman	de4a2ca3b2	update procedural skybox on user data change	2018-05-10 18:44:53 -07:00
Clément Brisset	39e2a78b1a	Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist ... Multifrustum queries punchlist	2018-05-04 15:50:44 -07:00
John Conklin II	32086def18	Merge pull request #13091 from samcake/blue ... Master: Fixing the strobing light effect, aka Translucent lighting by ponctual lights	2018-05-04 10:25:57 -07:00
Clement	27c471ee97	Move all wire frustums to conical frustums	2018-05-03 18:19:29 -07:00
samcake	767e6b15f3	Fixing the local lighting on translucents bug	2018-05-03 11:42:06 -07:00
samcake	60a49c3f7c	applying the local lights on translucent fix	2018-05-03 10:37:29 -07:00
Andrew Meadows	99a75c5a87	Merge 'master' into 'workload'	2018-05-02 17:28:36 -07:00
Clement	538f24162f	Define ViewFrustums type alias	2018-05-01 18:03:21 -07:00
Clement	21213e81f4	Multiview support for priority queue	2018-05-01 18:03:21 -07:00
Brad Davis	8e42bb8c87	Restore the stop functionality for a browser view when it's being destroyed	2018-04-27 17:35:38 -07:00
Bradley Austin Davis	acb21cc96a	Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"	2018-04-27 10:50:47 -07:00
Brad Davis	e892694bf5	Don't modify URL on web entity on QML shutdown, remove tablet related code from web entity	2018-04-27 08:13:35 -07:00
samcake	5db3eee4ad	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-25 15:21:43 -07:00
samcake	33bbbcef83	Merging with master	2018-04-24 11:49:34 -07:00
samcake	382161659e	Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork	2018-04-24 11:37:00 -07:00
Sam Gateau	2cae294ab4	Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate ... LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it	2018-04-24 11:22:48 -07:00
Brad Davis	861200db27	Attempt to shutdown web surfaces more consistently	2018-04-23 14:32:38 -07:00
Andrew Meadows	e36dbab838	remove unused data member	2018-04-23 12:08:40 -07:00
samcake	3d651de797	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-20 13:20:19 -07:00
Seth Alves	ba43640950	Merge pull request #12785 from birarda/bug/xcode-warnings ... fix some xcode warnings for unnecessary captured this	2018-04-20 10:30:27 -07:00
Olivier Prat	46a1ff4dd2	Set jitter to O on RenderableWebEntityItems	2018-04-20 12:02:17 +02:00
samcake	d6b6645630	exposing feedback of timing	2018-04-17 18:03:45 -07:00
samcake	b32be91bb1	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-16 13:22:58 -07:00
Sam Gateau	19aa49832b	Merge pull request #12750 from SamGondelman/androidPrimitives ... Forward pipelines for primitives	2018-04-16 11:18:56 -07:00
samcake	bfdde6513f	Mergin with master	2018-04-12 15:45:27 -07:00
SamGondelman	e0b2c076ef	cleanup and fix forward procedural rendering	2018-04-11 13:03:57 -07:00
SamGondelman	d841eeb6e9	Merge remote-tracking branch 'upstream/master' into androidPrimitives	2018-04-10 16:52:08 -07:00
SamGondelman	0c069574c5	forward pipelines for primitives	2018-04-10 15:56:08 -07:00
SamGondelman	bba47ba2b4	materials on client only entities	2018-04-10 11:35:24 -07:00
Sam Gateau	9cb918a4ad	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-09 20:03:26 -07:00
Sam Gateau	476b75488c	Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate ... Workload: low hanging fruit optimization: don't unneccessarily update() entities	2018-04-06 17:38:54 -07:00
Andrew Meadows	b515fd50fc	remove unused data member	2018-04-06 16:52:49 -07:00
SamGondelman	d38dadaf58	possible fix for qml texture leak	2018-04-06 09:34:00 -07:00
Andrew Meadows	ed1761945c	add/remove entities to physics using workload output	2018-04-06 07:22:05 -07:00
samcake	a5ee211dbf	Dirty attempt to capture the owner typefor a payload	2018-04-05 18:04:35 -07:00
Andrew Meadows	4f0980b94b	hook up prototype PhysicsBoundary job	2018-04-05 12:11:57 -07:00
Stephen Birarda	3a8c9de4fb	fix some xcode warnings for unnecessary captured this	2018-04-04 10:38:32 -07:00
samcake	fa35d659dc	Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload	2018-04-03 17:56:41 -07:00
samcake	59a081bcdb	merge with upstream	2018-03-30 18:08:38 -07:00
SamGondelman	5a7e9d8e3e	fix shadows on primitives	2018-03-30 09:48:04 -07:00
John Conklin II	2d63afbe28	Merge pull request #12588 from SamGondelman/shapeTex ... Materials on primitives	2018-03-21 12:08:24 -07:00
Cristian Luis Duarte	17fddd9e0e	RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface	2018-03-19 15:33:14 -03:00
Cristian Luis Duarte	ee6c65c1ac	Android - Prevent crash when setting the url property to _webSurface.	2018-03-16 12:03:26 -03:00
Andrew Meadows	3a3bc62bd0	Merge pull request #12636 from samcake/workload ... Workload: Applying the transaction model to the Space & Proxies	2018-03-14 16:53:24 -07:00
Brad Davis	baa4dc3383	Don't leave trash web processes when changing web entity urls	2018-03-14 11:38:46 -07:00
samcake	2af88c11f2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-13 13:35:31 -07:00
SamGondelman	4adc357534	apply taa to text and web entities/overlays	2018-03-13 11:57:14 -07:00
samcake	7f8948fcce	Merge branch 'workload-master' of github.com:samcake/hifi into workload	2018-03-13 10:49:31 -07:00
samcake	f8acca76e2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-13 09:31:50 -07:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
Sam Gateau	a2993c7cdb	First version wof space working with Transaction & Collection	2018-03-13 01:45:21 -07:00
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 ... Entities API JSDoc	2018-03-12 14:40:09 -07:00
samcake	9bec8cdd0b	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-12 12:01:00 -07:00
Olivier Prat	aad571f6bd	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-03-12 14:22:57 -04:00
Sam Gateau	e3c8b9c62d	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis	2018-03-09 22:24:58 -08:00
Andrew Meadows	2750f3ee71	remove unused cruft and avoid useless work	2018-03-09 08:35:18 -08:00
Olivier Prat	da6bd92ff6	Merged with master	2018-03-09 10:07:25 +01:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
samcake	a0db5c6135	Merge with master	2018-03-08 15:35:58 -08:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
Sam Gateau	dc122b4ce8	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-07 18:14:44 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
SamGondelman	96e48a0162	warnings	2018-03-07 13:50:51 -08:00
SamGondelman	19e4fb2355	materials on primitives	2018-03-07 12:22:17 -08:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
samcake	d4d5f3a7f0	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-02 08:50:47 -08:00
NissimHadar	000b08f7c0	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
NissimHadar	0f2cf8ea85	Re-implemented shadow controls.	2018-03-01 14:24:20 -08:00
Andrew Meadows	7a852a0e31	clear the Space	2018-03-01 12:11:30 -08:00
Andrew Meadows	67c78a2df1	remember list of stale proxies	2018-03-01 10:21:25 -08:00
Andrew Meadows	3ca21dda67	Merge hifi/master of into hifi/workload	2018-02-28 10:28:31 -08:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
SamGondelman	cc53b338db	Merge remote-tracking branch 'upstream/master' into scriptableMaterials	2018-02-27 13:30:03 -08:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
John Conklin II	48f0cded05	Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting ... Leopoly_Phase1_010 Graphics Scripting	2018-02-27 07:53:25 -08:00
Olivier Prat	2d71d7da9f	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-02-27 09:11:43 +01:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
SamGondelman	6fe2d46d7c	merge	2018-02-26 12:40:14 -08:00
Anthony J. Thibault	f5fcaae283	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-26 10:55:44 -08:00
Brad Davis	5aa15b5422	Fixing build warnings	2018-02-26 10:17:07 -08:00
humbletim	f824edd04e	* remove Model_temporary_hack ... * split gpuhelpers and mesh part * fix objwriter * more work on bufferview helpers * cr cleanup	2018-02-26 04:58:22 -05:00
SamGondelman	b56f755034	material reflection	2018-02-23 17:58:46 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
humbletim	6ea4b660b7	CR feedback; remove ok bool pointer and all metadata; cleanup	2018-02-23 07:47:39 -05:00
Anthony J. Thibault	0469eafbe4	Switch between dualQuats and matrix skinning based on model entity scale factor.	2018-02-22 18:35:16 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
humbletim	ec4f9fdc11	fix displayName	2018-02-22 08:31:05 -05:00
humbletim	4fd3d9bf7b	cleanup; formalize data structures	2018-02-22 08:18:38 -05:00
humbletim	e4a2a589a5	CR fedback and cleanup	2018-02-22 07:56:09 -05:00
humbletim	72fca7e57e	Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge	2018-02-22 05:18:05 -05:00
humbletim	be8d79f53f	CR fedback and cleanup	2018-02-22 05:15:01 -05:00
Nissim Hadar	bf4ba07b72	Added parameters to canCastShadow - still sucks.	2018-02-21 12:36:34 -08:00
samcake	33b47f9ae2	Merging with the actual worloadspace managed from the EntityTreeRenderer	2018-02-21 10:34:58 -08:00
Olivier Prat	f53c2f41a5	Merge branch 'master' of http://github.com/highfidelity/hifi into prev	2018-02-21 09:46:38 +01:00
Andrew Meadows	c3d08d06ff	remove cruft	2018-02-20 17:50:12 -08:00