4083 commits

Author	SHA1	Message	Date
Atlante45	4f1420a5ee	Tweak bat offsets	2015-11-10 17:05:27 -08:00
Atlante45	3cbe1bc4da	Mirror on x instead of z	2015-11-10 14:50:22 -08:00
Atlante45	ddf82c35e1	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-10 14:18:49 -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
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
Ryan Huffman	53ca4c857d	Fix relative include path in entityCameraTool.js	2015-11-10 08:52:37 -08:00
Ryan Huffman	03dd234253	Update pitching.js to get billboard ids lazily	2015-11-09 16:48:54 -08:00
Stephen Birarda	0b1ecdec74	use just location to go to path	2015-11-09 15:49:54 -08:00
Stephen Birarda	57b4302e0d	Fix setting of location in bat.js	2015-11-09 15:44:23 -08:00
Stephen Birarda	b6c4ae757b	fix reference to pitchAndHideAvatar	2015-11-09 15:41:11 -08:00
Stephen Birarda	44ab236673	Fix include in bat.js	2015-11-09 15:33:23 -08:00
Stephen Birarda	244fd86d1e	add semi-colons to bat.js	2015-11-09 15:31:53 -08:00
Stephen Birarda	cea2e0fafd	don't force location in continueNearGrab	2015-11-09 14:21:14 -08:00
Seth Alves	8a434c8ab1	don't attempt to near-grab things that aren't physical	2015-11-09 14:10:26 -08:00
Stephen Birarda	962881ad31	use startNearTrigger and startFarTrigger for create button	2015-11-09 13:43:52 -08:00
Atlante45	3228ca6033	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-09 13:41:31 -08:00
Atlante45	dcf545f462	Merge branch 'baseball' of github.com:huffman/hifi into baseball	2015-11-09 13:41:23 -08:00
Atlante45	b15054c1fb	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-09 13:41:06 -08:00
Stephen Birarda	d65571ea41	use the birarda baseball script on the createBatButton	2015-11-09 13:36:20 -08:00
Stephen Birarda	9ec51d822e	send the avatar to /baseball on bat pickup	2015-11-09 13:35:54 -08:00
Stephen Birarda	119a702ebd	Merge branch 'baseball' of https://github.com/huffman/hifi into baseball	2015-11-09 13:34:30 -08:00
Atlante45	6a53021818	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-09 13:23:31 -08:00
Eric Levin	7700e67734	Merge pull request #6326 from imgntn/entity_params ... Add Ability to Pass Parameters When Calling Methods on Entities	2015-11-09 12:17:58 -08:00
Ryan Huffman	a400d63960	Cleanup Baseball in pitching.js	2015-11-09 12:02:28 -08:00
Ryan Huffman	5d4ce6aefc	Update include paths in pitching.js to be relative	2015-11-09 12:02:10 -08:00
Ryan Huffman	069284d8d1	Remove unused variable and print in pitching.js	2015-11-09 11:51:08 -08:00
Ryan Huffman	278c921a50	Clean up bat.js	2015-11-09 11:35:56 -08:00
Ryan Huffman	38fcdc3eff	Remove unused code from pitching.js	2015-11-09 10:59:46 -08:00
Ryan Huffman	661b2180f5	Update updateBillboard argument	2015-11-09 10:59:31 -08:00
Ryan Huffman	dad3ccb238	Cleanup pitching.js	2015-11-09 10:58:36 -08:00
Ryan Huffman	1b3d595d1e	Add comment to PITCHING_MACHINE_OUTPUT_OFFSET_PCT	2015-11-09 10:58:18 -08:00
James B. Pollack	ef7caa8da9	Add new collision hull and sound to ping pong gun	2015-11-09 10:48:12 -08:00
Ryan Huffman	b6d26862fd	Add headers to baseball script files	2015-11-09 10:33:07 -08:00
Ryan Huffman	ec31504c11	Add detection of missing entity billboards in pitching.js	2015-11-09 10:30:21 -08:00