34891 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	c22a07bba7	bow collisions, etc	2015-11-23 12:36:39 -08:00
James B. Pollack	aa2450d755	cleanup, debugging script	2015-11-23 11:15:36 -08:00
James B. Pollack	b6d0be0090	Merge branch 'master' into bow	2015-11-23 10:03:15 -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
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
samcake	eecb5b91b2	Merge pull request #6460 from EdgarPironti/asset_branch ... Save clip to asset - removing last fix	2015-11-20 18:52:18 -08:00
EdgarPironti	ebbed7c525	Save clip to asset - removing last fix	2015-11-20 18:23:36 -08:00
Clément Brisset	22287cb022	Merge pull request #6459 from samcake/controllers ... Playback: Clean up a bit of the playbackAgent script	2015-11-20 18:20:12 -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	de56f698aa	Merge pull request #6444 from EdgarPironti/asset_branch ... Save clip to asset	2015-11-20 16:28:55 -08:00
Brad Davis	336562b894	Merge pull request #6452 from ctrlaltdavid/20732 ... Make multiline strings from JavaScript's print() readably in log file	2015-11-20 16:25:17 -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
EdgarPironti	df2153186d	Fixes	2015-11-20 16:07:31 -08:00
EdgarPironti	e70f6855aa	Fixes	2015-11-20 16:07:30 -08:00
EdgarPironti	35365f9157	Fixes	2015-11-20 16:07:30 -08:00
EdgarPironti	1db6d0e3c1	Upload QByteArray	2015-11-20 16:07:29 -08:00
EdgarPironti	1b18d3656f	Save clip to asset	2015-11-20 16:07:29 -08:00
Brad Hefta-Gaub	a7d5ca92ca	Merge pull request #6456 from EdgarPironti/record_branch ... Playback Agents/Master fixes	2015-11-20 16:03:09 -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
Philip Rosedale	fbbb7104a0	Merge pull request #6454 from howard-stearns/remove-obsolete-bot_procedural.js ... Remove obsolete script bot_procedural.js	2015-11-20 15:50:00 -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
Brad Davis	f45eff3df9	Merge pull request #6455 from samcake/controllers ... Recording playback the skeleton animation correctly for agents	2015-11-20 15:35:53 -08:00
samcake	0dc551409d	Fixing a comment	2015-11-20 15:22:01 -08:00
James B. Pollack	4efe31f158	work	2015-11-20 15:15:57 -08:00
samcake	e97e864de7	Getting the animation playback to work	2015-11-20 15:05:17 -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
Clément Brisset	5d75fcbfce	Merge pull request #6430 from birarda/unique_linked_data ... use a unique_ptr for linkedData in Node	2015-11-20 15:01:41 -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
David Rowe	c72c6a0a47	Make multiline strings from JavaScript's print() readably in log file ... Addresses quoting of newline characters as "\n" which was introduced in Qt 5.5.	2015-11-21 10:44:21 +13: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
Brad Hefta-Gaub	b5d764814c	Merge pull request #6450 from birarda/agent-script-fail ... fix for agent script download fail	2015-11-20 13:29:10 -08:00
Brad Hefta-Gaub	879c42c269	Merge pull request #6451 from jherico/rec5 ... Force synchronous loading of clips in JS	2015-11-20 13:13:34 -08:00
Brad Davis	eef01f8a13	Merge pull request #6443 from ZappoMan/assetJS ... fix crash with no asset server	2015-11-20 12:58:16 -08:00
Stephen Birarda	b34934b849	resolve conflicts on merge with upstream/master	2015-11-20 11:52:53 -08:00
Brad Davis	cc2a7cbda8	Force synchronous loading of clips in JS	2015-11-20 11:51:08 -08:00
Brad Hefta-Gaub	c22d632c3a	Merge pull request #6446 from jherico/rec4 ... Support writing a clip to a qbytearray	2015-11-20 11:45:39 -08:00
Stephen Birarda	cf204ad5b0	cleanup executeScript comment in Agent	2015-11-20 11:44:58 -08:00
Stephen Birarda	aa836aa4b5	add a script request timeout	2015-11-20 11:44:04 -08:00