2806 commits

Author	SHA1	Message	Date
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
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
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
David Rowe	bc4af86b57	Display spinner in Web controls when they're loading an HTTP page	2017-05-23 15:40:35 +12: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
samcake	e4f9f2935e	Solving the size evaluation for compressed format	2017-05-22 15:42:18 -07:00
Anthony J. Thibault	6ae2e6778e	ensure left and right arm flexCoeff are the same.	2017-05-19 10:51:09 -07:00
Anthony J. Thibault	e99001d86c	debug draw ik chains, bug fix for flex coef on tips ... And opened up hip constraints.	2017-05-18 16:29:55 -07:00
Dante Ruiz	984f9e1ba5	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-18 21:23:06 +01:00
Dante Ruiz	78f6d2e850	fix low velocity filter	2017-05-18 21:22:42 +01:00
Atlante45	9044cb40d5	Compress Default Skybox with BC7	2017-05-18 13:13:40 -07:00
Anthony J. Thibault	87adeb0565	apply flexCoeff to tip of joint chain as well.	2017-05-18 11:26:49 -07:00
Anthony J. Thibault	abe19310da	WIP: checkpoint of ik changes	2017-05-18 11:26:48 -07:00
samcake	2c6e10fbe1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-18 09:21:02 -07:00
Dante Ruiz	90ddc16d09	add calibration data to filters	2017-05-18 17:07:28 +01:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
Brad Hefta-Gaub	c07eb3e45e	Merge pull request #10471 from hyperlogic/feature/ik-flex-coeff ... Flex and weight IK tuning parameters	2017-05-17 16:48:50 -07:00
Zach Fox	b9ddc3b19f	Improve robustness of display name focus in PAL	2017-05-16 16:25:22 -07:00
Dante Ruiz	25b1bb0633	adjusted values	2017-05-16 23:34:46 +01:00
samcake	b627fe463b	Generate correct KTX for the default Sky	2017-05-15 10:50:10 -07:00
Anthony J. Thibault	1e276d113c	Added support for weights per target	2017-05-15 09:26:24 -07:00
Anthony J. Thibault	67fbb15faa	WIP: initial implementation of flexCoefficients	2017-05-15 09:26:23 -07:00
anshuman64	49d4cf4e68	Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config ... More stable IK when hips, feet and chest are controlled via external input	2017-05-12 17:22:29 -07:00
Clément Brisset	1658ced671	Merge pull request #10437 from Atlante45/feat/faster-startup ... Use baked default skybox	2017-05-12 11:35:51 -07:00
Howard Stearns	63f2a1061a	Merge pull request #10447 from davidkelly/dk/smoothScrollFeed ... animate scroll of partially visible cards	2017-05-12 10:13:49 -07:00
Anthony Thibault	c40e3d6ac9	Merge pull request #10272 from Triplelexx/21292 ... 21292 - Implement a script to hand-raise while in desktop mode	2017-05-11 17:38:27 -07:00
David Kelly	a9716313be	cr feedback -- really good feedback in fact	2017-05-11 17:02:37 -07:00
David Kelly	ae5f9e4fb1	animate scroll of partially visible cards	2017-05-11 15:10:19 -07:00
druiz17	e4df4369ad	Merge pull request #10436 from druiz17/config-ui ... Added the ability to choose puck configuration from the general settings	2017-05-11 13:39:05 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
Atlante45	79d53d92a1	Use baked default skybox	2017-05-10 16:03:02 -07:00
Dante Ruiz	4365907462	drop down puck configuration for gernal settings	2017-05-10 22:12:11 +01:00
Vladyslav Stelmakhovskyi	2328da3c48	Merge branch 'master' into audio-source-sync	2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi	2d46f9d30e	Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum	2017-05-10 21:21:39 +02:00
Anthony J. Thibault	93b8dc550c	Merge branch 'master' into feature/ik-solver-init-config	2017-05-10 09:03:21 -07:00
Dante Ruiz	fbbfe18e2a	Merge branch 'master' of github.com:highfidelity/hifi into vive-head-input	2017-05-10 00:10:38 +01:00
Dante Ruiz	bb4c0d972d	head routed through the vive input plugin	2017-05-10 00:10:26 +01:00
Zach Fox	8c2851b996	Merge pull request #10425 from zfox23/PAL_FixConnectionsDrift ... Enable the PAL to update data about a single connection	2017-05-09 16:01:45 -07:00
Zach Fox	cf3c10c5b1	Fix the bugs, add the feature	2017-05-09 14:40:41 -07:00
Vladyslav Stelmakhovskyi	7ab6909c77	Merge branch 'master' into audio-source-sync	2017-05-09 11:08:08 +02:00
Anthony J. Thibault	84aa86b464	Added animVar support for IK solutionSource.	2017-05-08 18:07:45 -07:00
Dante Ruiz	2d3eb7ba07	Merge branch 'master' of github.com:highfidelity/hifi into config-pucks	2017-05-09 00:28:09 +01:00