158 commits

Author	SHA1	Message	Date
Seth Alves	a66a1d392e	hack to avoid crash	2016-11-18 15:24:19 -08:00
Seth Alves	1714d4fe06	fix build	2016-11-18 05:40:57 -08:00
Seth Alves	8530156227	experimenting	2016-11-17 16:06:35 -08:00
Seth Alves	1eb17b9786	fix bug that caused polyvox rendering to mishandle its gpu buffers	2016-11-17 14:11:09 -08:00
Seth Alves	697369dece	avoid crash on startup	2016-11-16 16:11:17 -08:00
Seth Alves	a14ff22df3	update render-land bounds when polyvox moves	2016-11-16 15:10:43 -08:00
Seth Alves	d097fa7982	fix polyvox memory leak	2016-11-16 14:10:50 -08:00
Seth Alves	d0c0cdd82f	polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again	2016-11-02 16:31:34 -07:00
Brad Davis	ecfe56085d	GLM update and GLI integration	2016-09-09 10:18:15 -07:00
Andrew Meadows	9fc77ccfa2	use reference to avoid big copy	2016-06-20 17:29:20 -07:00
Andrew Meadows	d64729372a	ShapeInfo name changes	2016-06-20 17:29:20 -07:00
Seth Alves	f90b9ec65d	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-10 12:08:45 -07:00
Seth Alves	91ff851bf8	fix call to queueEditEntityMessage	2016-05-07 16:59:54 -07:00
Seth Alves	a0771f8ee5	use smart pointers for entity simulations	2016-05-07 09:14:33 -07:00
Andrew Meadows	b5ad989811	more optimized uses of EntityItem::getDimensions()	2016-04-27 11:04:22 -07:00
Seth Alves	f3ba16ab3e	fix locking around polyvox state flags	2016-03-25 14:06:57 -07:00
Seth Alves	ae6d6f4bb3	added comments, minor cleanups	2016-03-24 21:37:46 -07:00
Seth Alves	1b88284bf7	more threading cleanups	2016-03-24 19:14:25 -07:00
Seth Alves	f8fe7b5868	add back getMesh call	2016-03-24 17:22:34 -07:00
Seth Alves	6abed67c05	cleanups	2016-03-24 15:46:30 -07:00
Seth Alves	7c910fcf5e	further reworking of polyvox threading	2016-03-24 15:28:19 -07:00
Seth Alves	462da3aaf3	don't call getMesh from render	2016-03-23 22:46:43 -07:00
Seth Alves	2d7f32a554	redo polyvox locking	2016-03-23 22:03:27 -07:00
Seth Alves	5c585acd9a	offset is included in shape key for models	2016-03-06 14:29:30 -08:00
Seth Alves	dcb720a832	fix polyvox hull when registration changes.	2016-03-06 14:09:45 -08:00
Seth Alves	8bc2c76a8b	change shape-key when registration point changes so shape cache doesn't incorrectly reuse the old shape	2016-03-05 08:01:30 -08:00
Seth Alves	9346171695	if entity registration isn't default, adjust physics shapes to match	2016-03-04 16:47:30 -08:00
samcake	1c53f9bc87	Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly	2016-02-23 10:40:50 -08:00
Atlante45	11dc3cd261	Move primitive rendering out of DeferredLightingEffect	2016-01-13 11:47:43 -08:00
Seth Alves	10b82945a6	formatting	2015-12-16 10:16:01 -08:00
Seth Alves	008065ba38	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-14 09:15:56 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Atlante45	eb8fc2e156	Fix last of the windows warnings	2015-12-11 17:37:36 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Brad Hefta-Gaub	d07629489c	Merge pull request #6543 from Atlante45/pointer ... gpu::Shader::create* return shared_ptr	2015-12-04 11:17:02 -08:00
Atlante45	3da80f5861	gpu::Shader::create* return shared_ptr	2015-12-03 14:56:07 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Seth Alves	4646c0c103	unmangle merge	2015-11-21 10:49:31 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Anthony J. Thibault	a77ea8da43	Removed JointStates! You won't be missed.	2015-11-20 14:15:37 -08:00
Seth Alves	f07d5d9d3f	show network and physics status on boxes and spheres	2015-11-11 11:32:12 -08:00
Seth Alves	39b92d2b52	terse log when ownership changes	2015-11-10 17:06:12 -08:00
Seth Alves	bc516c0b86	use render-item status getters to display physics debugging information	2015-11-06 11:32:56 -08:00
Seth Alves	61269c3ce8	fix up entity constructors so that setProperties isn't called during the constructor	2015-10-23 13:52:50 -07:00
Seth Alves	d86d69aeba	keep track of children. use local position and orientation on the wire.	2015-10-22 15:36:03 -07:00
Andrew Meadows	fa17b77d70	move DIRTY_FLAGS out of EntityItem namespace	2015-10-15 09:34:09 -07:00
Brad Hefta-Gaub	430cbcca7e	first cut at adding surface normals to ray intersection	2015-09-27 21:57:50 -07:00
Seth Alves	31fcd55d47	octree uses shared pointers	2015-09-08 11:59:48 -07:00
Seth Alves	1b92ae95d7	put glm:: before vec3	2015-09-04 09:41:53 -07:00
Seth Alves	07b241c778	code review	2015-09-03 11:05:44 -07:00