4614 commits

Author	SHA1	Message	Date
Stephen Birarda	733665d722	fix spacing in baseballCrowd.js	2015-11-30 15:53:42 -08:00
Clément Brisset	e168966b87	Merge pull request #6409 from birarda/injector-hybrid ... more efficient threading of networked AudioInjector objects	2015-11-30 15:36:41 -08:00
ericrius1	706a67b9a1	lowered restitution to 0 to avoid too many collision sounds playing	2015-11-30 15:10:32 -08:00
Seth Alves	02c4730388	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-30 14:09:31 -08:00
Stephen Birarda	a33e57dfdb	remove audio files from history	2015-11-30 14:06:09 -08:00
Stephen Birarda	4573e5c59e	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
James B. Pollack	8267c70bb1	hide avoiders	2015-11-30 12:45:10 -08:00
James B. Pollack	bd58a45d5a	Merge branch 'ratsteer' of https://github.com/imgntn/hifi into ratsteer	2015-11-30 12:44:22 -08:00
James B. Pollack	cd4ac8ac69	good enough	2015-11-30 12:44:06 -08:00
ericrius1	b7884f487c	rats	2015-11-30 11:44:34 -08:00
ericrius1	22efcb1854	Added sounds to pistol	2015-11-30 11:42:34 -08:00
James B. Pollack	1190f1b6cc	Merge branch 'master' into ratsteer	2015-11-30 11:25:50 -08:00
Anthony J. Thibault	11bfed4185	Merge branch 'master' into tony/remove-joint-states	2015-11-30 11:21:44 -08:00
samcake	1be494a257	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-30 09:36:29 -08:00
Sam Cake	3f43fde459	AFter 3 days on that piece of shit i just give up, js is just too hard to debug, i m very sad	2015-11-30 04:11:17 -08:00
Seth Alves	9548b0e138	get parent-id field working	2015-11-29 13:38:27 -08:00
Seth Alves	bbc9d5d131	add missing single-quote	2015-11-29 13:04:45 -08:00
James Pollack	44f69a2a18	Merge branch 'master' into bow	2015-11-29 11:37:25 -08:00
Seth Alves	e91a8684a4	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-29 10:17:36 -08:00
James Pollack	0625d4f4c2	remove debugging string	2015-11-28 23:40:58 -08:00
James Pollack	55f797838f	remove unused key	2015-11-28 23:22:00 -08:00
James Pollack	1e2398cbea	use constants	2015-11-28 23:04:52 -08:00
James Pollack	1315201bdc	update name of function	2015-11-28 22:55:44 -08:00
James Pollack	017ffb8f2e	change way messages get sent to the hand disabler	2015-11-28 22:54:31 -08:00
James Pollack	8f51ee6f58	rename hand disabler	2015-11-28 22:29:12 -08:00
James B. Pollack	fe0a732b5d	remove rattest file	2015-11-27 13:11:00 -08:00
James B. Pollack	b23a9dd346	Merge branch 'master' into ratsteer	2015-11-27 13:06:36 -08:00
James B. Pollack	8daeb0fa0d	revert hand grab script to current master	2015-11-27 12:18:11 -08:00
James B. Pollack	9ec2a01475	isolate grab script changes from bow branch	2015-11-27 12:13:53 -08:00
James B. Pollack	b6a165d3ef	Merge branch 'master' into bow	2015-11-27 11:41:21 -08:00
James B. Pollack	0ba6d172e8	Merge branch 'bow' of https://github.com/imgntn/hifi into bow	2015-11-27 11:21:33 -08:00
James B. Pollack	c237485023	revert playaspawner	2015-11-27 11:21:18 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Seth Alves	36e293608a	more adding parentID to edit.js	2015-11-26 05:31:52 -08:00
Sam Cake	37d3083e07	Getting the Actor class starting to work and usable for the playback master!	2015-11-26 00:41:46 -08:00
samcake	3273fbcad4	Creating the master / agent hiring system	2015-11-25 17:10:38 -08:00
Anthony J. Thibault	23def8d173	Merge branch 'master' into tony/remove-joint-states	2015-11-25 13:55:23 -08:00
Clément Brisset	5ff482071e	Merge pull request #6465 from ericrius1/polyLineFix ... moved logic to build vertex buffer to renderable polyline class, recalculati…	2015-11-25 11:02:02 -08:00
samcake	184669762a	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-25 10:28:55 -08:00
Andrew Meadows	bc20b72645	Merge pull request #6453 from howard-stearns/avatar-render-controller2 ... Survive Flash Mobs Without Making Everyone Sick	2015-11-25 09:52:28 -08:00
Sam Cake	574eb3dc99	Improving the Master/Agent api	2015-11-25 02:50:12 -08:00
David Rowe	6e076985f2	JSLint	2015-11-25 16:46:53 +13:00
David Rowe	46cbc349d1	Fix laserPointer.js for Hydras ... Leap Motion working already.	2015-11-25 16:39:09 +13:00
David Rowe	566b27156c	Fix hand and finger joint control in leapHands.js for HMD mode	2015-11-25 15:45:33 +13:00
AlessandroSigna	cb0b5b5d02	added prompt	2015-11-24 18:31:41 -08:00
samcake	bad01d02f8	building the master/agent api	2015-11-24 18:31:28 -08:00
James B. Pollack	1776b08e1b	end of day	2015-11-24 17:35:18 -08:00
David Rowe	6736eefbc1	Fix arm and finger joint control in leapHands.js for desktop mode	2015-11-25 14:14:22 +13:00
Anthony J. Thibault	f120e10ff4	Merge branch 'master' into tony/remove-joint-states	2015-11-24 15:00:05 -08:00
James B. Pollack	23f10659b0	update to new trigger method	2015-11-24 14:00:23 -08:00
James B. Pollack	be7d52a773	protect beam disabler from others	2015-11-24 13:35:53 -08:00
James B. Pollack	50c1786e9b	trigger changes and message debugging	2015-11-24 12:46:01 -08:00
James B. Pollack	2add609387	use new thingo	2015-11-24 12:12:01 -08:00
samcake	bba5bf7a21	Trying to get the Agent to Mater more reliable	2015-11-24 11:28:00 -08:00
James B. Pollack	29ddc74be7	Merge branch 'master' into ratSteer	2015-11-24 11:23:03 -08:00
James B. Pollack	52edc3b701	cleanup beamdisabler	2015-11-24 10:43:33 -08:00
James B. Pollack	13e1042bfa	use messages instead of hidden entities to disable beams	2015-11-24 10:37:08 -08:00
Thijs Wenker	712048ce51	ignore other than left press events in edit.js, this makes the rightclick camera more confortable while in edit.js/edit mode	2015-11-24 19:35:10 +01:00
James B. Pollack	fd26427390	add pullback / pushfwd	2015-11-24 10:23:29 -08:00
Stephen Birarda	ab7cbc0b76	Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid	2015-11-24 10:45:00 -06:00
Brad Hefta-Gaub	1d8e2edafb	Merge pull request #6464 from ericrius1/whiteboardFix ... updated whiteboard to use new controller approach	2015-11-23 19:44:28 -08:00
James B. Pollack	2ff4e87a93	add animation urls to rat	2015-11-23 18:28:57 -08:00
James B. Pollack	1d2ad7d5ac	Merge branch 'master' into ratsteer	2015-11-23 18:24:39 -08:00
AlessandroSigna	70cf5c6726	fixed icon position	2015-11-23 17:59:31 -08:00
AlessandroSigna	489cde7269	removed the local save of the recording	2015-11-23 17:51:58 -08:00
Eric Levin	40be9ae121	Commented out whiteboard cleanup	2015-11-23 17:15:26 -08:00
AlessandroSigna	44c95c13fb	further UI fixes	2015-11-23 16:57:24 -08:00
ericrius1	0980dbed60	added accidently-deleted particles.js file back	2015-11-23 15:25:43 -08:00
ericrius1	c36719cba7	Removed deprecated rat files	2015-11-23 15:24:28 -08:00
ericrius1	0f4e531be6	Added a monster shooting gallery	2015-11-23 15:22:34 -08:00
AlessandroSigna	8f1ce6e1fb	overlay added - waiting for official logos ... missing null assignment	2015-11-23 14:52:16 -08:00
Stephen Birarda	0997d3dcae	resolve conflicts on merge with upstream/master	2015-11-23 16:15:15 -06:00
James B. Pollack	0fd389b02f	remove arrowTest	2015-11-23 12:53:58 -08:00
James B. Pollack	c22a07bba7	bow collisions, etc	2015-11-23 12:36:39 -08:00
ericrius1	1409ed2d18	moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes	2015-11-23 12:28:44 -08:00
Eric Levin	7e8b692499	Update whiteboardEntityScript.js ... Removed logging	2015-11-23 12:04:13 -08:00
Seth Alves	171f6da264	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-23 11:43:56 -08:00
James B. Pollack	aa2450d755	cleanup, debugging script	2015-11-23 11:15:36 -08:00
ericrius1	08a64f6a6b	updated whiteboard to use new controller approach'	2015-11-23 10:08:23 -08:00
James B. Pollack	b6d0be0090	Merge branch 'master' into bow	2015-11-23 10:03:15 -08:00
ericrius1	656d2f5c61	url tweaks	2015-11-23 09:52:37 -08:00
James B. Pollack	8e81c3252a	cleanup and mostly? working	2015-11-22 22:24:42 -08:00
James B. Pollack	aa832311f5	add beam disabler	2015-11-22 22:12:43 -08:00
Anthony J. Thibault	821264a031	Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states	2015-11-22 16:15:03 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
James B. Pollack	3f4dee80d9	more cleanup	2015-11-21 02:32:54 -08:00
James B. Pollack	945243306b	cleanup	2015-11-21 01:47:20 -08:00
James B. Pollack	f56c4ff575	still debugging	2015-11-20 21:14:28 -08:00
AlessandroSigna	05d311cff3	remove Windows.prompt cause of crash	2015-11-20 18:58:49 -08:00
AlessandroSigna	a1053ee5a0	pop up a prompt with url	2015-11-20 18:58:47 -08:00
AlessandroSigna	7069f7d6ab	added clip load to asset + clean code	2015-11-20 18:58:46 -08:00
AlessandroSigna	a306e8d5b1	master can upload performance file on asset	2015-11-20 18:58:45 -08:00
samcake	6e9e53bd0c	Clean up a bit of the playbackAgent script	2015-11-20 18:17:53 -08:00
James B. Pollack	b2dd900cb2	rotate correctly	2015-11-20 18:12:06 -08:00
James B. Pollack	a65b3b9aaa	collisions	2015-11-20 17:12:54 -08:00
James B. Pollack	06322b1d6b	dont update prenotch for everyone	2015-11-20 16:30:05 -08:00
samcake	5d17fa0b34	Merge pull request #6458 from ZappoMan/acPlayback ... allow playbackAgents to auto-register	2015-11-20 16:25:02 -08:00
James B. Pollack	c6be37f63f	lifetime	2015-11-20 16:10:39 -08:00
Philip Rosedale	ba0f30a487	Merge pull request #6457 from imgntn/damping ... Rename linearDamping to damping in scripts	2015-11-20 16:08:16 -08:00
Brad Hefta-Gaub	985fcf7c4b	remove unneeded example	2015-11-20 16:02:01 -08:00
Brad Hefta-Gaub	f56d2fba7f	allow playbackAgents to auto-register	2015-11-20 16:00:43 -08:00
EdgarPironti	46bb45cee9	Agents/Master upgrading	2015-11-20 15:51:16 -08:00
James B. Pollack	aba65bd9b8	rename linearDamping to damping	2015-11-20 15:45:08 -08:00
James B. Pollack	c98bfca359	collisions	2015-11-20 15:41:50 -08:00
Stephen Birarda	9ddebc8d13	resolve conflicts on merge with upstream/master	2015-11-20 15:29:44 -08:00
James B. Pollack	4efe31f158	work	2015-11-20 15:15:57 -08:00
Howard Stearns	a43b0e0ed8	Remove obsolete script (superseed by animatedAvatarAgent.js), per https://app.asana.com/0/26225263936266/55964805077915/f ... (This PR does _not_ remove proceduralAnimationAPI.js that it includes, as the api is included in other scripts. Nor does this PR remove other scripts.)	2015-11-20 15:03:31 -08:00
Brad Hefta-Gaub	75dfef067c	test script	2015-11-20 14:40:27 -08:00
James B. Pollack	49e815f3d6	Merge remote-tracking branch 'upstream/master' into bow	2015-11-20 14:33:26 -08:00
howard-stearns	1ddcc62db9	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2	2015-11-20 14:05:40 -08:00
Brad Hefta-Gaub	c7673aad4a	Merge pull request #6447 from huffman/polyline-texture ... Add texture property to polyline entity type	2015-11-20 13:31:34 -08:00
Clément Brisset	c45fe5caae	Merge pull request #6440 from cozza13/20741 ... CR for Job #20741 - Change default	2015-11-20 11:43:57 -08:00
James B. Pollack	8a65c7a48f	draw strings sooner, arrow force squared, disable grab on arrow	2015-11-20 10:26:41 -08:00
EdgarPironti	e267926725	JSON computing	2015-11-19 20:04:04 -08:00
EdgarPironti	d75209cb37	Fixes to clip_url overwriting	2015-11-19 20:04:03 -08:00
EdgarPironti	fb90ffec5c	Migration of AC playback	2015-11-19 20:04:03 -08:00
James B. Pollack	225909f8a1	play notch sound at right time	2015-11-19 19:25:51 -08:00
James B. Pollack	ea59e0887d	more bow features and debug prep	2015-11-19 19:22:54 -08:00
Brad Hefta-Gaub	e6db72c887	Merge pull request #6437 from imgntn/grasp_equip ... Grasp hands when equipping entities	2015-11-19 18:28:44 -08:00
Brad Hefta-Gaub	a59dc6a423	Merge pull request #6419 from imgntn/betterbubbles ... Improvments to Bubblewand	2015-11-19 18:26:59 -08:00
Brad Hefta-Gaub	ce9c3f1969	Merge pull request #6433 from AlessandroSigna/groupRecording ... cleanup directory + recording bug fix	2015-11-19 18:26:33 -08:00
Chris Collins	7f8274f58f	removed omnitool ... removed omnitool	2015-11-19 18:08:12 -08:00
Brad Hefta-Gaub	f80a765a29	add Assets.uploadData() and Assets.downloadData()	2015-11-19 17:28:20 -08:00
James B. Pollack	6f76f0cbc0	release grasp at cleanup	2015-11-19 16:22:54 -08:00
ericrius1	8aa7228e54	fixed offsets	2015-11-19 16:19:00 -08:00
James B. Pollack	3f89d73fc6	add grasp to equip and example	2015-11-19 16:15:34 -08:00
Ryan Huffman	b122dad7ea	Add begin and middle textures to InfiniteLine	2015-11-19 15:16:23 -08:00
ericrius1	947d04e7f1	tweak to sensitivity	2015-11-19 14:39:13 -08:00
ericrius1	32f65eceaa	less sensitive firing	2015-11-19 14:32:03 -08:00
ericrius1	688afa4c69	only show laser when press trigger a bit	2015-11-19 14:23:37 -08:00
James B. Pollack	83238cf8c9	Merge remote-tracking branch 'upstream/master' into bow	2015-11-19 11:31:39 -08:00
Seth Alves	2c1ca526df	Merge pull request #6423 from ZappoMan/messaging ... add an example of an entityScript that subscribes to messages	2015-11-19 10:32:36 -08:00
ericrius1	8c5abd05c8	added gun to toybox	2015-11-19 10:13:00 -08:00
AlessandroSigna	b4f9c4158f	cleanup directory + bug fix	2015-11-19 09:45:28 -08:00
Brad Hefta-Gaub	45e8ebbe8c	Merge pull request #6432 from huffman/lod-range ... Increase available range in LOD Tools	2015-11-19 09:40:10 -08:00
Ryan Huffman	f523cad0a9	Add lodTest.js for testing LOD settings	2015-11-19 09:24:29 -08:00
Howard Stearns	0a8fd9cbad	Spread avatars around (not up to) a larger area.	2015-11-19 09:22:41 -08:00
ericrius1	c5898896bc	monster model	2015-11-18 19:12:23 -08:00
samcake	74beeefe06	Merge pull request #6420 from jherico/dargo ... Make recording and playback work in interface, playback in agent	2015-11-18 17:52:09 -08:00
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