4284 commits

Author	SHA1	Message	Date
ericrius1	b67c481726	resolved merge conflicts	2015-11-30 18:19:57 -08:00
ericrius1	90595949f1	moved exterminator game out of dry lake	2015-11-30 18:14:57 -08:00
ericrius1	8992f6bb44	moved pistol to toybox	2015-11-30 17:57:01 -08:00
James B. Pollack	8b7cfde02a	Merge pull request #6505 from imgntn/boww ... Fix release hand message for bow	2015-11-30 17:02:08 -08:00
James B. Pollack	7c12379ada	fix release hand message	2015-11-30 17:00:40 -08:00
Howard Stearns	6f50d91208	Merge pull request #6461 from hyperlogic/tony/remove-joint-states ... Refactor of Rig and MyAvatar animation JavaScript interface	2015-11-30 16:28:15 -08:00
Clément Brisset	e168966b87	Merge pull request #6409 from birarda/injector-hybrid ... more efficient threading of networked AudioInjector objects	2015-11-30 15:36:41 -08:00
ericrius1	706a67b9a1	lowered restitution to 0 to avoid too many collision sounds playing	2015-11-30 15:10:32 -08:00
ericrius1	b7884f487c	rats	2015-11-30 11:44:34 -08:00
ericrius1	22efcb1854	Added sounds to pistol	2015-11-30 11:42:34 -08:00
Anthony J. Thibault	11bfed4185	Merge branch 'master' into tony/remove-joint-states	2015-11-30 11:21:44 -08:00
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
Anthony J. Thibault	23def8d173	Merge branch 'master' into tony/remove-joint-states	2015-11-25 13:55:23 -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
Anthony J. Thibault	f120e10ff4	Merge branch 'master' into tony/remove-joint-states	2015-11-24 15:00:05 -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
Stephen Birarda	ab7cbc0b76	Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid	2015-11-24 10:45:00 -06: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
ericrius1	0980dbed60	added accidently-deleted particles.js file back	2015-11-23 15:25:43 -08:00
ericrius1	c36719cba7	Removed deprecated rat files	2015-11-23 15:24:28 -08:00
ericrius1	0f4e531be6	Added a monster shooting gallery	2015-11-23 15:22:34 -08:00
AlessandroSigna	8f1ce6e1fb	overlay added - waiting for official logos ... missing null assignment	2015-11-23 14:52:16 -08:00
Stephen Birarda	0997d3dcae	resolve conflicts on merge with upstream/master	2015-11-23 16:15:15 -06: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