20417 commits

Author	SHA1	Message	Date
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
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
samcake	575d4abdf7	bad include fixed maybe	2017-05-24 17:25:21 -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
Anthony J. Thibault	06c26f029a	Merge branch 'master' into feature/faster-ik-iterations	2017-05-23 09:10:17 -07:00
Sam Cake	7f9c98a922	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-22 22:54:43 -07:00
Chris Collins	978eb0dfa9	Merge pull request #10492 from ctrlaltdavid/21359 ... Fix eye behavior in recording playback	2017-05-22 21:53:13 -07:00
David Rowe	bc4af86b57	Display spinner in Web controls when they're loading an HTTP page	2017-05-23 15:40:35 +12:00
Atlante45	10eb353126	Ensure user never loses its running scripts	2017-05-22 18:55:58 -07:00
Sam Gateau	e4a516dcbf	Merge pull request #10497 from AndrewMeadows/crashfix-null-rig ... fix crash for Zone with 'compoundURL' property	2017-05-22 18:18:08 -07:00
samcake	653abf0ee3	brining the new counters to 4.1	2017-05-22 17:34:06 -07:00
samcake	e0487f7e04	Solving the size evaluation for compressed format	2017-05-22 16:51:54 -07:00
Brad Davis	3995f539cf	Merge pull request #10500 from Atlante45/feat/bc7 ... Add BC7 compression support	2017-05-22 16:47:27 -07:00
Dante Ruiz	d98e7d5bc6	adding left and right arm	2017-05-23 00:26:12 +01:00
samcake	e4f9f2935e	Solving the size evaluation for compressed format	2017-05-22 15:42:18 -07:00
David Rowe	b0962865b2	Code review	2017-05-23 09:57:53 +12:00
Stephen Birarda	3e09c911f5	remove number of versions behind from the update dialog	2017-05-22 14:19:36 -07:00
David Rowe	9f83ca518f	Merge branch 'master' into 21359	2017-05-23 09:18:10 +12:00
volansystech	1cbf685133	Merge branch 'master' into Wl-21298	2017-05-22 10:58:05 +05:30
volansystech	6da46c2d4c	Resolve Mouse hover issue.	2017-05-22 10:53:58 +05:30
samcake	c5b5aa93b1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-19 18:13:42 -07:00
David Rowe	768415695d	Tidying	2017-05-20 12:43:47 +12:00
David Rowe	eef707e4e9	Simplify code	2017-05-20 12:42:40 +12:00
Andrew Meadows	d3956b47d0	remove bad break	2017-05-19 15:35:29 -07:00
Andrew Meadows	bb4d366c40	use SmartPointer for Zone _model	2017-05-19 15:33:23 -07:00
Sam Gateau	36ac623e66	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-19 13:25:36 -07:00