35272 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	c3821d7202	avoid deadlock	2015-11-23 11:24:56 -08:00
James B. Pollack	aa2450d755	cleanup, debugging script	2015-11-23 11:15:36 -08:00
Seth Alves	5612174894	call activateBody when a hold action is deserialized	2015-11-23 11:02:41 -08:00
Howard Stearns	c94a5389a0	comments	2015-11-23 10:31:37 -08:00
Howard Stearns	5912808077	getShouldSkipRendering() => !getShouldRender().	2015-11-23 10:27:49 -08:00
Howard Stearns	f1e0742aeb	Add getTargetFrameRate().	2015-11-23 10:20:59 -08:00
ericrius1	08a64f6a6b	updated whiteboard to use new controller approach'	2015-11-23 10:08:23 -08:00
Seth Alves	6f19093cb9	if an entity with an action has a motion-type of static, flag it so it gets updated in bullet	2015-11-23 10:03:35 -08:00
James B. Pollack	b6d0be0090	Merge branch 'master' into bow	2015-11-23 10:03:15 -08:00
Brad Davis	64ba5b4f14	Cleaning up old recording files	2015-11-23 09:42:34 -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
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	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
Ryan Huffman	d1e9e28522	Update bullet tgz md5sum	2015-11-20 16:11:12 -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
Leonardo Murillo	5d2700309d	Merge branch 'master' of github.com:highfidelity/hifi into stack-manager	2015-11-20 17:43:25 -06: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
Ryan Huffman	3aa271d688	Update bullet tgz md5sum	2015-11-20 15:21:53 -08:00
James B. Pollack	4efe31f158	work	2015-11-20 15:15:57 -08:00
Ryan Huffman	67d0792173	Update bullet tgz md5sum	2015-11-20 15:09:06 -08:00