4100 commits

Author	SHA1	Message	Date
ericrius1	8992f6bb44	moved pistol to toybox	2015-11-30 17:57:01 -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
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
ericrius1	656d2f5c61	url tweaks	2015-11-23 09:52:37 -08:00
ericrius1	8aa7228e54	fixed offsets	2015-11-19 16:19:00 -08:00
ericrius1	947d04e7f1	tweak to sensitivity	2015-11-19 14:39:13 -08:00
ericrius1	32f65eceaa	less sensitive firing	2015-11-19 14:32:03 -08:00
ericrius1	688afa4c69	only show laser when press trigger a bit	2015-11-19 14:23:37 -08:00
ericrius1	8c5abd05c8	added gun to toybox	2015-11-19 10:13:00 -08:00
ericrius1	c5898896bc	monster model	2015-11-18 19:12:23 -08:00
ericrius1	4b66546bd6	adding a shooting range	2015-11-18 17:23:12 -08:00
ericrius1	5f3da64a25	gun lining up right	2015-11-18 16:34:39 -08:00
ericrius1	8f0adb5337	applying force, now must figure out positioning	2015-11-18 16:11:34 -08:00
ericrius1	1c9f94f3c0	added effects back in	2015-11-18 16:04:31 -08:00
ericrius1	53f75e305a	moved barrel point forward so ray doesnt hit gun	2015-11-18 15:26:30 -08:00
ericrius1	d4c7b6b9b9	laser working	2015-11-18 15:11:17 -08:00
ericrius1	4bf1c36fd6	Firing works	2015-11-18 14:32:49 -08:00
ericrius1	aed5629eca	equipping	2015-11-18 12:50:42 -08:00
ericrius1	47c2119888	Adding generic pistol	2015-11-18 12:25:36 -08:00
ericrius1	fc9dfe8da5	Merge branch 'master' into rats	2015-11-18 10:48:43 -08:00
Philip Rosedale	9c29ba2ca3	Merge pull request #6408 from imgntn/newbubble ... Change out bubble model	2015-11-17 20:30:59 -08:00
Philip Rosedale	5b853ddf57	Merge pull request #6402 from sethalves/grab-equip ... grab script bumper is an equip toggle	2015-11-17 20:15:26 -08:00
Brad Hefta-Gaub	a1e10a9f04	Merge pull request #6309 from thoys/20724 ... CR for Job #20724 - Camera entity mode	2015-11-17 20:05:22 -08:00
AlessandroSigna	5400381583	improved the structure	2015-11-17 18:03:26 -08:00
AlessandroSigna	8566d84709	fixed cleanup - unload	2015-11-17 18:03:25 -08:00
Seth Alves	94f18672d4	equip from a distance uses a spring to pull the object to the hand before equipping it	2015-11-17 17:18:16 -08:00
James B. Pollack	b340a99d69	Merge pull request #6290 from zzmp/examples/growth ... Add growth script to examples	2015-11-17 17:01:28 -08:00
James B. Pollack	e0a9048287	new bubble model	2015-11-17 16:59:14 -08:00
ericrius1	cc23ecb810	lowered volume on sound	2015-11-17 16:08:10 -08:00
Brad Hefta-Gaub	9c4286b6ca	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-17 15:50:54 -08:00
ericrius1	eac91e71e8	updated model	2015-11-17 15:30:38 -08:00
ericrius1	f256b1804c	enter entity triggers gun script	2015-11-17 15:12:52 -08:00
Seth Alves	5ae3c5aea0	adjust size of near-grab radius.	2015-11-17 14:59:06 -08:00
Seth Alves	c6051bb325	reduce size of near-grab radius. don't draw pick laser until we know we aren't going to do a near grab	2015-11-17 14:58:20 -08:00
Brad Hefta-Gaub	d8a3927311	debug the late connect case	2015-11-17 14:43:06 -08:00
Brad Hefta-Gaub	85aa3b3f83	handle subscribe when messages mixer is not available	2015-11-17 14:28:51 -08:00
Brad Hefta-Gaub	8112b3b57e	add senderUUID to the messageReceived signal	2015-11-17 14:16:22 -08:00
Brad Davis	6664d8d919	Merge pull request #6398 from ZappoMan/messaging ... messages-mixer	2015-11-17 14:03:03 -08:00
Brad Hefta-Gaub	2f142eb088	add a receiver example	2015-11-17 13:33:30 -08:00
Seth Alves	d21a2fee20	don't use spatial-key for normal grab, only equip. allow switching from a near or far grab to an equip.	2015-11-17 13:12:22 -08:00
ericrius1	cb524d540d	rats deleting on hit	2015-11-17 12:55:06 -08:00
Brad Hefta-Gaub	5b9791d800	add message received signal	2015-11-17 11:50:10 -08:00
Seth Alves	1d4e1eabcb	Merge branch 'master' of github.com:highfidelity/hifi into grab-equip	2015-11-17 11:01:22 -08:00
Brad Hefta-Gaub	c27a127739	add example script	2015-11-17 10:41:26 -08:00
ericrius1	90ef96746f	blockign ray	2015-11-17 10:41:07 -08:00
ericrius1	2a9bbe3612	change relative pathing	2015-11-17 10:36:23 -08:00