4310 commits

Author	SHA1	Message	Date
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
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
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
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
Eric Levin	7e4fe4b521	Update pistol.js	2015-11-16 23:06:45 -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
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
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