3708 commits

Author	SHA1	Message	Date
James B. Pollack	63d18acf91	bow updates	2015-10-23 14:12:56 -07:00
James B. Pollack	ca0aad7d3b	update after updating models	2015-10-22 17:25:15 -07:00
James B. Pollack	b8f0972228	move bow into toybox	2015-10-21 14:00:51 -07:00
James B. Pollack	4e8c306f66	Merge branch 'master' into bow	2015-10-21 14:00:19 -07:00
James B. Pollack	cf10277f2d	Merge branch 'master' into bow	2015-10-21 13:47:19 -07:00
James B. Pollack	5b417a1ba5	use updated hand controller	2015-10-21 13:47:17 -07:00
James B. Pollack	384a6a8154	rename /toys to /toybox, remove non toybox scripts, update master refs	2015-10-21 11:36:49 -07:00
Eric Levin	970d189262	Merge pull request #6125 from imgntn/toybox_ac ... [Scripts] Add Toybox AC Scripts, cleanup their headers, organize	2015-10-21 11:24:59 -07:00
James B. Pollack	0b06cf1dfb	cleanup	2015-10-21 10:53:32 -07:00
James B. Pollack	68d43dc576	reduce number of toybox sound scripts	2015-10-21 10:50:37 -07:00
James B. Pollack	80fb12b1a4	Merge branch 'master' into toybox_ac	2015-10-21 09:58:49 -07:00
Brad Hefta-Gaub	6465bb85dd	Merge pull request #6124 from imgntn/bball_fixes ... [Scripts] Fix Basketball Solidity in Toybox	2015-10-21 09:11:12 -07:00
Seth Alves	f85ef9267b	oops	2015-10-20 18:29:27 -07:00
Seth Alves	311254c395	require user-data to have wantsTrigger in it before non-colliding calls will happen	2015-10-20 18:26:12 -07:00
Seth Alves	7dcbb5849a	another bug	2015-10-20 17:44:12 -07:00
Seth Alves	ed480f651f	missed a line	2015-10-20 17:43:31 -07:00
Seth Alves	f16b62df83	- grab script: possible fix for line disappearing ... - grab script: go from 3 pickrays back to 1 - grab script: put "sphere" test back in, but with fixed distance test	2015-10-20 17:34:35 -07:00
James B. Pollack	8e1c3c32d1	additions to debug and also to handle some two handed situations	2015-10-20 16:24:17 -07:00
James B. Pollack	fd0dc3cd49	bow and grab	2015-10-20 16:22:30 -07:00
James B. Pollack	d01faad9ed	Merge branch 'master' into bow	2015-10-20 14:49:55 -07:00
Andrew Meadows	d02fe784a9	css and cfg filetypes are text in .gitattributes	2015-10-20 13:58:44 -07:00
James B. Pollack	31f1dfe25c	good two handed stuff	2015-10-20 13:35:28 -07:00
Andrew Meadows	4ff05e8c2a	fix lin endings of some JS files	2015-10-20 13:26:19 -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	b0ae55ee63	update cat purr header	2015-10-20 11:28:04 -07:00
James B. Pollack	771e5a4f9d	add toybox ac scripts, write headers for them, organize	2015-10-20 11:21:09 -07:00
James B. Pollack	af09871bed	fix basketball solidity in toybox	2015-10-20 11:08:28 -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