4310 commits

Author	SHA1	Message	Date
James B. Pollack	e67f372bcf	make pistol shoot differently and not alter controller mappings	2015-12-01 18:24:13 -08:00
James B. Pollack	1eca1540c6	Merge pull request #6519 from ericrius1/toyboxSounds ... added collision sounds to flashlight, spraycan, and bow	2015-12-01 17:08:19 -08:00
Eric Levin	34234da2d1	fixed spacing	2015-12-01 17:05:51 -08:00
ericrius1	40fb45c6d3	fixed accidental newline in handgrab	2015-12-01 17:04:10 -08:00
ericrius1	0fd1bdaec5	fixed accidental newline in handgrab	2015-12-01 17:03:11 -08:00
ericrius1	e4199439af	added collision sounds to some toys	2015-12-01 17:00:43 -08:00
ericrius1	386afa272c	disable grab while attachment version of pistol script is running	2015-12-01 16:50:09 -08:00
Eric Levin	948479b0e8	Merge pull request #6517 from imgntn/disable2hands ... Support disabling both hands in handControllerGrab.js	2015-12-01 16:25:23 -08:00
James B. Pollack	aca0fa7beb	support disabling both hands	2015-12-01 16:03:19 -08:00
James B. Pollack	52d6fdac1a	Merge pull request #6487 from ctrlaltdavid/20740 ... Get the Leap Motion working again	2015-12-01 15:40:48 -08:00
Seth Alves	e0eae23dd3	Merge pull request #6515 from imgntn/personal_lasers ... Personal lasers in handControllerGrab.js	2015-12-01 13:29:05 -08:00
James B. Pollack	fb8316ff12	reduce pistol vol	2015-12-01 13:15:08 -08:00
James B. Pollack	3c8e31cd42	Merge pull request #6509 from ericrius1/toyboxFixes ... Toybox Tweaking	2015-12-01 13:07:10 -08:00
James B. Pollack	b787e71587	Update doll.js	2015-12-01 13:06:30 -08:00
James B. Pollack	31d2f6463f	cleanup	2015-12-01 13:03:51 -08:00
James B. Pollack	25422084b9	make it so that only you can see your beams until youre grabbing something	2015-12-01 13:02:40 -08:00
Anthony Thibault	dde971cb4f	Merge pull request #6514 from howard-stearns/update-ScriptableAvatar ... Update ScriptableAvatar	2015-12-01 12:44:04 -08:00
Howard Stearns	6e15ae9d7d	Update robot agent script to randomly select among all HiFi avatars, identified by name, and with a random turn from front.	2015-12-01 11:49:17 -08:00
Philip Rosedale	8e40889068	Merge pull request #6508 from sethalves/fix-observers-dont-see-equip-motion ... possible fix for observers not seeing a held entity moving	2015-12-01 11:41:08 -08:00
Seth Alves	7f95e1eec6	make sure observed held objects are active in bullet, disable equip spring action	2015-12-01 10:49:07 -08:00
ericrius1	a3f8c52aa3	temp fix for doll, moved cat	2015-12-01 10:09:29 -08:00
James B. Pollack	1ba6bfa2e0	lazers	2015-11-30 18:58:53 -08:00
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
David Rowe	6e076985f2	JSLint	2015-11-25 16:46:53 +13:00
David Rowe	46cbc349d1	Fix laserPointer.js for Hydras ... Leap Motion working already.	2015-11-25 16:39:09 +13:00