34419 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericrius1	f77b7b9105	renamed weapons folder to exterminatorGame	2015-11-16 14:09:47 -08:00
Eric Levin	ed1ee50865	rand names for testing	2015-11-16 13:54:24 -08:00
Eric Levin	eca11d3a99	sending message in correct format	2015-11-16 12:47:16 -08:00
Eric Levin	4e9be8cdd0	fixed conflicts	2015-11-13 17:10:02 -08:00
Eric Levin	ceca720fae	fix bug	2015-11-13 17:08:17 -08:00
ericrius1	2e2dc57b23	pushing for test	2015-11-13 14:00:03 -08:00
ericrius1	9fb74667d9	Don't move non physical objects	2015-11-13 11:20:52 -08:00
Eric Levin	6f994d6274	shootable	2015-11-13 11:15:44 -08:00
ericrius1	281d058a24	pistol tweaking	2015-11-13 10:55:09 -08:00
ericrius1	f50c4d3b18	IK working	2015-11-12 16:32:37 -08:00
ericrius1	13ec8f631d	Workign with ik, fixed a bug	2015-11-12 16:20:17 -08:00
ericrius1	d43c63c109	going to add kickback decay	2015-11-12 10:28:51 -08:00
ericrius1	1bf8ced2c4	kickback working	2015-11-11 16:40:44 -08:00
ericrius1	466caffd00	trying to add ik	2015-11-11 15:48:06 -08:00
ericrius1	fa244f8670	updated rat model	2015-11-11 14:50:16 -08:00
ericrius1	e78a079796	tweaks to particle props	2015-11-11 14:28:30 -08:00
ericrius1	5789ca2017	particle hit against walls	2015-11-11 14:20:58 -08:00
ericrius1	1e653133b4	muzzle flashes	2015-11-11 13:30:46 -08:00
ericrius1	667464b493	rat moves back with force when shot	2015-11-11 11:01:34 -08:00
ericrius1	40a15a15f3	cleaning up pistol	2015-11-11 09:11:03 -08:00
ericrius1	3346d77c44	pistol	2015-11-10 17:25:54 -08:00
Eric Levin	a2abc11df1	Merge pull request #6351 from huffman/script-path-resolution ... Update script engine path resolution behavior to behave consistently	2015-11-10 14:10:42 -08:00
James B. Pollack	4ded489d23	Merge pull request #6362 from ericrius1/helicopter ... Added scripts for helicopter	2015-11-10 13:53:30 -08:00
ericrius1	bf0677a0ce	Moved helicopter scripts into drylake folder	2015-11-10 13:42:15 -08:00
James B. Pollack	ff87a6ce6f	Merge pull request #6355 from sethalves/dont-neargrab-nonphysical ... don't attempt to near-grab things that aren't physical	2015-11-10 13:11:50 -08:00
Brad Hefta-Gaub	aea911ebc2	Merge pull request #6360 from samcake/controllers ... Recording and playback of the Avatar animation update but not quite over	2015-11-10 12:24:29 -08:00
samcake	d3d5d3a19e	Removing useless code	2015-11-10 12:02:20 -08:00
Ryan Huffman	08c2759947	Remove unused include in createTargets.js	2015-11-10 11:39:50 -08:00
Ryan Huffman	031a93cb0e	Fix utils include in createPingPongGun.js	2015-11-10 11:39:31 -08:00
Ryan Huffman	5f084730d9	Remove old includes in doll.js	2015-11-10 11:39:12 -08:00
Ryan Huffman	a264ed4795	Remove old includes in bubblewand	2015-11-10 11:38:57 -08:00
Ryan Huffman	a6bc1a2b5b	Fix closePaint.js Script.include	2015-11-10 11:38:36 -08:00
Ryan Huffman	90a1fbe04e	Fix magBalls.js resolvePath calls	2015-11-10 11:38:16 -08:00
Ryan Huffman	2a349620ee	Fix walkSettings.js resolvePath calls	2015-11-10 11:37:59 -08:00
Ryan Huffman	e7e6c63c64	Fix edit.js resolvePath calls	2015-11-10 11:36:53 -08:00
Ryan Huffman	6577c7a13c	Fix magBalls include paths	2015-11-10 09:38:52 -08:00
Ryan Huffman	2ad4c5b9e2	Fix walkApi include paths	2015-11-10 09:38:40 -08:00
Ryan Huffman	29fd352169	Fix omniTool test module include path	2015-11-10 09:38:21 -08:00
Ryan Huffman	37d9d98594	Fix breakdance include paths	2015-11-10 09:37:53 -08:00
Ryan Huffman	b802da4fef	Fix include in satellite.js	2015-11-10 09:37:36 -08:00
ericrius1	f5308530e6	Removed commented out line	2015-11-10 09:35:35 -08:00
ericrius1	df5353dc16	Merge branch 'refs/heads/master' into helicopter	2015-11-10 09:33:04 -08:00
samcake	2cf2257783	Fix warning	2015-11-10 09:20:43 -08:00
samcake	d1df6854ac	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-10 09:16:28 -08:00
Andrew Meadows	649f2d1d1d	Merge pull request #6361 from ZappoMan/fixWarnings ... fix various warnings	2015-11-10 09:10:55 -08:00
Ryan Huffman	53ca4c857d	Fix relative include path in entityCameraTool.js	2015-11-10 08:52:37 -08:00
Brad Hefta-Gaub	4a0a481ac6	more fixes	2015-11-10 08:44:51 -08:00
Brad Hefta-Gaub	0ea901fd72	fix various warnings	2015-11-10 08:34:58 -08:00
Brad Hefta-Gaub	fce6fdcc5e	Merge pull request #6356 from Atlante45/master ... Fix warnings on OS X	2015-11-10 08:15:19 -08:00
Sam Gateau	06a87012ad	Removing the setJointTranslations which is not helping...	2015-11-09 23:38:51 -08:00