22747 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	d713d5596f	bump entity-data message version number	2015-03-07 20:32:28 -08:00
Seth Alves	b8cdf1a318	quiet warning	2015-03-07 20:31:53 -08:00
Seth Alves	804d4a0963	coding standard	2015-03-07 20:31:37 -08:00
Seth Alves	96d94e1b09	collision model url	2015-03-07 20:31:04 -08:00
Seth Alves	58bd8a5c65	collision model url	2015-03-07 20:30:29 -08:00
Seth Alves	bcfd1d8a89	collisionModelURL property	2015-03-07 20:27:20 -08:00
Seth Alves	630b5dd03b	collisionModelURL property	2015-03-07 20:27:02 -08:00
Seth Alves	9ec72e4902	quiet warning on linux	2015-03-07 20:25:46 -08:00
Seth Alves	cdeda67942	Collision Model url	2015-03-07 20:25:18 -08:00
Seth Alves	1bf8054cec	Collision Model	2015-03-07 20:24:50 -08:00
Seth Alves	f6948193f1	add fields for collision model url	2015-03-07 20:24:11 -08:00
Seth Alves	72ebae72c0	allow adding entities with model urls that end in .obj	2015-03-07 20:22:32 -08:00
Seth Alves	05e0fe3536	object display correctly now?	2015-03-07 11:28:30 -08:00
Seth Alves	3642e93b3f	keep triangles facing outward	2015-03-07 11:28:09 -08:00
Seth Alves	bb0f6b4d28	uninitialized variable	2015-03-07 11:27:52 -08:00
Seth Alves	b96e455b72	uninitialized variable	2015-03-07 11:27:27 -08:00
Seth Alves	f807384dfe	build a joint and caclulate extents. obj models now show up, though not correctly.	2015-03-07 07:55:04 -08:00
Seth Alves	d642b52de3	swap y and z coords because normal obj format has 3rd value as up	2015-03-07 07:54:19 -08:00
Seth Alves	adfacf1e98	adjust debugging prints	2015-03-07 07:53:45 -08:00
Seth Alves	4a7dd2b3e6	allow downloading of obj files	2015-03-07 07:53:25 -08:00
Seth Alves	d7c8f22246	stray control-Ms	2015-03-07 07:53:04 -08:00
Seth Alves	6772847d0b	make it so I don't have to count	2015-03-07 07:52:39 -08:00
Seth Alves	8a4339e57f	stray control-Ms	2015-03-07 07:52:20 -08:00
Seth Alves	591edc0527	_mesh instance variable doesn't appear to be in use.	2015-03-07 07:51:47 -08:00
Seth Alves	6e79fc8b68	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-06 18:46:13 -08:00
samcake	174e359c50	Merge pull request #4387 from ZappoMan/fbxFixes ... tweaks to hacks for detecting mixamo files	2015-03-06 17:25:19 -08:00
Brad Hefta-Gaub	c9dd96c98d	Merge pull request #4389 from birarda/master ... render application overlay only if enabled	2015-03-06 17:06:05 -08:00
Brad Hefta-Gaub	fd6f8c7792	Merge pull request #4382 from huffman/import-export ... Improvements to Import/Export entities	2015-03-06 16:31:57 -08:00
Stephen Birarda	a4963f1895	render application overlay only if enabled	2015-03-06 15:22:25 -08:00
Stephen Birarda	8eb93c2e01	Merge pull request #4388 from highfidelity/problem-patch-1 ... Update to .com instead of .io in Welcome dialog	2015-03-06 15:19:15 -08:00
Grayson Stebbins	7c78e598b8	Update to .com instead of .io in Welcome dialog	2015-03-06 15:15:48 -08:00
ZappoMan	ffab6ffe48	tweaks to hacks for detecting mixamo files	2015-03-06 15:11:02 -08:00
Seth Alves	858d15d0ba	obj reader sort-of works	2015-03-06 13:15:53 -08:00
Brad Hefta-Gaub	00b731a868	Merge pull request #4372 from sethalves/fix-assignment-client-monitor ... pass -t to children even if run in parent mode. monitor (parent) only i...	2015-03-06 12:08:32 -08:00
Philip Rosedale	6137ad90b6	Merge pull request #4385 from huffman/edit-slow ... Fix editEntities.js being very slow for some users	2015-03-06 12:07:04 -08:00
Ryan Huffman	b3631de93c	Remove print statements from entityList.js	2015-03-06 12:03:36 -08:00
Seth Alves	7a2977446a	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-06 08:47:05 -08:00
Clément Brisset	aed208a339	Merge pull request #4383 from huffman/fix-script-editor-icons ... Fix issue with Script Editor icons not showing up on first show	2015-03-06 06:02:50 -08:00
Seth Alves	0d093b4921	rename binary from vhacd to vhacd-util. vhacd-util outpus obj files	2015-03-05 15:38:55 -08:00
Ryan Huffman	299035bc85	Move script editor show() call to DialogsManager	2015-03-05 15:05:17 -08:00
Ryan Huffman	9247ccd7b3	Remove ExportMenu.js and ModelImporter.js	2015-03-05 13:55:22 -08:00
Ryan Huffman	08b905095d	Remove Paste Models and rename Import/Export to Entities	2015-03-05 13:54:27 -08:00
Ryan Huffman	a2617b2c96	Update editEntities import/export	2015-03-05 13:52:59 -08:00
Ryan Huffman	03c03a20f9	Update pasteEntities to use vec3	2015-03-05 13:52:30 -08:00
Ryan Huffman	6848025504	Add exporting by entity ID to Application	2015-03-05 13:36:16 -08:00
Ryan Huffman	71768ef275	Return entity IDs on paste	2015-03-05 12:36:45 -08:00
Ryan Huffman	a922619ebc	Add Clipboard.exportEntities that takes a list of entity IDs	2015-03-05 12:36:10 -08:00
Ryan Huffman	2c68d56059	Update Entity::sendEntities to return new entity ids	2015-03-05 12:34:05 -08:00
Seth Alves	034ceab4d3	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-05 06:39:03 -08:00
Seth Alves	af4957ff14	start to write out obj from vhacd	2015-03-05 06:38:42 -08:00