3683 commits

Author	SHA1	Message	Date
James B. Pollack	31f1dfe25c	good two handed stuff	2015-10-20 13:35:28 -07:00
James B. Pollack	b29f0b13a9	Merge branch 'master' into bow	2015-10-20 12:22:25 -07:00
James B. Pollack	8f0cc42859	normalize line endings	2015-10-20 12:22:12 -07:00
James B. Pollack	a4166fd1c3	bow stuff	2015-10-20 10:54:24 -07:00
Brad Hefta-Gaub	dfe3e5b1cb	fix laser lifetimes	2015-10-20 09:30:27 -07:00
James B. Pollack	1daeedec9b	end of day	2015-10-19 18:04:08 -07:00
Seth Alves	41f7ef1e2e	cleanups	2015-10-19 16:53:27 -07:00
Seth Alves	6138775270	put back support for spatialKey	2015-10-19 15:40:14 -07:00
Seth Alves	5a968e3c96	tweak	2015-10-19 15:20:04 -07:00
Seth Alves	8fbf081223	git rid of sphere test	2015-10-19 14:51:18 -07:00
James B. Pollack	3ddfce911e	bow, arrow, createbow	2015-10-19 01:37:47 -07:00
James B. Pollack	62206b747f	bow work	2015-10-19 01:07:27 -07:00
James B. Pollack	2158af0fe3	making a bow	2015-10-18 22:26:50 -07:00
Seth Alves	353f92f1ba	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-17 13:09:52 -07:00
James B. Pollack	31cc451fd4	css cleanup	2015-10-16 16:42:29 -07:00
James B. Pollack	c6fcaf158b	add color to more props	2015-10-16 16:15:20 -07:00
James B. Pollack	aa6aaf912e	add color bars below position inputs	2015-10-16 16:07:20 -07:00
Seth Alves	aaad1a4a36	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-16 14:34:21 -07:00
James B. Pollack	4b21bdf308	testing	2015-10-16 11:50:13 -07:00
Seth Alves	c98685f6d3	in STATE_CONTINUE_FAR_GRABBING_NON_COLLIDING, when the ray moves off of the entity, switch back to search state	2015-10-16 11:39:27 -07:00
Seth Alves	066696e201	don't go into continue-far-grabbing-non-colliding mode.	2015-10-16 11:18:41 -07:00
Brad Hefta-Gaub	26f82e899e	Merge pull request #6079 from ericrius1/whiteboard ... Entity whitelist for raypicking and whiteboard painting example	2015-10-15 17:50:35 -07:00
Brad Hefta-Gaub	c3ee419ad7	Merge pull request #6086 from imgntn/flashlight_life ... [Scripts] Add lifetime to lights created by flashlight	2015-10-15 17:42:57 -07:00
ericrius1	97fe0170cb	glowing box for black color	2015-10-15 17:09:41 -07:00
ericrius1	e8b6b32572	Remembering whiteboards last color between sessions	2015-10-15 14:12:15 -07:00
ericrius1	dc6875f5b5	Strokes moving forward to avoid zfighting and incorrect overlaps	2015-10-15 11:50:23 -07:00
ericrius1	3b59bffb79	Deleting only strokes from the whiteboard where the erase button was clicked on	2015-10-15 11:38:18 -07:00
Seth Alves	c884f466bc	adjust timing of action refresh	2015-10-15 10:40:58 -07:00
ericrius1	55c68e0509	Merge branch 'master' into whiteboard	2015-10-15 10:08:32 -07:00
James B. Pollack	d8c979b9d4	add lifetime to lights created by flashlight	2015-10-15 10:07:21 -07:00
Seth Alves	c96f7562f2	Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes	2015-10-15 09:28:57 -07:00
Thijs Wenker	c99573ea64	Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now!	2015-10-15 15:35:35 +02:00
Thijs Wenker	8111432088	Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX	2015-10-15 14:50:20 +02:00
ericrius1	87439a049e	Made color indicator thinner	2015-10-14 17:22:46 -07:00
ericrius1	5082ac4583	Added color status bar	2015-10-14 16:46:23 -07:00
ericrius1	4c709cba35	Fixed color indicator position	2015-10-14 16:17:57 -07:00
ericrius1	cfca0fe8c0	Adding a color indicator to whiteboard	2015-10-14 15:58:18 -07:00
Eric Levin	0b92bc11f6	fixed spacing	2015-10-14 13:26:10 -07:00
ericrius1	eb7b720945	got rid of whitespace	2015-10-14 13:24:22 -07:00
ericrius1	db5f7cac8d	Fixed name of whiteboard entity script URL	2015-10-14 12:03:10 -07:00
ericrius1	c63ef10c67	got rid of query string	2015-10-14 11:50:35 -07:00
ericrius1	0991be3255	got rid of printing statements	2015-10-14 11:44:47 -07:00
ericrius1	22615dae07	Don't delete board on script close	2015-10-14 11:43:05 -07:00
ericrius1	6cd9bf407f	Reverted handControllerGrab	2015-10-14 11:40:06 -07:00
ericrius1	7fb6b7e272	Reverted hand controller	2015-10-14 11:31:09 -07:00
ericrius1	d072a2efd3	laser pointer now showing up all the time	2015-10-14 11:26:38 -07:00
ericrius1	1a9c1110c0	Fixed gap between strokes	2015-10-14 11:17:54 -07:00
ericrius1	20d1a2440c	Ignoring unknown types in collision	2015-10-14 11:15:49 -07:00
ericrius1	caacbcbe78	Adjust erase box position	2015-10-14 10:40:55 -07:00
Seth Alves	2a9b1c0fc3	fix refresh of hold action	2015-10-14 09:31:29 -07:00