8972 commits

Author	SHA1	Message	Date
Seth Alves	c80f2970fd	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 07:37:51 -07:00
Seth Alves	0f81445cee	flag for polyvox to select minecraft vs walking-cubes. uppack to unpack	2015-05-27 07:04:44 -07:00
Seth Alves	6930008f74	remove debugging spew	2015-05-26 21:40:50 -07:00
Seth Alves	6b5020285b	set last-edited in properties when changing voxel data	2015-05-26 21:32:33 -07:00
Seth Alves	5acc018bda	debugging	2015-05-26 20:58:23 -07:00
Seth Alves	ebae87136f	debugging	2015-05-26 20:57:58 -07:00
Seth Alves	cd2b6473ba	debugging	2015-05-26 18:21:45 -07:00
Seth Alves	517d4372fa	debugging	2015-05-26 16:53:11 -07:00
Seth Alves	0ecd60a489	update voxel mesh when new data arrives from the wire	2015-05-26 16:45:29 -07:00
Seth Alves	55028f6cb0	voxel data sent over wire and saved to json	2015-05-26 16:34:35 -07:00
Seth Alves	66760afadb	quiet compiler	2015-05-26 14:27:22 -07:00
Seth Alves	22cc298861	Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox	2015-05-26 14:26:11 -07:00
Seth Alves	cdef502e2e	expose setVoxelSphere to js	2015-05-26 14:26:05 -07:00
Seth Alves	28e052ffdb	Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox	2015-05-26 14:12:11 -07:00
Seth Alves	728e6d121b	changes sam made to get normals to work on a mesh	2015-05-26 14:12:01 -07:00
Andrew Meadows	16e5710325	Merge pull request #4954 from ZappoMan/entitysmartpointers ... EnitityItem smart pointers	2015-05-26 14:05:03 -07:00
Seth Alves	1ec384ab4d	allow QByteArray data to be sent with a length. Use appendRawData in places that used to append raw byte-arrays	2015-05-26 13:43:22 -07:00
Seth Alves	988ecf9d55	send PolyVox voxel dimensions and compressed data over the wire	2015-05-26 13:18:52 -07:00
Seth Alves	ed6fdcfb31	add QByteArray data uppacking	2015-05-26 13:18:25 -07:00
Seth Alves	d71921fd03	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-26 10:46:02 -07:00
Seth Alves	92c55d69ba	Merge pull request #4944 from AndrewMeadows/bispinor ... avatar-avatar collisions work again	2015-05-26 10:36:54 -07:00
ZappoMan	c4f96b09a2	sam's feedback on shared pointers in master	2015-05-26 09:55:28 -07:00
Seth Alves	59f68f5625	added voxel-data compression code to see what the sizes are like	2015-05-26 09:52:18 -07:00
ZappoMan	c92e7bed87	andrews CR feedback	2015-05-26 09:44:02 -07:00
Seth Alves	a251ae7f50	far is a reserved word	2015-05-26 09:06:51 -07:00
Seth Alves	727f457f91	hook up RenderablePolyVoxEntityItem::findDetailedRayIntersection to polyvox library's version	2015-05-25 21:01:20 -07:00
samcake	ffca6a6502	Merge pull request #4935 from sethalves/sam-model-fixes ... fixes Sam made in my branch while trying to get a mesh to render	2015-05-25 16:39:25 -07:00
Seth Alves	9735174036	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-25 15:37:23 -07:00
Atlante45	9e121aa387	Fix incorrect scale constants	2015-05-23 20:13:14 +02:00
ZappoMan	76c5bd1ab7	verify that entityitem cleanup is happening correctly	2015-05-22 22:01:25 -07:00
ZappoMan	9fa9942861	more work on smart pointers	2015-05-22 21:45:57 -07:00
ZappoMan	8b78fc4190	EnitityItem smart pointers	2015-05-22 17:57:50 -07:00
Seth Alves	6c67d14fbc	experimenting with physics	2015-05-22 16:21:09 -07:00
Seth Alves	e702518041	adjust logic around timestamps used by entity-server to know if something was sent. adjust which physics variables are adjusted by a non-sim-owner packet	2015-05-22 16:11:29 -07:00
David Rowe	a01830f8f8	Fix some double to float conversion warnings in Windows builds	2015-05-22 12:32:02 -07:00
Andrew Meadows	461d08c0a9	merge upstream/master into andrew/bispinor	2015-05-22 11:35:02 -07:00
Andrew Meadows	bf225e4886	fix bug masking physics shape changes	2015-05-22 11:33:45 -07:00
Andrew Meadows	0431e8da36	put avatar body in right spot, and give it mass	2015-05-22 11:08:56 -07:00
Seth Alves	380fed7aee	metersToVoxelCoordinates and voxelCoordinatesToMeters	2015-05-22 10:37:48 -07:00
Clément Brisset	e276926608	Add include/remove duplicate type	2015-05-22 18:23:42 +01:00
Atlante45	c6ce5e7680	PerformanceTimer deactivated when not in use	2015-05-22 18:54:40 +02:00
Seth Alves	ed082800f5	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-22 08:38:22 -07:00
Eric Levin	fe99941de3	fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp	2015-05-21 19:35:27 -07:00
Seth Alves	258e3b901d	fixes Sam made in my branch while trying to get a mesh to render	2015-05-21 18:20:52 -07:00
Seth Alves	1100c832eb	clean up diff	2015-05-21 18:18:04 -07:00
Seth Alves	f85cc89946	clean up diff	2015-05-21 18:17:07 -07:00
Seth Alves	a882fc7fb1	pull out common parts of the two sphere-in-volumes	2015-05-21 18:07:46 -07:00
Seth Alves	8b2d570f3f	clearSphereInVolume	2015-05-21 17:04:57 -07:00
Seth Alves	478cb40135	draws in the right place, now	2015-05-21 16:46:27 -07:00
Seth Alves	2cb73b5430	added a volex-volume size member variable. drawing transform still isn't quite right	2015-05-21 16:31:01 -07:00