34751 commits

This branch

This branch

All branches

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	125c32b8fc	tweak	2015-11-24 16:18:09 -08:00
ericrius1	c720c97e70	tweak	2015-11-24 16:14:26 -08:00
ericrius1	3a9dcf56df	tweak	2015-11-24 16:11:07 -08:00
ericrius1	224dea45e2	tweaked gun position in hand	2015-11-24 16:06:09 -08:00
ericrius1	d202ccb29c	entity reset switch can be triggered again with hand controller	2015-11-23 15:52:21 -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
Brad Davis	2636e43fab	Merge pull request #6413 from samcake/controllers ... Recording: Moving the Recording js interface to the Script engine	2015-11-18 10:22:55 -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
Philip Rosedale	450608bf5b	Merge pull request #6390 from sethalves/average-near-holds ... Average near holds	2015-11-17 20:01:46 -08:00
Brad Hefta-Gaub	963510a3f2	Merge pull request #6414 from jherico/dargo ... Fix OpenSSL 64 bit search logic	2015-11-17 19:33:19 -08:00
Brad Davis	ec918a1cf5	Fix OpenSSL 64 bit search logic	2015-11-17 19:10:16 -08:00
Brad Hefta-Gaub	6247aa207f	Merge pull request #6412 from birarda/master ... fix for messages-mixer bail early on empty settings	2015-11-17 19:09:43 -08:00
samcake	c1675bba21	Fix typo introduced by debug	2015-11-17 19:01:29 -08:00
samcake	368f19b4e2	Merging with todays upstream and checking	2015-11-17 18:58:10 -08:00
Stephen Birarda	2355ba70ca	just remove messages-mixer settings grabbing all together	2015-11-17 18:55:09 -08:00
Stephen Birarda	c21fbc9a46	fix for messages-mixer bail early on empty settings	2015-11-17 18:53:23 -08:00
Brad Hefta-Gaub	96b877df97	Merge pull request #6410 from AlessandroSigna/groupRecording ... Group recording - better structure	2015-11-17 18:46:14 -08:00
Brad Hefta-Gaub	ba922290a4	Merge pull request #6407 from jherico/dargo ... Exclude avatar scales out of the permissable range	2015-11-17 18:41:15 -08:00
Brad Hefta-Gaub	dbd74dc9e2	Merge pull request #6411 from jherico/chiana ... A couple fixes for windows 64 bit builds	2015-11-17 18:36:57 -08:00
Brad Davis	68c6718d1c	Fixes for windows 64 bit builds	2015-11-17 18:22:00 -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
Brad Hefta-Gaub	733d93039f	Merge pull request #6403 from jherico/rec3 ... Recording fixes	2015-11-17 17:52:15 -08:00
samcake	d2f3b48637	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-17 17:36:38 -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