4588 commits

Author	SHA1	Message	Date
James B. Pollack	76487bca7a	updates	2015-12-14 13:01:03 -08:00
James B. Pollack	4d9cb6a6df	other variations	2015-12-14 11:41:34 -08:00
James B. Pollack	e43b60f9f5	other variations	2015-12-14 11:40:47 -08:00
James B. Pollack	a0b698c028	reorg props	2015-12-12 17:33:54 -08:00
James B. Pollack	0ddc2ba76e	rename lasers to lines	2015-12-12 16:18:15 -08:00
James B. Pollack	fe05542440	more vis	2015-12-12 14:30:34 -08:00
James B. Pollack	70a0e51cc9	back to default state	2015-12-11 17:59:03 -08:00
James B. Pollack	1b1edf6f7a	actually delete lights now that it doesnt crash	2015-12-11 17:23:35 -08:00
James B. Pollack	11aaeb1ec0	only create particle beams if set	2015-12-11 14:48:07 -08:00
James B. Pollack	4e9d81f187	add support for various beam visualizations	2015-12-11 11:38:16 -08:00
James B. Pollack	2acc0df1f0	beams with spotlights	2015-12-10 17:39:29 -08:00
James B. Pollack	16ab7e74de	cleanup spotlights	2015-12-10 16:53:13 -08:00
James B. Pollack	efaa30a509	rotatable light	2015-12-10 16:18:40 -08:00
James B. Pollack	9fc456697e	merge	2015-12-10 14:30:55 -08:00
James B. Pollack	c3e9cde7fb	beamz	2015-12-10 13:44:53 -08:00
James B. Pollack	1000b60280	far beams	2015-12-10 12:21:50 -08:00
James B. Pollack	31526091d3	create beams at start	2015-12-10 11:13:35 -08:00
Brad Hefta-Gaub	92d1038871	Merge pull request #6590 from imgntn/particle_explorer_updates ... Update Particle Explorer to Ignore New Parenting Properties	2015-12-10 07:43:40 -08:00
Brad Hefta-Gaub	27d28900a4	Merge pull request #6580 from imgntn/parented_flashlight ... Update Flashlight to use Parenting	2015-12-10 07:43:10 -08:00
Brad Hefta-Gaub	1512703182	Merge pull request #6593 from Atlante45/master ... Update toys relativeRotation/Position	2015-12-10 07:37:08 -08:00
Brad Hefta-Gaub	bd1ab418a4	Merge pull request #6606 from hyperlogic/tony/remove-animation-start-automatically-property ... [PROTOCOL CHANGE] Entities: Removed Start Automatically property from Animation Group	2015-12-10 07:35:55 -08:00
Anthony J. Thibault	e9f529bf12	Entities: Removed Start Automatically property from Animation Group ... There is an issue when startAutomatically was set to true and animationPlaying was set to false. This would cause clients to play the animation when they connected to the entity server, even though the server was not.	2015-12-09 17:59:56 -08:00
James B. Pollack	1134d12ea0	particles	2015-12-09 16:08:32 -08:00
Atlante45	17daff920c	Fix all entities using relative grab pos/rot	2015-12-09 14:25:18 -08:00
Atlante45	4ee5bf316a	Fix bow offsets	2015-12-09 14:25:18 -08:00
Atlante45	65bc6aa371	Fix left hand grab	2015-12-09 14:25:18 -08:00
James B. Pollack	2fb318cc53	work with clements branch	2015-12-08 17:52:23 -08:00
Philip Rosedale	bda4e41958	Merge pull request #6581 from kencooke/audio-reverb ... New reverb parameters	2015-12-08 14:59:58 -08:00
James B. Pollack	22a1ee83e6	ignore parenting properties	2015-12-08 10:39:04 -08:00
Seth Alves	71a5dfc4d6	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-07 17:04:02 -08:00
Leonardo Murillo	5d789095b5	Merge pull request #6570 from ctrlaltdavid/20740 ... Update Leap Motion script to use animation state handlers	2015-12-07 16:37:42 -08:00
Seth Alves	982e986f1a	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-07 14:31:18 -08:00
Seth Alves	f99812a903	adjust method names to fit convention	2015-12-07 14:31:08 -08:00
Leonardo Murillo	25494ec867	Merge pull request #6562 from Atlante45/baseball ... Baseball	2015-12-07 14:11:21 -08:00
Atlante45	84bc947854	Typo	2015-12-07 14:00:06 -08:00
Ken Cooke	90ef92c79b	Fix slider layout	2015-12-07 13:34:55 -08:00
Ken Cooke	4803b3bd9f	Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb	2015-12-07 13:08:21 -08:00
Ken Cooke	8683bb5002	New reverb parameters	2015-12-07 13:05:30 -08:00
James B. Pollack	27ce0a36d3	cleanup logging	2015-12-07 12:20:06 -08:00
James B. Pollack	e9f21b4dba	make lights parented to flashlight instead of updated in loop	2015-12-07 11:30:10 -08:00
Ryan Huffman	9d47ac000e	Merge pull request #6479 from thoys/editjs-left-click ... No more right-click-move editing in edit.js	2015-12-07 08:29:01 -08:00
Thijs Wenker	22bdc1ae84	Make it possible to use the focus-right-click-drag-camera in the edit.js script again. Still keep right-clicking ignore Toolbar and entity selection events.	2015-12-07 13:49:49 +01:00
Seth Alves	f0fb9966ad	expose parent-joint-index to edit.js	2015-12-06 12:34:41 -08:00
James B. Pollack	378b71d701	dont spin by default	2015-12-05 17:51:55 -08:00
James B. Pollack	7859241ad3	spin the earth for fun	2015-12-05 17:43:13 -08:00
James B. Pollack	906540272e	disable collisions for now because of shapetype	2015-12-05 17:39:43 -08:00
James B. Pollack	30b32765b9	make earth grabbable to show parenting	2015-12-05 17:32:02 -08:00
James B. Pollack	ade32cbf61	remove collisions and add parenting	2015-12-05 17:30:38 -08:00
James B. Pollack	a899fe0e1b	fix typo	2015-12-05 17:26:11 -08:00
James B. Pollack	945b5bd00f	cleanup	2015-12-05 17:11:27 -08:00