5350 commits

Author	SHA1	Message	Date
ericrius1	20fd79fc43	Lines markers	2016-02-23 11:25:46 -08:00
ericrius1	6682b9bd58	eraser is spawing	2016-02-23 10:36:17 -08:00
ericrius1	81ed89531d	whiteboard surface parented to whiteboard	2016-02-23 10:11:13 -08:00
ericrius1	b5ec79fd6d	marker only draws when equipped and held down	2016-02-23 09:53:20 -08:00
ericrius1	69dc9ef68f	added lifetime	2016-02-23 09:06:35 -08:00
ericrius1	ec36995908	moar whiteboard logging removal	2016-02-19 17:36:02 -08:00
ericrius1	6fe9730897	all three markers	2016-02-19 17:33:54 -08:00
ericrius1	68e289b433	Fixed bug where spawning one marker would destroy the other	2016-02-19 17:32:33 -08:00
ericrius1	756b7e223d	need to figure out why only one marker working	2016-02-19 15:56:12 -08:00
ericrius1	9ae1ccee50	passing marker color accross	2016-02-19 14:15:55 -08:00
ericrius1	40176b0424	no gaps	2016-02-19 14:06:55 -08:00
ericrius1	0564cd8145	returning if less than min distance	2016-02-19 12:02:34 -08:00
ericrius1	9a8b76df47	no more zfighting	2016-02-19 11:32:13 -08:00
ericrius1	94bf15f328	need to fix zfighting	2016-02-19 11:21:17 -08:00
ericrius1	b58026bf4b	max points	2016-02-19 11:04:17 -08:00
ericrius1	ddce8d5a3a	Marker basics working, now just need to tweak	2016-02-19 10:59:05 -08:00
ericrius1	8e9cd3ae2a	passing whiteboard in to marker	2016-02-19 10:38:13 -08:00
ericrius1	6765973a4a	correct positioning on equip	2016-02-19 09:56:30 -08:00
ericrius1	f4ee9acb9c	intersecting	2016-02-19 09:49:22 -08:00
ericrius1	39d4fbf19d	refactoring	2016-02-18 15:23:32 -08:00
ericrius1	728e8c763d	ray cast	2016-02-17 17:30:01 -08:00
ericrius1	7f23ee04be	basic marker entity script	2016-02-17 17:16:43 -08:00
ericrius1	df84a166e4	spawning marker tips- parenting to markers	2016-02-17 15:08:42 -08:00
ericrius1	073661b78d	markers in right spot	2016-02-17 14:25:21 -08:00
ericrius1	9e8d123b16	spawning marker and whiteboard correctly	2016-02-17 13:58:04 -08:00
ericrius1	bb2fd0072c	collision hull	2016-02-17 13:41:58 -08:00
ericrius1	bfc619497e	spawning model	2016-02-17 13:33:19 -08:00
James B. Pollack	f2445e81e0	Merge pull request #7110 from ericrius1/particlesInEdit2 ... Particles in edit	2016-02-16 18:33:01 -08:00
ericrius1	ce2d76d3f3	made export settings a text area	2016-02-16 17:57:09 -08:00
ericrius1	c43500f38a	added textures field to particle explorer	2016-02-16 15:36:03 -08:00
ericrius1	023fd0607d	added alpha start	2016-02-16 15:29:42 -08:00
ericrius1	d9d0e78dc5	button close	2016-02-16 15:21:18 -08:00
Chris Collins	05b9d88f08	Merge pull request #7108 from imgntn/moreprecision ... More precision for edit.js	2016-02-16 15:03:10 -08:00
ericrius1	bf21bc2d48	reworked exporting properties	2016-02-16 14:06:02 -08:00
ericrius1	ad43e4ff6d	Fixed multiple particle tabs appearing	2016-02-16 12:56:34 -08:00
ericrius1	46907f446b	Listening for page loaded event instead of set timeout === less lag	2016-02-16 11:42:01 -08:00
ericrius1	46679b29f7	particle tab deleted when particle system deleted	2016-02-16 11:11:58 -08:00
Andrew Meadows	f932999b2c	Merge pull request #7113 from zzmp/rm/draw-on-hud ... Remove drawOnHUD property from 3d overlays	2016-02-16 09:44:05 -08:00
Andrew Meadows	7dbb42c339	Merge pull request #7109 from zzmp/fix/edit-image-color ... Remove image color in edit.js	2016-02-16 09:27:06 -08:00
Zach Pomerantz	8c01d5f82b	Remove camera tool's 3d hud overlays	2016-02-15 14:03:57 -08:00
Chris Collins	bf52d30216	Merge pull request #7107 from ericrius1/spraypaintFix ... Fix for spraypaint orientation	2016-02-15 13:45:12 -08:00
ericrius1	f98941e80f	switching between particle entities	2016-02-15 12:52:05 -08:00
ericrius1	85d8fc2944	particle image	2016-02-15 11:56:41 -08:00
Zach Pomerantz	b8e8859761	Remove image color in edit.js ... This removes the warning generated by ImageOverlay.qml for the unhandled property, color.	2016-02-15 11:51:11 -08:00
James B. Pollack	72186f916c	more precision	2016-02-15 11:35:28 -08:00
ericrius1	80a368933f	Fix for spraypaint orientation	2016-02-15 11:13:06 -08:00
ericrius1	3adc88aa70	need to fix icon	2016-02-15 11:11:23 -08:00
ericrius1	e4d4044a2b	particleExplorer works in edit tab	2016-02-15 09:41:47 -08:00
samcake	545f276fdf	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-02-15 09:29:00 -08:00
ericrius1	b92c5555fe	Merge branch 'master' into particlesInEdit2	2016-02-15 09:14:37 -08:00