5407 commits

Author	SHA1	Message	Date
ericrius1	ddae2d4f74	only erase stroke map on release and preload	2016-02-25 15:00:54 -08:00
ericrius1	4de951242c	eraser positioned correctly	2016-02-25 14:54:34 -08:00
ericrius1	22a5f3dcc0	wait even longer	2016-02-25 14:28:48 -08:00
ericrius1	338427ed3e	wait longer before sending message	2016-02-25 14:28:35 -08:00
ericrius1	e9ad06fca7	removed query string	2016-02-25 14:25:12 -08:00
ericrius1	ef85d0451a	removed files that shouldn't be there	2016-02-25 14:24:06 -08:00
ericrius1	67ec1732b3	increased eraser range	2016-02-23 18:46:38 -08:00
ericrius1	0ff8201994	fixed line gaps	2016-02-23 18:45:41 -08:00
ericrius1	045d542f11	lines no longer disapear after drawing for a while	2016-02-23 18:03:38 -08:00
ericrius1	0b569a0fab	only show overlay if within painting range	2016-02-23 16:49:03 -08:00
ericrius1	d1d4a9d6b1	adjusted surface position	2016-02-23 14:48:45 -08:00
ericrius1	5e0de4bdee	tweaks	2016-02-23 12:16:22 -08:00
ericrius1	4b45fd2d4d	Merge branch 'master' into whiteboardV2	2016-02-23 12:15:59 -08:00
ericrius1	a2ece772ef	refactor for laser pointer	2016-02-23 12:08:51 -08:00
ericrius1	8d058c2bb3	eraser working	2016-02-23 11:53:27 -08:00
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
Ryan Huffman	e6ccf501fa	Merge pull request #7135 from zzmp/fix/grid ... Update renderGrid to use a shader, and fix grid edit tools	2016-02-22 12:58:23 -08:00
Chris Collins	f24e4bc6b1	Merge pull request #7152 from sethalves/fix-touch ... fix grab-script touch	2016-02-22 09:58:29 -08:00
Brad Hefta-Gaub	cbe80bffd6	go into away mode if you the HMD loses mouse capture	2016-02-21 12:57:14 -08:00
Seth Alves	5f79500e4d	fix grab-script touch	2016-02-21 09:37:43 -08:00
Brad Hefta-Gaub	1a4591db58	Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking	2016-02-21 09:30:41 -08:00
Brad Hefta-Gaub	2810be8787	fix scripts to use new API	2016-02-19 17:57:49 -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
Zach Pomerantz	c9362a4073	Set grid major div min to 1	2016-02-19 15:58:08 -08:00
ericrius1	756b7e223d	need to figure out why only one marker working	2016-02-19 15:56:12 -08:00
Zach Pomerantz	5d78867197	Set grid height via global y-coord	2016-02-19 15:41:38 -08:00
Zach Pomerantz	d74aa4f14d	Rm extra , in gridControls	2016-02-19 14:54:19 -08:00
Howard Stearns	1d84bd17da	Merge pull request #7134 from ericrius1/acInjectors ... Injector Load Test script	2016-02-19 14:41:11 -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
Zach Pomerantz	fd6aa9a78b	Add layering to renderGrid, draw edit grid not layered	2016-02-19 13:57:32 -08:00
ericrius1	e4508e1d34	added comment and name	2016-02-19 12:06:08 -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
samcake	04543e7b0e	Merge pull request #7138 from zzmp/fix/render-debug ... Update render/debug.js	2016-02-19 10:10:43 -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
Ryan Huffman	69a953725e	Merge pull request #7132 from imgntn/edit-precision-things ... Revert step size change in edit.js	2016-02-19 08:20:04 -08:00
Brad Hefta-Gaub	d1e1067e5a	allow hydra mouse to know the correct size of screen to target	2016-02-18 22:30:31 -08:00
Zach Pomerantz	2dd1cf2f15	Update Render.fromJSON to Render.load	2016-02-18 18:21:26 -08:00