4091 commits

Author	SHA1	Message	Date
ericrius1	845a32b51d	removed rogue comment from eraseBoardEntityScript	2015-11-16 17:25:36 -08:00
ericrius1	b79d8824e6	removed another unused npm module from package.json file	2015-11-16 17:23:32 -08:00
ericrius1	f1f601decb	removed unused npm module from package.json file	2015-11-16 17:23:01 -08:00
ericrius1	1c8b3e394c	fixed spacing of app.js	2015-11-16 17:19:31 -08:00
ericrius1	7ea0a626d9	added to readme	2015-11-16 17:17:37 -08:00
ericrius1	6eebb57fab	ws to wss to avoid mixed content server error	2015-11-16 17:14:53 -08:00
ericrius1	0e423d4ccf	load data from server and display on load	2015-11-16 17:06:38 -08:00
ericrius1	cbdf0bbf1f	Added readme	2015-11-16 17:03:04 -08:00
EdgarPironti	b6c27588b6	ControlledAC.js refactoring	2015-11-16 16:50:47 -08:00
ericrius1	c33a539221	got sockets working	2015-11-16 16:38:47 -08:00
ericrius1	09819b4298	sending message to all connections	2015-11-16 16:33:52 -08:00
ericrius1	3e7934767a	username is now correct	2015-11-16 16:13:13 -08:00
ericrius1	0ef37e4996	board header	2015-11-16 15:58:50 -08:00
ericrius1	b8cdff7a7a	style tweaking	2015-11-16 15:46:22 -08:00
ericrius1	3c363f2664	removed extraneous socketTest.js file	2015-11-16 15:31:05 -08:00
ericrius1	0a9a903f79	made jquery node module	2015-11-16 15:29:06 -08:00
ericrius1	6ac53c7276	added game server code	2015-11-16 15:26:17 -08:00
ericrius1	763c6383f5	added blood splattering effect, and sending score to server	2015-11-16 14:44:42 -08:00
Brad Davis	cb26fc67fc	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
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
Seth Alves	89ed3751ae	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-14 14:00:20 -08:00
Brad Davis	7a34d4f567	Merge pull request #6387 from samcake/controllers ... Recording : Updating the recorder.js and a few fixes	2015-11-13 17:56:57 -08:00
samcake	89e5db11a0	More fixes	2015-11-13 17:41:41 -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
AlessandroSigna	5e395713a6	fix script url	2015-11-13 16:33:54 -08:00
AlessandroSigna	5b66416b8c	added cleanup before delete	2015-11-13 16:32:22 -08:00
AlessandroSigna	c8349dda6e	added examples for messages synchronization	2015-11-13 16:32:20 -08:00
EdgarPironti	a80871a7a8	Fixes	2015-11-13 15:00:38 -08:00
EdgarPironti	eb0d91fc7e	Fixes to Master recording for ACs	2015-11-13 15:00:38 -08:00
ericrius1	2e2dc57b23	pushing for test	2015-11-13 14:00:03 -08:00
Seth Alves	3746920655	allow action updates from others when we are the simulation owner	2015-11-13 13:56:30 -08:00
ericrius1	9fb74667d9	Don't move non physical objects	2015-11-13 11:20:52 -08:00
Seth Alves	1d0a2ddd3d	grab debugging script	2015-11-13 11:15:57 -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
Sam Gateau	89d120ab3d	Few fixes to make the recorder.js run	2015-11-12 22:24:11 -08:00
samcake	1fd37b51a2	trying to get somewhere....	2015-11-12 17:54:35 -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
Seth Alves	3519dd248b	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-12 09:53:11 -08:00
Zach Pomerantz	33851baa3f	Add directionality to examples/growth ... *There is a bug in here, but it may be in Interface.* The sphere entities have a lifetime of 60s. The first time the script is run, each click fires one clickReleaseOnEntity event. If the entities expire (lifetime is reached), and the script is rerun a second time, each click will fire two clickReleaseOnEntity events. If this is repeated (waiting for expiration each time), then the N-th repetition will fire N clickReleaseOnEntity events. Note that each entity, across runs, has a unique uuid, as expected.	2015-11-11 22:32:45 -08:00
Thijs Wenker	4c2c37acce	Merge branch 'master' of https://github.com/worklist/hifi into 20724	2015-11-12 02:19:35 +01:00
Thijs Wenker	764af63ea9	remove Anchor entity from example and edit script, replace with invisible Box in example	2015-11-12 02:19:08 +01: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
ericrius1	1bf8ced2c4	kickback working	2015-11-11 16:40:44 -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
Seth Alves	cffe4551dd	merge from upstream	2015-11-11 16:15:07 -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	466caffd00	trying to add ik	2015-11-11 15:48:06 -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
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
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	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	3f5cd0237d	Added header to dynamicLoader and removed files that are not ready for merging	2015-11-10 17:29:20 -08:00
ericrius1	3346d77c44	pistol	2015-11-10 17:25:54 -08:00
Eric Levin	c2fe937a5c	Removed logging line	2015-11-10 17:07:55 -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
Seth Alves	4df65e4c11	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-10 15:02:07 -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
Seth Alves	b9ca509f07	Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup	2015-11-10 09:50:12 -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
Seth Alves	8a434c8ab1	don't attempt to near-grab things that aren't physical	2015-11-09 14:10:26 -08:00
Thijs Wenker	a58bd4ff05	Merge branch 'master' of https://github.com/worklist/hifi into 20724	2015-11-09 22:37:44 +01:00