20440 commits

Author	SHA1	Message	Date
Chris Collins	6cc6cd3bf6	Merge pull request #10604 from highfidelity/RC-42 ... Beta Release 42 - Includes up to Developer Release 6626	2017-06-05 09:13:19 -07:00
Ryan Huffman	52c60b35df	Add startup_sent_to user activity event	2017-06-02 17:57:40 -07:00
Stephen Birarda	d89febac71	use a sleep instead of a yield waiting for close event	2017-06-02 13:22:02 -07:00
Stephen Birarda	e3d8229abe	rename ClosureEventSender to CloseEventSender	2017-06-02 13:21:55 -07:00
Stephen Birarda	ecc697dbe1	remove crash event definition for now	2017-06-02 13:21:45 -07:00
Stephen Birarda	40dfcb1e6e	send quit event during shutdown on thread, with timeout	2017-06-02 13:21:37 -07:00
Stephen Birarda	f5d732f332	initial version of the ClosureEventSender using std::thread	2017-06-02 13:21:28 -07:00
David Kelly	b6b2f92af2	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028	2017-06-01 09:58:07 -07:00
David Kelly	f79c9ea021	we can sort on ignored	2017-06-01 07:29:31 -07:00
David Kelly	a17886aa58	do not allow sorting on non-sortable columns in PAL	2017-06-01 07:24:03 -07:00
Sam Cake	3c9b14ee94	Oene more fix	2017-05-31 23:26:20 -07:00
Sam Cake	03fdc1396c	Fixing the warnings	2017-05-31 23:20:10 -07:00
Howard Stearns	b552566bf8	Merge pull request #10580 from manapa01/Default-Discoverability-Mode ... Changed the DEFAULT_DISCOVERABILITY_MODE to Connections	2017-05-31 13:00:15 -07:00
Patrick Manalich	7b69a5dbd5	Changed the DEFAULT_DISCOVERABILITY_MODE to Connections	2017-05-31 10:46:04 -07:00
Zach Fox	0441d8c703	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -07:00
Chris Collins	5db0975554	Merge pull request #10556 from highfidelity/RC-41 ... Beta Release 41 - Includes up to Developer Release 6603	2017-05-30 12:52:30 -07:00
Seth Alves	250e381ea7	Merge pull request #10563 from Atlante45/fix/reset-settings ... Fix "retain avatar info"	2017-05-30 10:00:55 -07:00
Seth Alves	66415dadc6	Merge pull request #10496 from volansystech/Wl-21298 ... Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.	2017-05-27 08:28:19 -07:00
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
Atlante45	ccc7cb638d	Fix "retain avatar info"	2017-05-26 14:18:29 -07:00
Anthony Thibault	84901ba94b	Merge pull request #10542 from druiz17/arm-pucks ... Added pucks calibration for upper arm/shoulders	2017-05-26 11:17:15 -07:00
volansystech	8d9cfbdf31	Resolve comments of @sethalves . Remove whitespaces.	2017-05-26 11:41:35 +05:30
Clément Brisset	efe72e1b85	Merge pull request #10530 from Atlante45/fix/default-scripts ... Ensure user never loses its running scripts	2017-05-25 18:33:11 -07:00
Dante Ruiz	108c444cc7	clean up code	2017-05-25 21:59:06 +01:00
volansystech	cab6f3f7c3	Solve Jitteriness while scrolling.	2017-05-25 17:28:19 +05:30
volansystech	aab80629ea	Merge branch 'master' into Wl-21298	2017-05-25 15:44:17 +05:30
Sam Cake	3eb95d2d19	cleaning the commented code	2017-05-25 01:16:45 -07:00
Stephen Birarda	f897f3f090	send machine fingerprint as uuid without curly braces	2017-05-24 19:08:25 -07:00
Stephen Birarda	50285005be	add machine fingerprint to the launch event	2017-05-24 18:35:57 -07:00
Stephen Birarda	c671817fa3	fix cache http request count in stats	2017-05-24 17:47:40 -07:00
Stephen Birarda	fefb34512d	change asset inbound key to atp	2017-05-24 17:44:09 -07:00
Stephen Birarda	c37fd335e1	track the number of local socket changes	2017-05-24 17:41:52 -07:00
Stephen Birarda	5e61f20df8	add more details about pending downloads	2017-05-24 17:37:42 -07:00
Stephen Birarda	48c4db1ca4	nest the download stats so they are cleaner	2017-05-24 17:36:21 -07:00
samcake	575d4abdf7	bad include fixed maybe	2017-05-24 17:25:21 -07:00
Stephen Birarda	3743cd23b4	add detailed download stats for file/http/atp	2017-05-24 17:22:38 -07:00
Stephen Birarda	ac55908e42	add additional information to stats/launch activities	2017-05-24 16:50:06 -07:00
samcake	044110e4f3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-24 15:40:40 -07:00
Dante Ruiz	8cb9bfcc81	fixed merge conflict	2017-05-24 19:35:41 +01:00
Dante Ruiz	0fdf136251	got the shoulders working	2017-05-24 19:31:48 +01:00
Sam Gateau	f9c6cecb23	Merge pull request #10529 from samcake/ambient ... Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting	2017-05-24 10:48:21 -07:00
anshuman64	2b63eb9d90	Merge pull request #10469 from druiz17/improve-rotation-jitter ... Added a LowVelocityFilter to the input system.	2017-05-24 08:35:13 -07:00
Dante Ruiz	ac3c9655ec	added arms	2017-05-24 01:28:08 +01:00
Brad Hefta-Gaub	eca045714b	Merge pull request #10532 from ctrlaltdavid/21344 ... Display spinner in Web controls when they're loading an HTTP page	2017-05-23 16:39:17 -07:00
samcake	e7b808cbc1	Merging with upstream	2017-05-23 12:12:31 -07:00
Clément Brisset	499897e271	Merge pull request #10533 from thoys/fix/attachment-scale ... Attachment Scale fix (Breaks previous set attachment scales)	2017-05-23 10:59:54 -07:00
Clément Brisset	ed86ca3e55	Merge pull request #10522 from birarda/bug/version-number-jumps ... remove version difference from update dialog	2017-05-23 10:28:50 -07:00
Dante Ruiz	0cbdeaa1e8	Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks	2017-05-23 18:26:58 +01:00
Dante Ruiz	54d63f5155	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-23 18:19:38 +01:00
Thijs Wenker	962d95ca46	add more precision to attachment scale in attachment dialog	2017-05-23 18:16:08 +02:00