3161 commits

Author	SHA1	Message	Date
ZappoMan	3de92121e0	more logging	2017-04-26 15:28:10 -07:00
Andrew Meadows	08972da843	remove unused Node::_isAlive cruft	2017-04-26 12:47:56 -07:00
ZappoMan	90cdeb9582	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 16:09:59 -07:00
Andrew Meadows	157dc1475b	Merge pull request #10281 from birarda/bug/session-refresh-login ... force DS to use new node ID if connect is re-sent	2017-04-25 15:02:57 -07:00
Stephen Birarda	c00dfcc7d7	send the domain disconnect packet before UUID is cleared	2017-04-25 14:32:21 -07:00
ZappoMan	d179135a87	remove dead code	2017-04-24 18:21:22 -07:00
ZappoMan	95a3e0a092	fix whitespace	2017-04-24 18:06:33 -07:00
ZappoMan	c9aad6b762	new approach to the tpose fix, as well as other improvements	2017-04-24 17:36:05 -07:00
ZappoMan	da68c49dc1	more cleanup	2017-04-21 13:31:40 -07:00
ZappoMan	f07884602a	more CR feedback	2017-04-21 13:13:29 -07:00
ZappoMan	088cdae320	CR feedback	2017-04-21 11:14:47 -07:00
ZappoMan	ff45ad53a3	some more CR cleanup	2017-04-21 10:40:41 -07:00
ZappoMan	f133713d0e	CR feedback	2017-04-21 10:21:34 -07:00
ZappoMan	7f1a87ac4f	remove random http failure	2017-04-20 17:31:20 -07:00
ZappoMan	e89b6c5d2c	some initial debugging on tpose avatars	2017-04-20 17:26:31 -07:00
Seth Alves	41fb05ecf7	bump protocol version	2017-04-14 16:26:54 -07:00
Seth Alves	d17d12446b	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 12:49:03 -07:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache ... cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Seth Alves	7695d2ac05	put the protocol version back to what's in master, for now	2017-04-13 11:29:40 -07:00
Seth Alves	1ab3a1eb60	bump entity-protocol version	2017-04-12 16:36:04 -07:00
Chris Collins	c86acfafef	Merge pull request #10120 from huffman/feat/stick-default-avatar ... Change default avatar to ball and stick avatar	2017-04-11 12:56:25 -07:00
Seth Alves	938fab6f59	Merge pull request #10061 from humbletim/fix-cached-ResourceCache ... Fix cached ResourceCache::prefetch() state updates	2017-04-11 07:04:06 -07:00
Ryan Huffman	af11f5f327	Update avatar mixer packet version for stick+ball avatar	2017-04-10 21:27:47 -07:00
Seth Alves	a1cab2c0d1	working toward fixing compound hulls	2017-04-09 17:23:56 -07:00
David Kelly	1b6bf90843	initial analytics for connections	2017-04-05 11:10:06 -07:00
Stephen Birarda	c7a28a527a	cleanup Agent recording handling, make loadRecording async	2017-04-04 10:56:25 -07:00
humbletim	6f2f1d6452	call finished() when cached resource has already failed to load	2017-03-29 19:42:19 -04:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Brad Davis	82d502ae9f	Correctly initialize a file cache with the proper key	2017-03-24 13:35:37 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Zach Fox	fc2a501474	Cleanup JS<->QML messaging	2017-03-16 15:38:39 -07:00
Brad Davis	2837ae9183	More VS 2017/2015 fixes	2017-03-15 16:13:15 -07:00
Brad Davis	b8ded015c6	Fix packetlist compilation on VS 2017	2017-03-15 15:20:41 -07:00
Brad Davis	3e68018a12	Fix node persmissions hash	2017-03-15 14:33:32 -07:00
Zach Pomerantz	808973d7d2	use QStandardPaths instead of hardcoded paths	2017-03-13 17:26:42 -04:00
Zach Pomerantz	463f6454f8	use Local instead of Roaming for FileCache	2017-03-13 17:26:38 -04:00
Zach Pomerantz	172a638ef0	move resource paths to PathUtils	2017-03-13 17:26:34 -04:00
Zach Pomerantz	a0c56618b3	update FileCache to rm manifest	2017-03-13 13:41:44 -04:00
Brad Davis	43d8433d9a	Removing unused include	2017-03-10 09:19:00 -08:00
Bradley Austin Davis	8a438948b9	Fix OSX link failure	2017-03-09 10:42:56 -08:00
Zach Pomerantz	170df4a1f4	Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27	2017-03-06 17:14:11 -07:00
Andrew Meadows	6ea6477c73	Merge pull request #9683 from jherico/cache_flush ... Clear caches on domain switch	2017-03-06 11:05:44 -08:00
Zach Pomerantz	6a7ee4321b	suppress logs for file_cache	2017-03-02 13:30:51 -05:00
Zach Pomerantz	cca1f2fb25	include <atomic> in FileCache	2017-03-02 11:28:49 -05:00
Zach Pomerantz	1425eb0936	Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27	2017-03-01 21:01:37 -05:00
Zach Pomerantz	febeeeca3a	namespace cache::FileCache and use unique_ptr	2017-03-01 20:58:00 -05:00