4183 commits

Author	SHA1	Message	Date
James Pollack	44f69a2a18	Merge branch 'master' into bow	2015-11-29 11:37:25 -08:00
James Pollack	0625d4f4c2	remove debugging string	2015-11-28 23:40:58 -08:00
James Pollack	55f797838f	remove unused key	2015-11-28 23:22:00 -08:00
James Pollack	1e2398cbea	use constants	2015-11-28 23:04:52 -08:00
James Pollack	1315201bdc	update name of function	2015-11-28 22:55:44 -08:00
James Pollack	017ffb8f2e	change way messages get sent to the hand disabler	2015-11-28 22:54:31 -08:00
James Pollack	8f51ee6f58	rename hand disabler	2015-11-28 22:29:12 -08:00
James B. Pollack	8daeb0fa0d	revert hand grab script to current master	2015-11-27 12:18:11 -08:00
James B. Pollack	9ec2a01475	isolate grab script changes from bow branch	2015-11-27 12:13:53 -08:00
James B. Pollack	b6a165d3ef	Merge branch 'master' into bow	2015-11-27 11:41:21 -08:00
James B. Pollack	0ba6d172e8	Merge branch 'bow' of https://github.com/imgntn/hifi into bow	2015-11-27 11:21:33 -08:00
James B. Pollack	c237485023	revert playaspawner	2015-11-27 11:21:18 -08:00
Clément Brisset	5ff482071e	Merge pull request #6465 from ericrius1/polyLineFix ... moved logic to build vertex buffer to renderable polyline class, recalculati…	2015-11-25 11:02:02 -08:00
Andrew Meadows	bc20b72645	Merge pull request #6453 from howard-stearns/avatar-render-controller2 ... Survive Flash Mobs Without Making Everyone Sick	2015-11-25 09:52:28 -08:00
AlessandroSigna	cb0b5b5d02	added prompt	2015-11-24 18:31:41 -08:00
James B. Pollack	23f10659b0	update to new trigger method	2015-11-24 14:00:23 -08:00
James B. Pollack	be7d52a773	protect beam disabler from others	2015-11-24 13:35:53 -08:00
James B. Pollack	50c1786e9b	trigger changes and message debugging	2015-11-24 12:46:01 -08:00
James B. Pollack	2add609387	use new thingo	2015-11-24 12:12:01 -08:00
James B. Pollack	52edc3b701	cleanup beamdisabler	2015-11-24 10:43:33 -08:00
James B. Pollack	13e1042bfa	use messages instead of hidden entities to disable beams	2015-11-24 10:37:08 -08:00
James B. Pollack	fd26427390	add pullback / pushfwd	2015-11-24 10:23:29 -08:00
Brad Hefta-Gaub	1d8e2edafb	Merge pull request #6464 from ericrius1/whiteboardFix ... updated whiteboard to use new controller approach	2015-11-23 19:44:28 -08:00
AlessandroSigna	70cf5c6726	fixed icon position	2015-11-23 17:59:31 -08:00
AlessandroSigna	489cde7269	removed the local save of the recording	2015-11-23 17:51:58 -08:00
Eric Levin	40be9ae121	Commented out whiteboard cleanup	2015-11-23 17:15:26 -08:00
AlessandroSigna	44c95c13fb	further UI fixes	2015-11-23 16:57:24 -08:00
AlessandroSigna	8f1ce6e1fb	overlay added - waiting for official logos ... missing null assignment	2015-11-23 14:52:16 -08:00
James B. Pollack	0fd389b02f	remove arrowTest	2015-11-23 12:53:58 -08:00
James B. Pollack	c22a07bba7	bow collisions, etc	2015-11-23 12:36:39 -08:00
ericrius1	1409ed2d18	moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes	2015-11-23 12:28:44 -08:00
Eric Levin	7e8b692499	Update whiteboardEntityScript.js ... Removed logging	2015-11-23 12:04:13 -08:00
James B. Pollack	aa2450d755	cleanup, debugging script	2015-11-23 11:15:36 -08:00
ericrius1	08a64f6a6b	updated whiteboard to use new controller approach'	2015-11-23 10:08:23 -08:00
James B. Pollack	b6d0be0090	Merge branch 'master' into bow	2015-11-23 10:03:15 -08:00
James B. Pollack	8e81c3252a	cleanup and mostly? working	2015-11-22 22:24:42 -08:00
James B. Pollack	aa832311f5	add beam disabler	2015-11-22 22:12:43 -08:00
James B. Pollack	3f4dee80d9	more cleanup	2015-11-21 02:32:54 -08:00
James B. Pollack	945243306b	cleanup	2015-11-21 01:47:20 -08:00
James B. Pollack	f56c4ff575	still debugging	2015-11-20 21:14:28 -08:00
AlessandroSigna	05d311cff3	remove Windows.prompt cause of crash	2015-11-20 18:58:49 -08:00
AlessandroSigna	a1053ee5a0	pop up a prompt with url	2015-11-20 18:58:47 -08:00
AlessandroSigna	7069f7d6ab	added clip load to asset + clean code	2015-11-20 18:58:46 -08:00
AlessandroSigna	a306e8d5b1	master can upload performance file on asset	2015-11-20 18:58:45 -08:00
samcake	6e9e53bd0c	Clean up a bit of the playbackAgent script	2015-11-20 18:17:53 -08:00
James B. Pollack	b2dd900cb2	rotate correctly	2015-11-20 18:12:06 -08:00
James B. Pollack	a65b3b9aaa	collisions	2015-11-20 17:12:54 -08:00
James B. Pollack	06322b1d6b	dont update prenotch for everyone	2015-11-20 16:30:05 -08:00
samcake	5d17fa0b34	Merge pull request #6458 from ZappoMan/acPlayback ... allow playbackAgents to auto-register	2015-11-20 16:25:02 -08:00
James B. Pollack	c6be37f63f	lifetime	2015-11-20 16:10:39 -08:00