4975 commits

Author	SHA1	Message	Date
ericrius1	4b66546bd6	adding a shooting range	2015-11-18 17:23:12 -08:00
Brad Davis	98cc7408b1	Fixing issues found in AC playback test	2015-11-18 17:17:20 -08:00
James B. Pollack	670cca4eb7	fix sounds	2015-11-18 16:35:28 -08:00
ericrius1	5f3da64a25	gun lining up right	2015-11-18 16:34:39 -08:00
James B. Pollack	52582e130a	add lifetime to arrows, disable arrow tracker	2015-11-18 16:32:47 -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
James B. Pollack	b9aa9cf980	cleanup	2015-11-18 15:53:10 -08:00
Stephen Birarda	cb708859fb	resolve conflicts on merge with upstream master	2015-11-18 15:34:56 -08:00
James B. Pollack	328950065f	make bow equippable and change it so you dont have to load arrows	2015-11-18 15:33:47 -08:00
ericrius1	53f75e305a	moved barrel point forward so ray doesnt hit gun	2015-11-18 15:26:30 -08:00
AlessandroSigna	1f854784e1	not load the last recording	2015-11-18 15:17:06 -08:00
ericrius1	d4c7b6b9b9	laser working	2015-11-18 15:11:17 -08:00
Brad Hefta-Gaub	6719092094	add an example of an entityScript that subscribes to messages	2015-11-18 15:03:07 -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
James B. Pollack	ac336af9b5	start spatial key	2015-11-18 11:33:52 -08:00
James B. Pollack	12e2178dd3	cleanup	2015-11-18 11:28:07 -08:00
James B. Pollack	9e1f030840	merge	2015-11-18 11:23:38 -08:00
James B. Pollack	5f3e3ed9d1	cleanup	2015-11-18 11:06:48 -08:00
ericrius1	fc9dfe8da5	Merge branch 'master' into rats	2015-11-18 10:48:43 -08:00
James B. Pollack	d3ee0d4998	handle bubble solidity	2015-11-18 10:44:24 -08:00
James B. Pollack	de953ce14d	better spatialkey	2015-11-18 10:41:53 -08:00
Anthony J. Thibault	b481d7c73d	Merge branch 'master' into tony/remove-joint-states	2015-11-18 09:38:21 -08:00
James B. Pollack	eb48342d07	add inversiona nd spatialkey	2015-11-18 09:10:04 -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
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
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
Stephen Birarda	5dc48dc9dc	resolve conflicts on merge with upstream/master	2015-11-17 17:04:12 -08:00
James B. Pollack	b340a99d69	Merge pull request #6290 from zzmp/examples/growth ... Add growth script to examples	2015-11-17 17:01:28 -08:00
Stephen Birarda	8e4d7c69ce	handle AudioInjectorManager for scripted ACs	2015-11-17 17:01:11 -08:00
James B. Pollack	e0a9048287	new bubble model	2015-11-17 16:59:14 -08:00
Stephen Birarda	ab5c8e072f	handle blocked AudioInjectorManager for restart	2015-11-17 16:31:18 -08:00
James B. Pollack	e375a95947	remove unused methods from steering	2015-11-17 16:24:14 -08:00
ericrius1	cc23ecb810	lowered volume on sound	2015-11-17 16:08:10 -08:00
Brad Hefta-Gaub	9c4286b6ca	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-17 15:50:54 -08:00
ericrius1	eac91e71e8	updated model	2015-11-17 15:30:38 -08:00
ericrius1	f256b1804c	enter entity triggers gun script	2015-11-17 15:12:52 -08:00
Seth Alves	5ae3c5aea0	adjust size of near-grab radius.	2015-11-17 14:59:06 -08:00
Seth Alves	c6051bb325	reduce size of near-grab radius. don't draw pick laser until we know we aren't going to do a near grab	2015-11-17 14:58:20 -08:00
Brad Hefta-Gaub	d8a3927311	debug the late connect case	2015-11-17 14:43:06 -08:00
Brad Hefta-Gaub	85aa3b3f83	handle subscribe when messages mixer is not available	2015-11-17 14:28:51 -08:00
Brad Hefta-Gaub	8112b3b57e	add senderUUID to the messageReceived signal	2015-11-17 14:16:22 -08:00
Brad Davis	6664d8d919	Merge pull request #6398 from ZappoMan/messaging ... messages-mixer	2015-11-17 14:03:03 -08:00
Brad Hefta-Gaub	2f142eb088	add a receiver example	2015-11-17 13:33:30 -08:00
James B. Pollack	3d2dc5a7a2	slower rats, pop from stack	2015-11-17 13:24:34 -08:00
Seth Alves	d21a2fee20	don't use spatial-key for normal grab, only equip. allow switching from a near or far grab to an equip.	2015-11-17 13:12:22 -08:00
ericrius1	cb524d540d	rats deleting on hit	2015-11-17 12:55:06 -08:00
Brad Hefta-Gaub	5b9791d800	add message received signal	2015-11-17 11:50:10 -08:00
James B. Pollack	bb7328e476	hide nest	2015-11-17 11:35:16 -08:00
James B. Pollack	08ca03e0af	ratssss	2015-11-17 11:33:48 -08:00
Seth Alves	1d4e1eabcb	Merge branch 'master' of github.com:highfidelity/hifi into grab-equip	2015-11-17 11:01:22 -08:00
Brad Hefta-Gaub	c27a127739	add example script	2015-11-17 10:41:26 -08:00
ericrius1	90ef96746f	blockign ray	2015-11-17 10:41:07 -08:00
ericrius1	2a9bbe3612	change relative pathing	2015-11-17 10:36:23 -08:00
ericrius1	005fd04585	Merge remote-tracking branch 'origin/rats' into rats ... Conflicts: examples/drylake/exterminatorGame/pistol.js	2015-11-17 10:08:52 -08:00
ericrius1	85cb37d4b0	Moved exterminatorGame to drylake folder	2015-11-17 10:07:56 -08:00
Seth Alves	b062d23f61	bumper is now an equip toggle	2015-11-17 09:51:52 -08:00
ericrius1	423eef33d5	added hit effect back to entities	2015-11-17 09:48:34 -08:00
James B. Pollack	f669f8ac79	prep for adding to drylake	2015-11-17 00:34:14 -08:00
Eric Levin	7e4fe4b521	Update pistol.js	2015-11-16 23:06:45 -08:00
James B. Pollack	6098282736	end	2015-11-16 19:10:41 -08:00
James B. Pollack	a9379c41fe	gnight	2015-11-16 19:04:07 -08:00
Anthony J. Thibault	80eb247b9c	WIP checkin ... * AnimManipulator: added absolute and relative position and translation support * Rig: added _overrideFlags and _overridePoses for script overrides.	2015-11-16 18:49:47 -08:00
samcake	ba952581d0	Merge pull request #6389 from AlessandroSigna/groupRecording ... added group recording feature	2015-11-16 17:57:11 -08:00
samcake	d66049f323	Merge pull request #6386 from AlessandroSigna/recorder ... added examples for messages synchronization	2015-11-16 17:55:32 -08:00
ericrius1	d4a8537e8b	changed title of npm module	2015-11-16 17:31:27 -08:00
AlessandroSigna	f40ff69c75	added scripts for group recording	2015-11-16 17:27:00 -08:00
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
Stephen Birarda	aa77c4894c	add an AudioInjectorManager for more efficient threading	2015-11-16 16:04:10 -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
James B. Pollack	da2f5c7848	work	2015-11-16 12:57:43 -08:00
Eric Levin	eca11d3a99	sending message in correct format	2015-11-16 12:47:16 -08:00
Anthony J. Thibault	516aff2ee0	Kneel.js: Added comment to clearify js API	2015-11-16 11:37:12 -08:00
James B. Pollack	cafcf446d5	Merge branch 'master' into bow	2015-11-16 11:36:09 -08:00
James B. Pollack	2d7dd2fcf2	fires	2015-11-16 11:35:31 -08:00
Anthony J. Thibault	55adedcec8	Merge branch 'master' into tony/remove-joint-states	2015-11-16 11:22:44 -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
James B. Pollack	cdc6394a70	moar bowwww	2015-11-13 18:22:36 -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
Ryan Huffman	a7dfc99a2e	Fix high score not updating in baseball	2015-11-13 16:14:53 -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
Stephen Birarda	666c76073a	Merge branch 'baseball' of https://github.com/Atlante45/hifi into baseball	2015-11-13 14:48:15 -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
James B. Pollack	6129d3757e	fire code and sound code	2015-11-13 11:28:09 -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
James B. Pollack	f3d602a6f3	things	2015-11-13 10:30:17 -08:00
Sam Gateau	89d120ab3d	Few fixes to make the recorder.js run	2015-11-12 22:24:11 -08:00
James B. Pollack	ff2b5fc8da	with child glow box	2015-11-12 19:49:52 -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
James B. Pollack	7774f9096b	work	2015-11-12 12:31:53 -08:00
James B. Pollack	361a89ad46	redraw pre notch strings after firing	2015-11-12 11:32:25 -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	c719f25fb2	Merge branch 'master' into bow	2015-11-12 10:37:13 -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
James B. Pollack	2b8ad51b41	cleanup orientation of	2015-11-11 18:07:05 -08:00
James B. Pollack	595c628c39	it works!	2015-11-11 17:32:03 -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
James Pollack	ffe9036755	debug	2015-11-11 14:51:20 -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
James B. Pollack	9681145a1f	storage	2015-11-11 14:28:19 -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
Anthony J. Thibault	56e96ed24c	Merge branch 'master' into tony/script-start-stop-anim	2015-11-11 11:33:24 -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
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
Anthony J. Thibault	e1d0a97807	Implemented MyAvatar.prefetchAnimation() JS method	2015-11-10 16:51:48 -08:00
ericrius1	e4b271d6d8	dynamic loading content from s3	2015-11-10 16:49:46 -08:00
Anthony J. Thibault	936c55a94e	New MyAvatar animation JS interface ... JavaScript changes: * removed MyAvatar.playAnimation * removed MyAvatar.stopAnimation * removed MyAVatar.getGetAnimationDetails * removed MyAvatar.startAnimationByRole * removed MyAvatar.stopAnimationByRole * removed MyAVatar.getGetAnimationDetailsByRole * removed MyAVatar.clearJointPriorities * added MyAvatar.overrideAnimation(url, fps, loop, firstFrame, lastFrame) * added MyAvatar.restoreAnimation() * added MyAvatar.getAnimationRoles() * added MyAvatar.overrideRoleAnimation(role, url, fps, loop, firstFrame, lastFrame) * added MyAvatar.restoreRoleAnimation(role) * added MyAvatar.prefetchAnimation(url) * update kneel.js with new api. * added theBird.js to test role override api. C++ changes: * Added getParent() and replaceChild() to AnimNode * Added findByName() and traverse() to AnimNode * Changed AnimStateMachine to hold nodes by childIndex instead of smart pointer. This allows script to replace nodes dynamically via overrideRoleAnimation	2015-11-10 16:34:38 -08:00
James B. Pollack	b6bb54da32	Merge branch 'master' into bow	2015-11-10 15:30:50 -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
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
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
Anthony J. Thibault	eacc2cae0c	WIP checkpoint	2015-11-09 18:36:23 -08:00
James B. Pollack	17814446ca	Add example with entities, add tween.js	2015-11-09 17:11:09 -08:00
Anthony J. Thibault	af2b3bb9d5	MyAvatar: removed priority, hold and maskedJoints from playAnimation js call	2015-11-09 16:56:49 -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
James B. Pollack	8fc702485b	werk	2015-11-09 14:39:30 -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
Thijs Wenker	a58bd4ff05	Merge branch 'master' of https://github.com/worklist/hifi into 20724	2015-11-09 22:37:44 +01: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
Anthony J. Thibault	a0f21228f6	AnimGraph support for start and stop animation from JavaScript ... Follows the same model as the existing startAnimation and stopAnimation calls. See kneel.js for an example.	2015-11-09 12:19:01 -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
James B. Pollack	45ad2cce39	Merge branch 'master' into bow	2015-11-09 11:58:39 -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	b496240283	Merge branch 'master' into bow	2015-11-09 10:54:54 -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
Eric Levin	8e039fe465	Merge pull request #6338 from imgntn/string_polyfills ... Add More Methods to stringHelpers.js	2015-11-09 10:25:13 -08:00
Eric Levin	ceba1c4b02	Merge pull request #6340 from imgntn/usertiming ... Adapt UserTiming library and Add Example	2015-11-09 10:25:04 -08:00
Ryan Huffman	20bdc7ee85	Rename getPitchingMachine to getOrCreatePitchingMachine	2015-11-09 10:10:59 -08:00
Ryan Huffman	30841169ee	Move functions in baseball.js to utils.js	2015-11-09 10:04:19 -08:00
Seth Alves	030bb71f19	Merge pull request #6337 from howard-stearns/fix-agent-avatar ... fix agent avatar animation	2015-11-09 09:38:27 -08:00
Seth Alves	f3d26e163d	turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system	2015-11-07 07:19:27 -08:00
James B. Pollack	bf4320e5cc	re-add this example	2015-11-06 22:55:33 -08:00
James B. Pollack	34d98cac5e	Update usertiming.js	2015-11-06 22:12:03 -08:00
James B. Pollack	369eec2abd	Update usertimingExample.js	2015-11-06 22:05:30 -08:00
James B. Pollack	4fbff5d667	Update usertimingExample.js	2015-11-06 21:39:53 -08:00
Clément Brisset	517ef7dfc8	Merge pull request #6336 from ericrius1/avatarMover ... Restores the avatar mover app after its loss in S3	2015-11-06 19:30:24 -08:00
James B. Pollack	c4318bcbd3	add easystar lib	2015-11-06 17:38:53 -08:00
James B. Pollack	f478261ed0	cleanup	2015-11-06 16:21:53 -08:00
James B. Pollack	5893bfeb06	add user timing	2015-11-06 16:19:49 -08:00
James B. Pollack	f7d4a3821f	add more methods	2015-11-06 15:42:56 -08:00
Howard Stearns	619746676b	Fix ScriptAvatar (ac agent), and provide a simple working example assignment client script.	2015-11-06 15:31:03 -08:00
Ryan Huffman	e145d4955c	Update tunnel detection to reverse all axes	2015-11-06 15:30:25 -08:00
Ryan Huffman	bc035b7e1e	Adjust baseball speed to 7-15 m/s	2015-11-06 15:29:57 -08:00
ericrius1	c1690bcf32	restoring avatarMover app post S3-loss event	2015-11-06 15:19:14 -08:00
James B. Pollack	ced1a4899d	promises	2015-11-06 15:10:23 -08:00
Ryan Huffman	51b14386a0	Adjust baseball pitch speed to 5-20 m/s	2015-11-06 15:08:35 -08:00
ericrius1	c289474909	avatr mover	2015-11-06 14:25:01 -08:00
ericrius1	a432a62dee	model swapping	2015-11-06 13:53:25 -08:00
Atlante45	55c6706f76	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-06 13:31:39 -08:00
Atlante45	35b13b11eb	Merge branch 'baseball' of github.com:huffman/hifi into baseball	2015-11-06 13:30:42 -08:00
Eric Levin	7be537c49c	Merge pull request #6332 from imgntn/bubblwand_links ... Update Bubblewand Model References	2015-11-06 13:28:27 -08:00
James B. Pollack	1d41ef868b	update bubblewand model refs	2015-11-06 13:11:06 -08:00
Ryan Huffman	c964363ce5	Disable automatic playing of show in firework.js	2015-11-06 12:25:13 -08:00
Ryan Huffman	42e2c683fd	Rename fireSounds to launchSounds	2015-11-06 12:24:52 -08:00
Ryan Huffman	4cce57881f	Remove MAX_SIMULTANEOUS_FIREWORKS from firework.js	2015-11-06 12:24:19 -08:00
James B. Pollack	cf86d27417	cleanup headers	2015-11-06 11:50:34 -08:00
James B. Pollack	e928c8278b	overload a single function and cleanup, add examples	2015-11-06 11:48:51 -08:00
Ryan Huffman	fbb47ecdda	Remove hard-coded fireworks position from firework.js	2015-11-06 11:39:46 -08:00
Ryan Huffman	94bf2ecf27	Remove emitter pool from firework.js	2015-11-06 10:45:22 -08:00
Ryan Huffman	d5336db039	Cleanup print statements in pitching.js	2015-11-06 10:04:19 -08:00
Ryan Huffman	7da611d44b	Adjust fireworks configuration in pitching.js	2015-11-06 10:03:57 -08:00
Ryan Huffman	5d2df1abbb	Add helped function findEntity	2015-11-06 09:55:18 -08:00
samcake	63106f6991	Merge pull request #6322 from Atlante45/record ... Recording fixes from Clement.	2015-11-06 09:28:58 -08:00
James B. Pollack	2fdc9202e4	Merge pull request #6313 from AlanZimmerman/playa ... Created playaSpawner	2015-11-05 20:47:00 -08:00
AlessandroSigna	715b183a3c	unified two ways to do the mapping in a single JS	2015-11-05 19:10:06 -08:00
AlessandroSigna	f9ebbea585	Merge branch 'master' of https://github.com/highfidelity/hifi into branchJS	2015-11-05 19:09:49 -08:00
ericrius1	94c5637024	marketplace spawner	2015-11-05 17:27:30 -08:00
Thijs Wenker	de98a17ada	- rename CameraEntityItem to AnchorEntityItem	2015-11-06 01:58:08 +01:00
Anthony Thibault	b6b596b8af	Merge pull request #6284 from howard-stearns/away ... Away/Pause	2015-11-05 15:28:47 -08:00
Atlante45	a2f0d8a066	Merge branch 'baseball' of github.com:huffman/hifi into baseball	2015-11-05 15:14:32 -08:00
Atlante45	147cc088ba	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-05 15:14:23 -08:00
Atlante45	c1029450d9	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-05 15:14:15 -08:00
James B. Pollack	31b540ca38	mid test	2015-11-05 14:29:58 -08:00
ericrius1	f8de01a856	Fixed bug where eraser wouldn't erase	2015-11-05 14:14:49 -08:00
Atlante45	07b3597ae3	Fix recording scripts	2015-11-05 14:01:37 -08:00
Seth Alves	c4194f2359	don't try to grab polylines. set wantTrigger on various whiteboard parts	2015-11-05 13:26:23 -08:00
Howard Stearns	8f65ee87bc	Clean up script, go away when putting HMD (not just on startup), and clear stopper properly.	2015-11-05 13:19:29 -08:00
Howard Stearns	aef8b7639d	Merge branch 'master' of https://github.com/highfidelity/hifi into away	2015-11-05 11:58:08 -08:00
James B. Pollack	87503ca4c6	Merge branch 'master' into bow	2015-11-05 11:00:51 -08:00
James B. Pollack	c898d9a474	set wantstrigger correctly on lightswitch	2015-11-05 10:48:16 -08:00
Seth Alves	4a3b434fd4	change grabbing-non-colliding to trigger. fix whiteboard and some other scripts	2015-11-05 10:35:02 -08:00
James B. Pollack	7dc40548d3	Merge branch 'master' into bow	2015-11-05 10:21:37 -08:00
Seth Alves	4ffaa7db8e	don't attempt to grab particles or zones	2015-11-05 09:46:39 -08:00
Seth Alves	7cb8adb090	get rid of code that computes release velocity	2015-11-05 09:45:06 -08:00
Seth Alves	3154b9d75f	don't set release velocity	2015-11-05 09:44:50 -08:00
Brad Davis	86b852231e	Merge pull request #6286 from EdgarPironti/master ... Spacemouse migration	2015-11-04 19:15:35 -08:00
AlessandroSigna	eac73671e0	Added some documentation and examples for the new mapping system	2015-11-04 17:40:35 -08:00
Seth Alves	05a977e31b	get rid of code that computes release velocity	2015-11-04 16:26:30 -08:00
Seth Alves	adb9118dc1	don't set release velocity	2015-11-04 16:21:02 -08:00
Ryan Huffman	1c9e3434a9	Adjust behavior of tunnel-detection in pitching.js	2015-11-04 16:01:08 -08:00
ericrius1	b7840fdd6b	explosion	2015-11-04 15:01:55 -08:00
Alan Z	8b20a3c903	Created playaSpawner and fixed cleanup issue	2015-11-04 14:41:11 -08:00
Ryan Huffman	6ae4ef78dd	Update max fireworks in pitching.js to be 10	2015-11-04 14:38:48 -08:00
Ryan Huffman	4d5ed2efcf	Fix fireworks not being deleted	2015-11-04 14:38:30 -08:00
Stephen Birarda	f67d4d33f4	make the crowd a bit louder	2015-11-04 14:32:36 -08:00
James B. Pollack	9b7bdca73a	merge handcontroller	2015-11-04 14:12:00 -08:00
Seth Alves	1cbe6c4463	don't attempt to grab particles or zones	2015-11-04 13:59:37 -08:00
Ryan Huffman	e0ad714ab7	Clean up print messages in pitching.js	2015-11-04 13:11:34 -08:00
Ryan Huffman	2a115fc9ab	Remove preallocation of particles in firework.js	2015-11-04 13:11:20 -08:00
Ryan Huffman	de69b2298b	Decrease number of fireworks on high score	2015-11-04 12:55:18 -08:00
Thijs Wenker	ee218faf5e	Merge branch '20724' of github.com:thoys/hifi into 20724	2015-11-04 21:21:57 +01:00
Thijs Wenker	0ebd6e47cc	fix magic number	2015-11-04 21:21:03 +01:00
Ryan Huffman	8056498f39	Update pitching machine to shoot fewer fireworks	2015-11-04 12:11:07 -08:00
Ryan Huffman	bed7a1f5c3	Improve performance of fireworks	2015-11-04 12:10:42 -08:00
Ryan Huffman	d0d3aaa09c	Update bat.js to ensure pitching machine is running in continueNearGrab	2015-11-04 12:10:19 -08:00
Howard Stearns	4fd2027fb4	change name	2015-11-04 11:42:21 -08:00
Stephen Birarda	d5c6b0bdc0	allow a distance grab on the create bat button	2015-11-04 11:31:01 -08:00
ericrius1	3c227db08d	explode heli	2015-11-04 11:27:16 -08:00
Atlante45	8223e032c0	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-04 11:26:46 -08:00
Atlante45	234271a40d	Merge branch 'baseball' of github.com:huffman/hifi into baseball	2015-11-04 11:26:38 -08:00
Atlante45	d9cd986db2	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-04 11:26:16 -08:00
Thijs Wenker	128a0c2397	securityCamera.js - Camera Entity example	2015-11-04 20:23:03 +01:00
Seth Alves	c2f9a49598	don't grab light	2015-11-04 11:15:57 -08:00
Howard Stearns	3fdd7ca470	obscure the code and increase the likelihood of future whitespace-only diffs	2015-11-04 10:57:03 -08:00
Howard Stearns	883f9c09bf	add gratuitous whitespace	2015-11-04 10:49:12 -08:00
Howard Stearns	fe12891f61	whitespace only	2015-11-04 10:48:02 -08:00
Seth Alves	1e498a41f0	rework search logic	2015-11-04 10:46:20 -08:00
Howard Stearns	7b9245022c	Merge branch 'away' of https://github.com/howard-stearns/hifi into away	2015-11-04 10:46:16 -08:00
Stephen Birarda	ff2438ef03	use bat script that fully hides avatar	2015-11-04 10:23:06 -08:00
Stephen Birarda	8607a1ef50	Revert "remove continueNearGrab from bat script" ... This reverts commit ea2b9e906b.	2015-11-04 10:22:53 -08:00
Stephen Birarda	c2b0d127f3	use bat script without continued near grab	2015-11-04 09:33:42 -08:00
Stephen Birarda	ea2b9e906b	remove continueNearGrab from bat script	2015-11-04 09:33:09 -08:00
Stephen Birarda	73aa016d8c	use rawgit URL for bat script	2015-11-04 09:23:16 -08:00
Ryan Huffman	cb2a698488	Update urls in baseball scripts to be absolute	2015-11-04 09:22:05 -08:00
Ryan Huffman	f5c89dedb5	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-04 08:56:01 -08:00
EdgarPironti	ade0862948	Spacemouse fixes	2015-11-04 00:49:40 -08:00
EdgarPironti	1ab683643c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-04 00:36:38 -08:00
Zach Pomerantz	df4be6c0ba	Add growth script to examples	2015-11-03 23:48:05 -08:00
James B. Pollack	46294e3e26	Merge branch 'master' into bow	2015-11-03 20:10:28 -08:00
Brad Davis	439bdbc0e4	Merge pull request #6298 from samcake/controllers ... Controllers : Removing dead files	2015-11-03 19:57:37 -08:00
Thijs Wenker	d60661ff8a	preview camera button in edit.js script	2015-11-04 03:24:32 +01:00
EdgarPironti	7adf38f781	Spacemouse migration	2015-11-03 18:22:55 -08:00
EdgarPironti	2a84cadd5d	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 18:22:29 -08:00
Thijs Wenker	d7279e4c88	Support for Camera Entities. ... - New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.). - New CameraMode: CameraEntity - Example script using the new cameraEntity - Updated edit.js to use the CameraEntities (with button to preview the camera)	2015-11-04 02:51:23 +01:00
Atlante45	55894f2eee	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 17:46:24 -08:00
Atlante45	04f4e49158	Merge branch 'baseball' of github.com:huffman/hifi into baseball	2015-11-03 17:45:43 -08:00
Howard Stearns	4a54f2052e	Merge branch 'master' of https://github.com/highfidelity/hifi into away	2015-11-03 17:42:38 -08:00
Stephen Birarda	9ae3c8b593	change bat relative rotation yaw to 90	2015-11-03 16:58:30 -08:00
Stephen Birarda	e7bc2e349a	use real userData in createBatButton script	2015-11-03 16:55:11 -08:00
Stephen Birarda	9488a8ed24	use HTTP URL for bat script URL	2015-11-03 16:42:31 -08:00
Stephen Birarda	5b3809b543	update the bat script URL	2015-11-03 16:13:14 -08:00
Stephen Birarda	804db537bf	volume changes for crowd, bat avatar suppression fix	2015-11-03 16:11:13 -08:00
Atlante45	d8797ef9d7	Initialize relativePosition/Rotation	2015-11-03 16:07:37 -08:00
Brad Hefta-Gaub	d21415b00d	Merge pull request #6295 from imgntn/cleanup_tests ... Remove timers test file	2015-11-03 15:43:02 -08:00
samcake	57bc2f3093	Removing dead js files	2015-11-03 15:37:36 -08:00
howard-stearns	4bf9861350	Forgot license header.	2015-11-03 15:36:02 -08:00
ericrius1	0650280fb6	tweaks	2015-11-03 15:14:56 -08:00
ericrius1	ed2bd07585	rotating blade	2015-11-03 14:54:05 -08:00
Stephen Birarda	8c0592caba	add semicolons to createBatButton script	2015-11-03 14:52:40 -08:00
Ryan Huffman	5211824e0e	Fix script include paths in firework.js and pitching.js	2015-11-03 14:43:43 -08:00
Stephen Birarda	501b905e7a	change script URL for bat to HTTP	2015-11-03 14:25:38 -08:00
Stephen Birarda	8346ce27b3	allow a non-colliding grab of locked entities	2015-11-03 14:22:41 -08:00
Stephen Birarda	06dbe2693a	fix for created bat properties	2015-11-03 14:21:52 -08:00
ericrius1	0846c3bef4	moving	2015-11-03 14:12:56 -08:00
James B. Pollack	b83b24b096	remove strange test file	2015-11-03 13:42:18 -08:00
Ryan Huffman	644e1008bd	Fix bat.js not setting pitchingMachine variable	2015-11-03 13:32:28 -08:00
ericrius1	58587a5780	spotlight	2015-11-03 13:26:39 -08:00
howard-stearns	fb4174b9a2	Control alphaVar, and deal with overlapping cycles.	2015-11-03 13:11:31 -08:00
James B. Pollack	f0fbd67e93	merge	2015-11-03 13:00:25 -08:00
ericrius1	443df042a4	playing with light pos/rot	2015-11-03 12:40:41 -08:00
EdgarPironti	d99838de9c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 12:25:19 -08:00
Ryan Huffman	2b8c6ebaf1	Add firework show when distance hit > 200	2015-11-03 12:14:55 -08:00
Ryan Huffman	3056432b0c	Add fireworks	2015-11-03 12:14:04 -08:00
ericrius1	82dbdec78c	helicopter	2015-11-03 11:54:01 -08:00
Atlante45	f4b5933af4	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:21:39 -08:00
James B. Pollack	811fd0cec7	prep for meeting	2015-11-03 10:42:15 -08:00
Seth Alves	27b239176f	fix grab	2015-11-03 10:16:56 -08:00
Howard Stearns	70b1165393	Merge branch 'master' of https://github.com/highfidelity/hifi into away	2015-11-03 10:01:36 -08:00
EdgarPironti	5d695da630	Do not merge - Spacemouse	2015-11-02 23:31:10 -08:00
Howard Stearns	1b7ed3d847	away script	2015-11-02 20:40:40 -08:00
James B. Pollack	192e4c8185	Merge pull request #6274 from ZappoMan/rightClickMenu ... add example of overriding default rightClick behavior	2015-11-02 18:58:12 -08:00
Atlante45	1928753dda	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-02 18:14:53 -08:00
James B. Pollack	aeac31cf6a	dont delete cubes by default	2015-11-02 16:37:24 -08:00
Seth Alves	fe2c0effd0	oops left debug on	2015-11-02 16:17:46 -08:00
Seth Alves	0a5f43bba7	fix up boolean test	2015-11-02 16:16:13 -08:00
Ryan Huffman	91a1378889	Clean up foul/strike in pitching.js	2015-11-02 16:09:51 -08:00
James B. Pollack	15af28337b	add color busters game for testing	2015-11-02 16:02:30 -08:00
Ryan Huffman	1b673a99c0	Fix updating of distance/high score	2015-11-02 15:59:55 -08:00
Ryan Huffman	3cbcc6494f	Update bat.js to lazy load the pitching machine	2015-11-02 15:34:42 -08:00
Ryan Huffman	def8294b60	Fix pitching machine not starting when enabled	2015-11-02 15:28:18 -08:00
Ryan Huffman	8b6db3b6c0	Add shouldRenderLocally to bat.js and fix findEntities	2015-11-02 15:13:07 -08:00
Seth Alves	181901ed19	distance grab works better with hmd on	2015-11-02 14:42:28 -08:00
Stephen Birarda	bbf5991f9a	resolve conflicts on merge with huffman/baseball	2015-11-02 14:14:36 -08:00
Ryan Huffman	f4531759be	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-02 12:27:08 -08:00
Ryan Huffman	7f4a8e9d7d	Merge branch 'master' of github.com:Atlante45/hifi into baseball	2015-11-02 12:25:51 -08:00
Ryan Huffman	b8d90ab28e	Replace pitching.js include with relative path	2015-11-02 12:12:54 -08:00
Ryan Huffman	3820adf3f6	Add bat.js	2015-11-02 12:12:21 -08:00
Ryan Huffman	72775a7af8	Clean up pitching.js so the pitching machine code is separate	2015-11-02 12:12:05 -08:00
Brad Hefta-Gaub	b94258f953	add example of overriding default rightClick behavior	2015-11-02 11:55:50 -08:00
Eric Levin	7838683909	Merge pull request #6189 from imgntn/fjs ... Add functional.js library	2015-11-02 11:10:19 -08:00
James B. Pollack	e79ebdb8aa	cleanup syntax	2015-11-01 19:47:13 -08:00
Brad Hefta-Gaub	286905c20c	Merge pull request #6250 from jherico/peek ... Adding peek support for endpoints	2015-10-31 16:09:27 -07:00
Seth Alves	9346366fc5	fix grab script	2015-10-31 14:28:54 -07:00
Brad Davis	abbfe15395	Adding peek support for endpoints	2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub	46f9a432ab	fix handControllerGrab.js	2015-10-31 14:21:50 -07:00
James B. Pollack	459b449a7f	rename folder	2015-10-30 20:52:19 -07:00
James B. Pollack	0a083c070f	color busters cooperative game	2015-10-30 20:21:53 -07:00
Seth Alves	896ed3927c	merge from upstream	2015-10-30 19:17:43 -07:00
James B. Pollack	c67bfc8883	Merge pull request #6180 from huffman/line-js ... Add js line library for drawing infinite poly lines	2015-10-30 17:47:31 -07:00
Seth Alves	944f0965c0	some refactoring and a bug fix -- grab script can throw things again	2015-10-30 16:35:50 -07:00
Ryan Huffman	77e0023b43	Fix lifetime bug with first PolyLine in InfiniteLine	2015-10-30 16:31:15 -07:00
Seth Alves	cf83ca22bb	change how kinematic objects get data back to entity when an action is active	2015-10-30 15:30:54 -07:00
Atlante45	b0650cc2c1	Remove accidentally commited file	2015-10-30 14:37:06 -07:00
Atlante45	bc552c772b	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-10-30 14:05:40 -07:00
Seth Alves	b102081f2f	upon release, set velocity after returning entity to being dynamic	2015-10-30 11:35:51 -07:00
Clément Brisset	317674c89a	Merge branch 'grab' of https://github.com/sethalves/hifi	2015-10-30 11:13:56 -07:00
Brad Hefta-Gaub	b5fd3424b8	Merge pull request #6245 from EdgarPironti/controllers ... Fixed controllerExample.js parse error	2015-10-30 11:10:08 -07:00
EdgarPironti	f887bbd45c	Fixed controllerExample parse error	2015-10-30 11:06:20 -07:00
Seth Alves	93503d0a21	make kinematic grab set entities kinematic in bullet and update entity position	2015-10-30 11:03:13 -07:00
Brad Davis	49e7d42c2c	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-30 10:07:40 -07:00
James B. Pollack	ad9cfbab50	end of day	2015-10-29 17:24:43 -07:00
James B. Pollack	846310f9fb	Merge pull request #6208 from ericrius1/closePaintModel ... Added to the whiteboard model, and some bug fixes	2015-10-29 17:05:20 -07:00
ericrius1	6bdf66534f	light tweak	2015-10-29 16:53:03 -07:00
Atlante45	8b46ed7dff	Check keyLight is defined	2015-10-29 16:42:48 -07:00
ericrius1	b6b71e7e76	increased range and intensity of light	2015-10-29 16:40:50 -07:00
Ryan Huffman	03a082383f	Convert billboard display to feet and cleanup trails earlier	2015-10-29 16:10:17 -07:00
Ryan Huffman	8a29f4fc61	Add distances and billboard display to pitching.js	2015-10-29 16:09:33 -07:00
James B. Pollack	24df6552b5	Merge branch 'master' into bow	2015-10-29 15:59:23 -07:00
James B. Pollack	342760de56	Merge branch 'master' into bow	2015-10-29 15:58:57 -07:00
Clément Brisset	e818028043	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-10-29 15:53:44 -07:00
Clément Brisset	0ea2ca589b	Merge branch 'physics-ccd' of https://github.com/huffman/hifi ... Conflicts: examples/libraries/walkApi.js examples/toybox/flashlight/flashlight.js examples/walk.js	2015-10-29 15:47:14 -07:00
Atlante45	c237072195	edit.js fix	2015-10-29 15:29:12 -07:00
James B. Pollack	48a295f4bc	werk	2015-10-29 15:24:04 -07:00
Stephen Birarda	d03a837263	resolve conflicts on merge with upstream master	2015-10-29 14:28:50 -07:00
ericrius1	020566b76a	no deleting	2015-10-29 14:14:15 -07:00
Atlante45	904326cd1c	edit.js fix	2015-10-29 14:11:27 -07:00
Ryan Huffman	a7517ff210	CP	2015-10-29 14:01:53 -07:00
Brad Davis	036ae62dd3	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-29 14:00:52 -07:00
Brad Hefta-Gaub	1c2973f17d	removed old metavoxel example, since the api is no longer available	2015-10-29 12:34:24 -07:00
Brad Hefta-Gaub	1f53e425eb	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-10-29 12:28:28 -07:00
Brad Davis	f21633e368	Merge pull request #6222 from ZappoMan/hardwareChanged ... Handle input plugin register/remove when activated/deactivated by menus	2015-10-29 12:24:17 -07:00
James B. Pollack	7166c6ddd2	through arrow in notch with rotation	2015-10-29 12:23:32 -07:00
James B. Pollack	028ea584b8	updating bow	2015-10-29 11:23:03 -07:00
Brad Hefta-Gaub	3bbba99e2b	Merge pull request #6178 from samcake/color ... Refactor the KeyLIght properties in their own group	2015-10-29 10:44:44 -07:00
samcake	517387621a	Fixing the keyLIght Direction ui for edit.js and fix the case for D to d	2015-10-29 10:40:28 -07:00
Brad Davis	ccbae81dad	Merge branch 'master' into HEAD ... Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-10-29 10:24:38 -07:00
Eric Levin	42fb683085	Merge pull request #6184 from imgntn/toybox_sounds ... Add Arcade Game Sound To Toybox	2015-10-29 10:24:23 -07:00
samcake	025422792d	Fixing the keyLIght Direction ui for edit.js	2015-10-29 10:13:28 -07:00
Brad Hefta-Gaub	a3cd032a41	register/remove devices when the input plugins are activated/deactivated	2015-10-29 10:06:21 -07:00
Andrew Meadows	f9012d5051	Merge pull request #6187 from sethalves/fix-actions-ttl ... fix actions bug	2015-10-29 09:30:21 -07:00
James B. Pollack	8695963dd1	end of day	2015-10-28 19:10:16 -07:00
samcake	630cdb8a9d	Modify the html presentiong the zone enity properties to match the internal new representation	2015-10-28 17:29:06 -07:00
Stephen Birarda	2ecec2623c	add a script for bat creation on button click	2015-10-28 17:03:25 -07:00
samcake	a5b95d7307	Fixing the entity properties view with the new properties group	2015-10-28 16:46:56 -07:00
ericrius1	1b1490bb75	added blocker so user cant get so close to whiteboard	2015-10-28 16:02:15 -07:00
ericrius1	e9bdb872bd	added light to whiteboard	2015-10-28 15:25:11 -07:00
James B. Pollack	24a5cdc19e	through notching the arrow	2015-10-28 14:00:37 -07:00
Brad Davis	570b4a32da	Merge pull request #6206 from samcake/controllers ... Controllers : Add a new kind onf controller to expose ReadOnly state from the application	2015-10-28 13:42:15 -07:00
Brad Davis	3c1a0930da	Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: interface/src/avatar/MyAvatar.h libraries/script-engine/src/ScriptEngine.cpp libraries/script-engine/src/ScriptEngine.h	2015-10-28 13:38:22 -07:00
ericrius1	ac2effb33c	Not erasing board, models hosted on s3	2015-10-28 13:32:10 -07:00
James B. Pollack	68a4365fa5	changes for arrow entity reload	2015-10-28 13:27:31 -07:00
samcake	b90af1a1ce	Fixing typo and review comments	2015-10-28 13:21:45 -07:00
ericrius1	4027782335	Fixed issue with overlays disapearing on release grab	2015-10-28 13:18:57 -07:00
samcake	07c13f4d66	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-28 12:54:46 -07:00
James B. Pollack	4e6234741a	reenable both hands to pick up arrow	2015-10-28 10:24:09 -07:00
James B. Pollack	369cf8e454	update model paths	2015-10-28 10:22:51 -07:00
James B. Pollack	0003eecf08	remove reload feature to prep for arrow netity	2015-10-28 10:20:35 -07:00
Brad Hefta-Gaub	30f7c44f61	emit hardwareChanged signal to scripts	2015-10-28 09:34:18 -07:00
James B. Pollack	8b78278a79	end of day	2015-10-27 18:26:12 -07:00
ericrius1	2f835b19fa	surface is now a model	2015-10-27 17:17:19 -07:00
samcake	6ec87086bc	Adding the state controller	2015-10-27 16:57:06 -07:00
Ryan Huffman	e9a2e91374	Add tunneling handling to pitching.js	2015-10-27 15:35:37 -07:00
Ryan Huffman	779cadd5bd	Merge branch 'baseball' of github.com:Atlante45/hifi into baseball	2015-10-27 15:14:30 -07:00
ericrius1	d67f4958cd	wait longer for dimensions	2015-10-27 13:44:29 -07:00
ericrius1	ed6a866ff9	ready for demo	2015-10-27 13:43:13 -07:00
Ryan Huffman	b46d42889d	Add foul and strike audio to baseball game	2015-10-27 13:25:43 -07:00
ericrius1	0512da0e39	updated url	2015-10-27 13:07:11 -07:00
ericrius1	25ded2bd92	added shapetype	2015-10-27 13:03:44 -07:00
ericrius1	8fcc071026	only can draw on whiteboard	2015-10-27 12:24:29 -07:00
Atlante45	1bebdc8e70	Fix scripts syntax errors	2015-10-27 12:11:27 -07:00
ericrius1	f0a1335957	fixed paint initially showing up white	2015-10-27 12:09:07 -07:00
ericrius1	fa22249f7a	Improving model	2015-10-27 12:03:30 -07:00
Atlante45	c9f49ca992	Remove baseball script	2015-10-27 11:53:46 -07:00
Stephen Birarda	7e8aec9db9	fix double URL scheme	2015-10-27 11:48:52 -07:00
Stephen Birarda	12aadd7cf2	Merge branch 'baseball' of https://github.com/Atlante45/hifi into baseball	2015-10-27 11:06:41 -07:00
Stephen Birarda	3fa4f7138a	add more sounds to the crowd, ping AssetServer from Agent	2015-10-27 10:58:31 -07:00
ericrius1	8a85468254	changing model, repositioning	2015-10-27 10:39:44 -07:00
Atlante45	e04d9de4a4	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-10-27 10:28:10 -07:00
Ryan Huffman	6c306e991b	Merge branch 'baseball' of github.com:Atlante45/hifi into baseball	2015-10-27 10:25:22 -07:00
Ryan Huffman	2cd2af2b13	Add headers to line.js and lineExample.js	2015-10-27 09:49:52 -07:00
Ryan Huffman	983c551ce3	Clean up line.js and make lifetime settable	2015-10-27 09:13:16 -07:00
James B. Pollack	d78fe089f6	add mit license	2015-10-26 17:00:54 -07:00
Ryan Huffman	2abb6a2fd5	Clean up line.js	2015-10-26 16:45:58 -07:00
Ryan Huffman	1a1ab29978	Add lineExample.js	2015-10-26 16:45:43 -07:00
James B. Pollack	37778286da	Merge branch 'master' into bow	2015-10-26 16:41:53 -07:00
James B. Pollack	a1cd4a31cb	fix typo	2015-10-26 16:41:03 -07:00
James B. Pollack	88a312f992	add functional js library... mmm, curry	2015-10-26 16:28:18 -07:00
James B. Pollack	da5db326e8	make cat quieter	2015-10-26 16:03:10 -07:00
Brad Hefta-Gaub	9c4199ef16	Merge pull request #6186 from jherico/pingpong ... Fixing spray can script	2015-10-26 14:56:06 -07:00
Atlante45	2f50652544	Merge branch 'script-engine' into baseball	2015-10-26 14:17:40 -07:00
Seth Alves	8d0aaed41a	fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl'	2015-10-26 13:50:21 -07:00
Brad Davis	b2c3311947	Merge pull request #6174 from samcake/controllers ... Controllers : Adding a moving average for the velocity field returned by the Hydra controller	2015-10-26 13:46:32 -07:00
Brad Davis	d91d0a2027	Fixing spray can script	2015-10-26 12:47:31 -07:00
James B. Pollack	fc8184ffed	add arcade sound	2015-10-26 12:25:51 -07:00
James B. Pollack	fb5b600211	bow work	2015-10-26 12:25:01 -07:00
Stephen Birarda	47e8a1bdf7	connect to correct signal for sound ready	2015-10-26 12:15:08 -07:00
Stephen Birarda	61ad91aba6	hook Sound downloaded to start playback	2015-10-26 12:09:48 -07:00
Atlante45	9d6f55ea93	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-26 11:59:53 -07:00
Stephen Birarda	e8c6acfeb6	update baseball crowd to loop better	2015-10-26 11:58:49 -07:00
Brad Davis	34b5178393	Fixing ping-ping entity script	2015-10-26 11:55:23 -07:00
Atlante45	1e4a414f9d	Fix scripts syntax errors	2015-10-26 11:33:36 -07:00
Brad Hefta-Gaub	88ba6cda24	Merge pull request #6177 from jherico/guns ... Controller Branch - Fix gun.js	2015-10-26 10:51:08 -07:00
Ryan Huffman	d6230fbed3	Remove trailing commas in line.js	2015-10-26 10:46:36 -07:00
Ryan Huffman	6b9b4d4e6e	Add libraries/line.js	2015-10-26 10:44:39 -07:00
James B. Pollack	c0cb8b542e	add notching system, add fire	2015-10-25 22:47:02 -07:00
Brad Davis	75b2ee94b2	PR feedback	2015-10-25 19:37:41 -07:00
Brad Davis	3e50174114	Updating gun.js to new controller API	2015-10-24 16:26:50 -07:00
Brad Hefta-Gaub	394511ac1b	fix frisbee.js to work with new API	2015-10-24 09:50:09 -07:00
Brad Davis	f61cf843bc	Merge pull request #6172 from ZappoMan/fixScripts ... fix walkApi.js to detect hydra in official way	2015-10-23 21:04:17 -07:00
Brad Hefta-Gaub	6cffe8cb6a	Merge pull request #6169 from EdgarPironti/controllers2 ... fix toyball.js	2015-10-23 20:21:00 -07:00
Brad Hefta-Gaub	0b99728575	Merge pull request #6175 from AlessandroSigna/controllers ... fix stick.js	2015-10-23 20:20:00 -07:00
Brad Hefta-Gaub	3a2328a887	Merge pull request #6173 from EdgarPironti/controllers ... Fixed sword.js	2015-10-23 20:07:52 -07:00
AlessandroSigna	7f3f202567	fix stick.js	2015-10-23 18:23:15 -07:00
samcake	eae316100a	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-23 18:18:27 -07:00
samcake	d400c694f6	Cleaning up for release	2015-10-23 18:09:54 -07:00
EdgarPironti	0d15182adb	Fixed sword.js	2015-10-23 18:09:43 -07:00
Brad Hefta-Gaub	4a19a14682	fix walkApi.js to detect hydra in official way	2015-10-23 17:53:34 -07:00
Brad Davis	304fe49628	Merge pull request #6170 from ZappoMan/fixScripts ... various controller script updates	2015-10-23 17:43:54 -07:00
James B. Pollack	29de3581dd	end of day	2015-10-23 17:39:03 -07:00
Brad Hefta-Gaub	060f87d14a	CR feedback	2015-10-23 17:33:45 -07:00
samcake	be843a0035	adding a rnning average on the velocity values returned by the hydra and adding a simple js to test	2015-10-23 17:32:54 -07:00
Brad Hefta-Gaub	9aaef9aabd	fix hydraPaint.js to use new API	2015-10-23 17:32:06 -07:00
EdgarPironti	0959c98132	Fixed tab	2015-10-23 17:26:44 -07:00
Brad Davis	4e6f64833f	Conditional support from JS	2015-10-23 17:24:04 -07:00
Brad Hefta-Gaub	9ba1b800d9	CR feedback	2015-10-23 17:15:39 -07:00
Brad Hefta-Gaub	090dc5409b	CR feedback	2015-10-23 17:14:59 -07:00
Brad Hefta-Gaub	ed20e7d209	CR feedback	2015-10-23 17:14:13 -07:00
EdgarPironti	c64290b5cd	Removed unused variables	2015-10-23 17:13:29 -07:00
Brad Hefta-Gaub	9285cf8e2c	fix hydraGrabHockey.js to use new API	2015-10-23 17:12:26 -07:00
Atlante45	667eec2f46	change collision hull	2015-10-23 16:43:59 -07:00
Atlante45	7487c7bd0a	Move baseball.js	2015-10-23 16:32:27 -07:00
Atlante45	c1cd7dd50a	Work on robot animation and bat hull	2015-10-23 16:31:38 -07:00
Brad Hefta-Gaub	6b795364c8	make handGrab treat shoulder bumbers and triggers as merged control	2015-10-23 16:30:40 -07:00
EdgarPironti	5c09391170	fix toyball.js	2015-10-23 16:19:40 -07:00
AlessandroSigna	5d8d8c8f0d	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-23 15:50:39 -07:00
AlessandroSigna	37e1e43ce0	Fix paddleBall.js	2015-10-23 15:48:29 -07:00
James B. Pollack	6e8d505726	updates	2015-10-23 14:38:17 -07:00
Brad Hefta-Gaub	7e3192d0f6	fix drumstick.js ... fix drumstick.js	2015-10-23 14:22:50 -07:00
James B. Pollack	63d18acf91	bow updates	2015-10-23 14:12:56 -07:00
AlessandroSigna	6001968d92	Fix paddleBall.js	2015-10-23 13:52:22 -07:00
AlessandroSigna	4c14cd757b	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-23 13:47:16 -07:00
Brad Davis	56deef9d6e	Moving omniTool to a route mapped input	2015-10-23 13:40:36 -07:00
Brad Davis	be148686a7	Fixing omnitool	2015-10-23 13:40:36 -07:00
Brad Davis	d83ad7fdc1	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-23 13:35:24 -07:00
AlessandroSigna	c2078aca3f	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-23 11:27:16 -07:00
EdgarPironti	5bae83173c	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-23 11:16:02 -07:00
Atlante45	8c08ad38d7	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-10-23 10:43:18 -07:00
James B. Pollack	6392b7080b	move scripts no longer in toybox to better locations	2015-10-23 10:36:32 -07:00
Brad Davis	63df9fb959	Fixing raw sound playback and air guitar	2015-10-22 22:37:18 -07:00
AlessandroSigna	ae2f7f6ff6	Fix paddleBall.js	2015-10-22 18:50:23 -07:00
EdgarPironti	eaaec516c2	fix controllerExample	2015-10-22 18:41:57 -07:00
Brad Davis	103fe3c545	Merge pull request #6155 from ZappoMan/fixScripts ... fix airGuitar.js	2015-10-22 18:19:26 -07:00
samcake	3e4bada313	remove uneeded var	2015-10-22 18:03:47 -07:00
James B. Pollack	ca0aad7d3b	update after updating models	2015-10-22 17:25:15 -07:00
Atlante45	70c32e4b13	Remove empty script	2015-10-22 16:45:57 -07:00
Atlante45	05b794259e	Script cleanup and particles on ground collisions	2015-10-22 16:43:37 -07:00
Stephen Birarda	1d5d655814	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-22 16:29:44 -07:00
Stephen Birarda	4f6da68a1f	add getJointPosition and getJointRotation for entities	2015-10-22 16:25:28 -07:00
samcake	9015e98b70	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-22 16:13:54 -07:00
samcake	0ad4634eac	Check that the velocity information is passed correctly and fixed clap.js	2015-10-22 16:13:12 -07:00
samcake	2db87e0d2d	Remove hydramove.js and expose the velocity and angular Velocity for hydra	2015-10-22 15:55:36 -07:00
Brad Hefta-Gaub	c826b48c92	fix airGuitar.js	2015-10-22 15:05:59 -07:00
Stephen Birarda	06872a6c04	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-10-22 14:45:20 -07:00
Stephen Birarda	cfa47d2fc6	use triggers to swing with robot	2015-10-22 14:45:08 -07:00
Brad Davis	5227c40298	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-22 12:15:41 -07:00
samcake	2ebf862da9	Merge pull request #6148 from jherico/controllerFunctions ... Fixing controller functions & makeAxis	2015-10-22 11:56:58 -07:00
EdgarPironti	09cdc01599	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-22 11:50:45 -07:00
Brad Davis	7ed9ed8500	Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS ... make handControllerGrab.js work with new API	2015-10-22 11:40:48 -07:00
Stephen Birarda	a9bad8de66	add a script for ambient crowd noise	2015-10-22 11:12:02 -07:00
Brad Davis	6cf0bdcffe	Testing function destination and fixing bug in rule ordering for multi-soure	2015-10-22 10:00:11 -07:00
Brad Davis	5d4cbfdacb	Resolving ambiguity between functions and inputs differently	2015-10-22 09:50:24 -07:00
Brad Davis	4938e5ea84	Fixing function based routes, makeAxis	2015-10-22 09:50:23 -07:00
Brad Hefta-Gaub	3e7364608b	make handControllerGrab.js work with new API	2015-10-22 09:17:29 -07:00
Brad Davis	637654adea	Wiring up step yaw	2015-10-21 18:46:09 -07:00
Atlante45	d8e997d91f	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-21 17:52:30 -07:00
Ryan Huffman	934575a78a	Refactor pitching.js	2015-10-21 16:46:07 -07:00
EdgarPironti	f3dd529a5f	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-21 15:02:40 -07:00
Ryan Huffman	8f83870e52	Update pitching.js to add audio	2015-10-21 14:19:21 -07:00
James B. Pollack	b8f0972228	move bow into toybox	2015-10-21 14:00:51 -07:00
James B. Pollack	4e8c306f66	Merge branch 'master' into bow	2015-10-21 14:00:19 -07:00
James B. Pollack	cf10277f2d	Merge branch 'master' into bow	2015-10-21 13:47:19 -07:00
James B. Pollack	5b417a1ba5	use updated hand controller	2015-10-21 13:47:17 -07:00
Brad Hefta-Gaub	d865eb2e24	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-21 12:46:26 -07:00
James B. Pollack	384a6a8154	rename /toys to /toybox, remove non toybox scripts, update master refs	2015-10-21 11:36:49 -07:00
Eric Levin	970d189262	Merge pull request #6125 from imgntn/toybox_ac ... [Scripts] Add Toybox AC Scripts, cleanup their headers, organize	2015-10-21 11:24:59 -07:00
Stephen Birarda	e28cc12dd8	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-10-21 10:56:03 -07:00
James B. Pollack	0b06cf1dfb	cleanup	2015-10-21 10:53:32 -07:00
James B. Pollack	68d43dc576	reduce number of toybox sound scripts	2015-10-21 10:50:37 -07:00
Stephen Birarda	e9ed6b8886	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-21 10:10:09 -07:00
Stephen Birarda	bfd9619404	add simple script that spawns a bat when run	2015-10-21 10:10:04 -07:00
Ryan Huffman	21903b746c	CP	2015-10-21 10:06:51 -07:00
Brad Davis	21a3079a39	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-21 10:05:32 -07:00
James B. Pollack	80fb12b1a4	Merge branch 'master' into toybox_ac	2015-10-21 09:58:49 -07:00
Brad Hefta-Gaub	6465bb85dd	Merge pull request #6124 from imgntn/bball_fixes ... [Scripts] Fix Basketball Solidity in Toybox	2015-10-21 09:11:12 -07:00
Seth Alves	f85ef9267b	oops	2015-10-20 18:29:27 -07:00
Seth Alves	311254c395	require user-data to have wantsTrigger in it before non-colliding calls will happen	2015-10-20 18:26:12 -07:00
samcake	e0615309bb	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-20 17:48:38 -07:00
Brad Davis	0e419e3fbb	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-20 17:47:37 -07:00
Seth Alves	7dcbb5849a	another bug	2015-10-20 17:44:12 -07:00
Seth Alves	ed480f651f	missed a line	2015-10-20 17:43:31 -07:00
Seth Alves	f16b62df83	- grab script: possible fix for line disappearing ... - grab script: go from 3 pickrays back to 1 - grab script: put "sphere" test back in, but with fixed distance test	2015-10-20 17:34:35 -07:00
Ryan Huffman	c67eafffba	Add pitching.js	2015-10-20 16:59:03 -07:00
James B. Pollack	8e1c3c32d1	additions to debug and also to handle some two handed situations	2015-10-20 16:24:17 -07:00
James B. Pollack	fd0dc3cd49	bow and grab	2015-10-20 16:22:30 -07:00
Atlante45	8d4d4a555c	Add kinematicGrab option in handControllerGrab.js	2015-10-20 16:00:38 -07:00
James B. Pollack	d01faad9ed	Merge branch 'master' into bow	2015-10-20 14:49:55 -07:00
Andrew Meadows	d02fe784a9	css and cfg filetypes are text in .gitattributes	2015-10-20 13:58:44 -07:00
James B. Pollack	31f1dfe25c	good two handed stuff	2015-10-20 13:35:28 -07:00
Andrew Meadows	4ff05e8c2a	fix lin endings of some JS files	2015-10-20 13:26:19 -07:00
James B. Pollack	b29f0b13a9	Merge branch 'master' into bow	2015-10-20 12:22:25 -07:00
James B. Pollack	8f0cc42859	normalize line endings	2015-10-20 12:22:12 -07:00
James B. Pollack	b0ae55ee63	update cat purr header	2015-10-20 11:28:04 -07:00
James B. Pollack	771e5a4f9d	add toybox ac scripts, write headers for them, organize	2015-10-20 11:21:09 -07:00
James B. Pollack	af09871bed	fix basketball solidity in toybox	2015-10-20 11:08:28 -07:00
James B. Pollack	a4166fd1c3	bow stuff	2015-10-20 10:54:24 -07:00
samcake	16f96715a3	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-20 10:16:08 -07:00
Brad Davis	8d0148a1ca	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-20 10:13:31 -07:00
Brad Hefta-Gaub	dfe3e5b1cb	fix laser lifetimes	2015-10-20 09:30:27 -07:00
samcake	8701d73ee9	DOing the groundwork to pass along the pose ... still not working	2015-10-19 19:05:37 -07:00
James B. Pollack	1daeedec9b	end of day	2015-10-19 18:04:08 -07:00
Seth Alves	41f7ef1e2e	cleanups	2015-10-19 16:53:27 -07:00
Seth Alves	6138775270	put back support for spatialKey	2015-10-19 15:40:14 -07:00
Seth Alves	5a968e3c96	tweak	2015-10-19 15:20:04 -07:00
Seth Alves	8fbf081223	git rid of sphere test	2015-10-19 14:51:18 -07:00
James B. Pollack	3ddfce911e	bow, arrow, createbow	2015-10-19 01:37:47 -07:00
James B. Pollack	62206b747f	bow work	2015-10-19 01:07:27 -07:00
James B. Pollack	2158af0fe3	making a bow	2015-10-18 22:26:50 -07:00
Brad Hefta-Gaub	8578b40236	get JS source functions working across threads	2015-10-17 14:14:45 -07:00
Brad Hefta-Gaub	7956d737ab	fix thread safety issue on JS based fliters	2015-10-17 14:08:21 -07:00
Seth Alves	353f92f1ba	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-17 13:09:52 -07:00
Brad Hefta-Gaub	f90f0ed1f3	apply Huffman's feedback to Sam's PR	2015-10-17 12:34:32 -07:00
Brad Hefta-Gaub	fd5a5bb104	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-17 12:22:39 -07:00
Brad Hefta-Gaub	75c59fad99	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-10-17 12:18:14 -07:00
samcake	941f95c7d4	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-16 18:07:25 -07:00
samcake	20416455db	Adding the loadMapping feature	2015-10-16 18:06:58 -07:00
samcake	f675035fd1	Merge pull request #6101 from jherico/controllers ... Hydra controller updates and test code	2015-10-16 17:43:44 -07:00
Brad Davis	5bac1aae2d	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-16 17:23:30 -07:00
Brad Davis	db0fa6b8ed	Update hydra mappings and test code	2015-10-16 17:23:09 -07:00
James B. Pollack	31cc451fd4	css cleanup	2015-10-16 16:42:29 -07:00
James B. Pollack	c6fcaf158b	add color to more props	2015-10-16 16:15:20 -07:00
James B. Pollack	aa6aaf912e	add color bars below position inputs	2015-10-16 16:07:20 -07:00
samcake	6d3d29b6b7	Adding a new mapping	2015-10-16 15:24:44 -07:00
Seth Alves	aaad1a4a36	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-16 14:34:21 -07:00
samcake	f0034844e7	Actions working from the Controller layer	2015-10-16 12:24:12 -07:00
James B. Pollack	4b21bdf308	testing	2015-10-16 11:50:13 -07:00
Seth Alves	c98685f6d3	in STATE_CONTINUE_FAR_GRABBING_NON_COLLIDING, when the ray moves off of the entity, switch back to search state	2015-10-16 11:39:27 -07:00
Seth Alves	066696e201	don't go into continue-far-grabbing-non-colliding mode.	2015-10-16 11:18:41 -07:00
samcake	43d7fe491e	wiring the actions	2015-10-15 17:53:53 -07:00
Brad Hefta-Gaub	26f82e899e	Merge pull request #6079 from ericrius1/whiteboard ... Entity whitelist for raypicking and whiteboard painting example	2015-10-15 17:50:35 -07:00
Brad Hefta-Gaub	c3ee419ad7	Merge pull request #6086 from imgntn/flashlight_life ... [Scripts] Add lifetime to lights created by flashlight	2015-10-15 17:42:57 -07:00
ericrius1	97fe0170cb	glowing box for black color	2015-10-15 17:09:41 -07:00
samcake	2ad6c2067b	MErging maybe finally ??????	2015-10-15 14:43:15 -07:00
ericrius1	e8b6b32572	Remembering whiteboards last color between sessions	2015-10-15 14:12:15 -07:00
Brad Davis	80c962a4cc	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-15 12:27:53 -07:00
ericrius1	dc6875f5b5	Strokes moving forward to avoid zfighting and incorrect overlaps	2015-10-15 11:50:23 -07:00
ericrius1	3b59bffb79	Deleting only strokes from the whiteboard where the erase button was clicked on	2015-10-15 11:38:18 -07:00
samcake	cdfe9788d1	Merging	2015-10-15 10:49:08 -07:00
Seth Alves	c884f466bc	adjust timing of action refresh	2015-10-15 10:40:58 -07:00
ericrius1	55c68e0509	Merge branch 'master' into whiteboard	2015-10-15 10:08:32 -07:00
James B. Pollack	d8c979b9d4	add lifetime to lights created by flashlight	2015-10-15 10:07:21 -07:00
Seth Alves	c96f7562f2	Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes	2015-10-15 09:28:57 -07:00
Thijs Wenker	c99573ea64	Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now!	2015-10-15 15:35:35 +02:00
Thijs Wenker	8111432088	Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX	2015-10-15 14:50:20 +02:00
samcake	12e103c90c	Get json creating the mappings from js	2015-10-14 17:41:39 -07:00
ericrius1	87439a049e	Made color indicator thinner	2015-10-14 17:22:46 -07:00
Brad Davis	e39219c2b5	Fixes and PR comments	2015-10-14 16:51:52 -07:00
ericrius1	5082ac4583	Added color status bar	2015-10-14 16:46:23 -07:00
ericrius1	4c709cba35	Fixed color indicator position	2015-10-14 16:17:57 -07:00
ericrius1	cfca0fe8c0	Adding a color indicator to whiteboard	2015-10-14 15:58:18 -07:00
Eric Levin	0b92bc11f6	fixed spacing	2015-10-14 13:26:10 -07:00
ericrius1	eb7b720945	got rid of whitespace	2015-10-14 13:24:22 -07:00
ericrius1	db5f7cac8d	Fixed name of whiteboard entity script URL	2015-10-14 12:03:10 -07:00
ericrius1	c63ef10c67	got rid of query string	2015-10-14 11:50:35 -07:00
ericrius1	0991be3255	got rid of printing statements	2015-10-14 11:44:47 -07:00
ericrius1	22615dae07	Don't delete board on script close	2015-10-14 11:43:05 -07:00
ericrius1	6cd9bf407f	Reverted handControllerGrab	2015-10-14 11:40:06 -07:00
ericrius1	7fb6b7e272	Reverted hand controller	2015-10-14 11:31:09 -07:00
ericrius1	d072a2efd3	laser pointer now showing up all the time	2015-10-14 11:26:38 -07:00
ericrius1	1a9c1110c0	Fixed gap between strokes	2015-10-14 11:17:54 -07:00
ericrius1	20d1a2440c	Ignoring unknown types in collision	2015-10-14 11:15:49 -07:00
Brad Davis	f051a84dc6	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-14 10:54:32 -07:00
ericrius1	caacbcbe78	Adjust erase box position	2015-10-14 10:40:55 -07:00
Seth Alves	2a9b1c0fc3	fix refresh of hold action	2015-10-14 09:31:29 -07:00
Seth Alves	698a4001a8	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-14 06:18:02 -07:00
Brad Davis	0c31fb1b1b	Merge pull request #6069 from ZappoMan/controllers ... Hack in NewControllers into the JS layer of interface to allow testing	2015-10-13 19:08:26 -07:00
ericrius1	8e21999e44	erasing board	2015-10-13 16:54:37 -07:00
ericrius1	e42bbbc10d	Adding erase board feature to whiteboard	2015-10-13 16:41:05 -07:00
ericrius1	2c8b85bb5c	Displaying overlay laser pointer, user must past threshold to paint	2015-10-13 16:13:24 -07:00
ericrius1	4c877e8204	Changing color when grabbing colored boxes	2015-10-13 15:46:10 -07:00
ericrius1	b54b488b9e	Adding in color selecting	2015-10-13 15:23:02 -07:00
ericrius1	a3f948acf8	Adding entity script to each color box	2015-10-13 15:00:38 -07:00
Seth Alves	755b971906	tweak	2015-10-13 14:31:52 -07:00
ericrius1	ad61b89abd	setting up colors, adding some functions to utils.js	2015-10-13 14:16:28 -07:00