35227 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Stephen Birarda	9ddebc8d13	resolve conflicts on merge with upstream/master	2015-11-20 15:29:44 -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
Anthony J. Thibault	4f8cd6930d	Rig: Fixes for initializing _absolutePoses during initJointStates	2015-11-20 15:13:16 -08:00
Ryan Huffman	67d0792173	Update bullet tgz md5sum	2015-11-20 15:09:06 -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
Anthony J. Thibault	2f37335d77	Warning fixes	2015-11-20 14:50:42 -08:00
Ryan Huffman	7e87ad5114	Update bullet tgz md5sum	2015-11-20 14:50:31 -08:00
Brad Hefta-Gaub	75dfef067c	test script	2015-11-20 14:40:27 -08:00
Anthony J. Thibault	30087ef0bd	Removed dead code	2015-11-20 14:37:53 -08:00
James B. Pollack	49e815f3d6	Merge remote-tracking branch 'upstream/master' into bow	2015-11-20 14:33:26 -08:00
Anthony J. Thibault	cb89f09635	Removed EntityRig and AvatarRig. One Rig to rule them all.	2015-11-20 14:27:01 -08:00
Howard Stearns	9673133bf4	whitespace (reduce diffs)	2015-11-20 14:26:37 -08:00
Anthony J. Thibault	a77ea8da43	Removed JointStates! You won't be missed.	2015-11-20 14:15:37 -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
Ryan Huffman	784df60a97	Update bullet archive to include CCD+Compound improvements	2015-11-20 13:56:20 -08:00
howard-stearns	6c784256cb	final(?) cleanup	2015-11-20 13:51:12 -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
Leonardo Murillo	d17bf28bce	Merge branch 'master' of github.com:highfidelity/hifi into stack-manager	2015-11-20 15:20:08 -06:00
Leonardo Murillo	9ad865c7f0	checkpoint	2015-11-20 15:19:45 -06: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
Leonardo Murillo	e17d0b2af3	Bundling and consolidating deployment package	2015-11-20 15:10:56 -06: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
Leonardo Murillo	6105191a3f	OS X Bundling	2015-11-20 14:45:25 -06: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
howard-stearns	a366598598	snapshot. It works.	2015-11-20 11:48:44 -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
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
Brad Hefta-Gaub	f1badc017b	CR feedback	2015-11-20 11:43:50 -08:00
Brad Davis	a356f96a7b	Merge pull request #6448 from ZappoMan/messaging ... fix senderID in messages, dry up code	2015-11-20 11:42:30 -08:00
samcake	14ebb2e609	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-20 11:41:52 -08:00
Clément Brisset	f4b0492b33	Merge pull request #6436 from birarda/ghost-avatar ... fix for ghosted avatars thanks to check/add race	2015-11-20 11:41:20 -08:00
Brad Hefta-Gaub	7e9190d0e1	Merge branch 'master' of https://github.com/highfidelity/hifi into assetJS	2015-11-20 11:39:50 -08:00