14063 commits

Author	SHA1	Message	Date
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
samcake	e97e864de7	Getting the animation playback to work	2015-11-20 15:05:17 -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	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	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
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
Brad Hefta-Gaub	caa8b0b5b6	fix unix build	2015-11-20 11:07:01 -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	0e5e33446e	handle old protocol case	2015-11-20 09:57:30 -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
Brad Hefta-Gaub	5c6cd9b06c	fix thread safety and crash with no asset server	2015-11-19 18:53: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
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
Stephen Birarda	40397add43	fix for extra adds in AvatarManager	2015-11-19 16:15:21 -08:00
Brad Davis	e187aaedcb	Load recorded clips from URLs, not file paths	2015-11-19 15:56:37 -08:00
Stephen Birarda	6398a922c6	leverage COW for AvatarHash	2015-11-19 15:43:29 -08:00
Ryan Huffman	9e31614fce	Fix textures property not being sent for polyline	2015-11-19 15:16:46 -08:00
Stephen Birarda	2a05ec650b	fix locking in AvatarHashMap/AvatarManager	2015-11-19 14:17:48 -08:00
Seth Alves	2938f0d835	Merge pull request #6421 from ZappoMan/outOfOrderDelete ... Possible fix to abandoned lines/entities	2015-11-19 10:26:14 -08:00
Brad Hefta-Gaub	e318537af4	Merge pull request #6425 from birarda/handshake-ds-settings ... fix case where servers could run without settings	2015-11-19 10:10:28 -08:00
Seth Alves	98073de0b8	Merge pull request #6426 from ZappoMan/entitiesFileDownload ... implement support to download the persist file from entity server status page	2015-11-19 09:47:10 -08:00
Brad Hefta-Gaub	45e8ebbe8c	Merge pull request #6432 from huffman/lod-range ... Increase available range in LOD Tools	2015-11-19 09:40:10 -08:00
Ryan Huffman	8adf456b91	Update range of LOD to go up to 20:2	2015-11-19 08:52:57 -08:00
Stephen Birarda	271387f96e	use a unique_ptr for linkedData in Node	2015-11-18 18:03:31 -08:00
samcake	74beeefe06	Merge pull request #6420 from jherico/dargo ... Make recording and playback work in interface, playback in agent	2015-11-18 17:52:09 -08:00
Brad Hefta-Gaub	456da661ff	implement support to download the persist file from entity server status page	2015-11-18 17:30:07 -08:00
Brad Davis	98cc7408b1	Fixing issues found in AC playback test	2015-11-18 17:17:20 -08:00
Stephen Birarda	08e6b63090	cleanup debug of received domain-server settings	2015-11-18 15:43:31 -08:00
Stephen Birarda	3ba0c9d042	resolve conflicts on merge with upstream master	2015-11-18 15:29:39 -08:00
Stephen Birarda	f2ecce6043	use safer domain settings request in audio-mixer	2015-11-18 15:13:29 -08:00
Stephen Birarda	1a066abb26	fix some indentation for UDT_CONNECTION_DEBUG lines	2015-11-18 14:43:56 -08:00
Brad Davis	fd3599acc5	PR comments	2015-11-18 14:32:56 -08:00
Brad Hefta-Gaub	2f3cf82202	don't apply out of order edits to entities that have been deleted	2015-11-18 14:26:18 -08:00
Stephen Birarda	65142a3963	clean up agent comment for domain settings request	2015-11-18 14:20:56 -08:00
Brad Davis	5b8047ded4	Make recording and playback work in interface, playback in agent	2015-11-18 14:04:45 -08:00
Ryan Huffman	3d0afc3c5f	Update entities version number for polyline change	2015-11-18 14:00:00 -08:00
Ryan Huffman	2fe9af54d4	Add textures property to polyline	2015-11-18 13:59:32 -08:00