34914 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	3aa271d688	Update bullet tgz md5sum	2015-11-20 15:21:53 -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
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
Howard Stearns	9673133bf4	whitespace (reduce diffs)	2015-11-20 14:26: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
Stephen Birarda	3b40119992	use Agent session UUID to request script	2015-11-20 11:35:24 -08:00
samcake	c6aa04ac42	Merge pull request #6415 from EdgarPironti/record_branch ... DO NOT MERGE - Migration of AC playback	2015-11-20 11:30:59 -08:00
Brad Hefta-Gaub	7441e20f58	cleanup	2015-11-20 11:20:36 -08:00
Brad Hefta-Gaub	caa8b0b5b6	fix unix build	2015-11-20 11:07:01 -08:00
Stephen Birarda	9b5bfd45bc	change lock back to locker to remove change	2015-11-20 11:04:46 -08:00
Stephen Birarda	19d3d80ff9	fixes for some incorrect assumptions	2015-11-20 11:03:52 -08:00
Brad Hefta-Gaub	4bbfcb6092	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-20 10:30:38 -08:00
Brad Hefta-Gaub	e530aa6545	don't assert on sender mismatch	2015-11-20 09:58:28 -08:00
Brad Hefta-Gaub	0e5e33446e	handle old protocol case	2015-11-20 09:57:30 -08:00
Seth Alves	00c8ccb6b0	Merge pull request #6449 from ZappoMan/removeSVO ... add deprecation warning about binary SVOs	2015-11-20 09:52:52 -08:00
Howard Stearns	b5e5adc41e	Update for changed target frame period.	2015-11-20 09:51:57 -08:00
Howard Stearns	0f6a37f0f7	remainder->fmod!	2015-11-20 09:49:14 -08:00
Brad Hefta-Gaub	8ba6dfe721	add deprication warning about binary SVOs	2015-11-20 09:29:36 -08:00
Brad Hefta-Gaub	abf169ebd9	fix senderID in messages, dry up code	2015-11-20 09:03:21 -08:00
Leonardo Murillo	6f3d818121	Checkpoint - fixing ID in dylib	2015-11-20 10:56:47 -06:00
Leonardo Murillo	7b748dc59a	Merge branch 'master' of github.com:highfidelity/hifi into stack-manager	2015-11-20 09:56:20 -06:00
Leonardo Murillo	c56a3b6d22	Checkpoint - turning quazip into external	2015-11-20 09:56:10 -06:00
Brad Davis	5adcbcaf5f	Support writing a clip to a qbytearray	2015-11-19 20:23:50 -08:00