4115 commits

Author	SHA1	Message	Date
Ryan Huffman	a7dfc99a2e	Fix high score not updating in baseball	2015-11-13 16:14:53 -08:00
Stephen Birarda	666c76073a	Merge branch 'baseball' of https://github.com/Atlante45/hifi into baseball	2015-11-13 14:48:15 -08:00
Stephen Birarda	ef778c554c	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-12 10:40:51 -08:00
James B. Pollack	1819e20f74	Merge pull request #6367 from ericrius1/marketplace ... Dynamic loading of models from specified directory	2015-11-11 16:54:06 -08:00
Brad Hefta-Gaub	a721b13e46	Merge pull request #6364 from imgntn/cleanuptoybox ... Remove Bball and Targets AC Resetter Script from Toybox	2015-11-11 16:23:33 -08:00
Brad Hefta-Gaub	c4ad1d978b	Merge pull request #6344 from imgntn/easystar ... Adapt EasyStar A* Pathfinding Library and Add Example	2015-11-11 16:22:47 -08:00
ericrius1	806d303dcd	Added header file	2015-11-11 15:55:32 -08:00
Brad Hefta-Gaub	2363ca044e	Merge pull request #6280 from imgntn/colorbuster ... Color Busters Game	2015-11-11 15:52:18 -08:00
ericrius1	56dc9092e0	added s3 server	2015-11-11 15:52:12 -08:00
ericrius1	4fc44b0929	Updated header summary to be more specific with how the loading works	2015-11-11 15:19:36 -08:00
EdgarPironti	da2b49a1b0	Remove hardcoded url	2015-11-11 15:07:33 -08:00
EdgarPironti	55d386aaab	Fixes: Prompt and userData	2015-11-11 15:07:33 -08:00
EdgarPironti	0f057d7229	Set clip for ControlledAC	2015-11-11 15:07:32 -08:00
AlessandroSigna	e4b1b54e00	added header	2015-11-11 12:07:54 -08:00
AlessandroSigna	f40e46957b	handControlledHead.js added	2015-11-11 12:06:51 -08:00
ericrius1	3f5cd0237d	Added header to dynamicLoader and removed files that are not ready for merging	2015-11-10 17:29:20 -08:00
Eric Levin	c2fe937a5c	Removed logging line	2015-11-10 17:07:55 -08:00
Atlante45	4f1420a5ee	Tweak bat offsets	2015-11-10 17:05:27 -08:00
ericrius1	0aefb8747f	Dynamic loading of models from specified directory	2015-11-10 16:55:17 -08:00
ericrius1	e4b271d6d8	dynamic loading content from s3	2015-11-10 16:49:46 -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	e7a2e82745	remove bball and targets resetter AC since we are doing this with hidden reset entities now	2015-11-10 13:58:07 -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
James B. Pollack	789f3231e1	easier bouncing	2015-11-09 19:18:19 -08:00
James B. Pollack	1ec70e8170	add physics to the ball and make it bounce	2015-11-09 19:10:11 -08:00
James B. Pollack	17814446ca	Add example with entities, add tween.js	2015-11-09 17:11:09 -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