25895 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	429cc631f3	limit size of polyvox data property to below MTU	2015-05-27 09:48:32 -07:00
Seth Alves	3af916e27e	use enum for polyvox surface style	2015-05-27 09:32:10 -07:00
Howard Stearns	4b4bf9fd90	Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples	2015-05-27 09:29:06 -07:00
Brad Hefta-Gaub	afb09e81a6	Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts ... Entity events in normal scripts	2015-05-27 09:24:50 -07:00
andrew	2a6955ce12	fix windows build	2015-05-27 09:14:11 -07:00
Seth Alves	1749ec83db	adapting to entitypointer merge	2015-05-27 09:00:59 -07:00
Seth Alves	f310da9cd3	adapting to entitypointer merge	2015-05-27 08:59:44 -07:00
Seth Alves	b02e452b19	adapting to entitypointer merge	2015-05-27 08:58:03 -07:00
Seth Alves	c1f75506ae	adapting to entitypointer merge	2015-05-27 08:57:22 -07:00
Seth Alves	df795cf296	adapting to entitypointer merge	2015-05-27 08:54:15 -07:00
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
Andrew Meadows	39d8244255	use highfideltiy style for class data member names	2015-05-26 22:59:29 -07:00
Andrew Meadows	708203089c	replace tabs with spaces	2015-05-26 22:53:57 -07:00
Andrew Meadows	efbb9b0238	rewritten MassProperties with complete unit tests	2015-05-26 22:48:45 -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
Brad Davis	e8868478d2	Merge branch 'plugins_pt3' into plugins ... Conflicts: CMakeLists.txt	2015-05-26 20:34:46 -07:00
Brad Davis	09085f1cd9	Working towards display plugins	2015-05-26 18:42:38 -07:00
Brad Davis	dd87707c7b	Merge remote-tracking branch 'upstream/master' into plugins	2015-05-26 18:36:12 -07:00
Seth Alves	cd2b6473ba	debugging	2015-05-26 18:21:45 -07:00
Brad Davis	b5e6b737c4	Working on display plugins	2015-05-26 17:32:41 -07:00
Seth Alves	517d4372fa	debugging	2015-05-26 16:53:11 -07:00
Stephen Birarda	9cb6ccaa46	thread safe timing of domain connection	2015-05-26 16:49:18 -07:00
Eric Levin	3fb5476968	added blockWorld script to generate floor of tiles and drop jenga blocks at random points above floor	2015-05-26 16:46:01 -07:00
Seth Alves	0ecd60a489	update voxel mesh when new data arrives from the wire	2015-05-26 16:45:29 -07:00
Eric Levin	579c62420d	added header to pointer script	2015-05-26 16:43:34 -07:00
Eric Levin	7194d4a4da	modified pointer script to allow users to draw on surfaces	2015-05-26 16:40:47 -07:00
Seth Alves	55028f6cb0	voxel data sent over wire and saved to json	2015-05-26 16:34:35 -07:00
Stephen Birarda	08affbfd0d	fix table size calculations	2015-05-26 16:14:12 -07:00
Stephen Birarda	5b5518077d	fix headers and stats for domain connection timing	2015-05-26 15:51:00 -07:00
Stephen Birarda	61029fd0b1	add ability to display domain connection times	2015-05-26 15:22:25 -07:00
Stephen Birarda	857552ae0b	don't hold back link event for account connect	2015-05-26 15:16:23 -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
Stephen Birarda	d1489c50fe	add connection times getter to NodeList	2015-05-26 14:18:58 -07:00
Stephen Birarda	626f22191c	add a QAbstractTableModel for domain connection steps	2015-05-26 14:17:02 -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
Howard Stearns	ae73e68f7b	Update header.	2015-05-26 13:27:37 -07:00
Howard Stearns	14990f29cb	Merge branch 'entity-events-in-normal-scripts' of https://github.com/howard-stearns/hifi into remove-global-collision-and-update-examples	2015-05-26 13:26:27 -07:00
Howard Stearns	3c718af43f	Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples	2015-05-26 13:26:02 -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
Howard Stearns	3a7a290094	Uglify conditional returns. :-)	2015-05-26 11:38:36 -07:00