34847 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
James B. Pollack	c6be37f63f	lifetime	2015-11-20 16:10:39 -08:00
James B. Pollack	c98bfca359	collisions	2015-11-20 15:41:50 -08:00
James B. Pollack	4efe31f158	work	2015-11-20 15:15:57 -08:00
James B. Pollack	49e815f3d6	Merge remote-tracking branch 'upstream/master' into bow	2015-11-20 14:33:26 -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
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
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
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
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
James B. Pollack	8a65c7a48f	draw strings sooner, arrow force squared, disable grab on arrow	2015-11-20 10:26:41 -08:00
James B. Pollack	e41cc0979c	Merge branch 'bow' of https://github.com/imgntn/hifi into bow	2015-11-20 10:09:55 -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
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
Brad Davis	5adcbcaf5f	Support writing a clip to a qbytearray	2015-11-19 20:23:50 -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	5c6cd9b06c	fix thread safety and crash with no asset server	2015-11-19 18:53:12 -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
samcake	732c911fd7	Merge pull request #6439 from ZappoMan/assetJS ... add Assets.uploadData() and Assets.downloadData()	2015-11-19 17:56:10 -08:00
Brad Hefta-Gaub	f80a765a29	add Assets.uploadData() and Assets.downloadData()	2015-11-19 17:28:20 -08:00
samcake	c9f7bffd36	Merge pull request #6435 from jherico/dargo ... Load recorded clips from URLs, not file paths	2015-11-19 16:29:50 -08:00
Stephen Birarda	22f5d4df6d	change signature of copy return	2015-11-19 16:25:33 -08:00
Stephen Birarda	430cb7876d	remove a couple of read lockers for AvatarHashMap	2015-11-19 16:22:56 -08:00
James B. Pollack	6f76f0cbc0	release grasp at cleanup	2015-11-19 16:22:54 -08:00