Commit graph

20360 commits

Author SHA1 Message Date
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
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
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
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
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
Brad Davis
3995f539cf Merge pull request #10500 from Atlante45/feat/bc7
Add BC7 compression support
2017-05-22 16:47:27 -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
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
Andrew Meadows
7b879a7964 Model has a Rig rather than a RigPointer 2017-05-19 13:24:16 -07:00
Anthony J. Thibault
6ae2e6778e ensure left and right arm flexCoeff are the same. 2017-05-19 10:51:09 -07:00
Atlante45
c2e2682eff Fix "Reset Settings" window poping up every time 2017-05-19 10:50:23 -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
Zach Fox
8efac1e7f1 Prevent another GIF from being captured while one is processing 2017-05-18 14:30:08 -07: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
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
Andrew Meadows
09433a93ba Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
More correct avatar mass
2017-05-17 16:22:06 -07:00
Zach Fox
d4752926b8 First pass - checking performance 2017-05-17 13:51:27 -07:00
Zach Fox
bb3f9e9033 Merge pull request #10479 from zfox23/PAL_ImproveDisplayNameField
Improve robustness of display name focus in PAL
2017-05-17 11:47:57 -07:00
Seth Alves
8a88b30da7 Merge pull request #10468 from AndrewMeadows/cleanup-actions
cleanup Actions and Constraints part-1
2017-05-17 11:33:53 -07:00
Brad Hefta-Gaub
764bfe94f5 Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
Feature/snap turn smoothing 21270
2017-05-16 21:05:38 -07:00
Zach Fox
b9ddc3b19f Improve robustness of display name focus in PAL 2017-05-16 16:25:22 -07:00
Andrew Meadows
d065b569d3 support for variable avatar mass by size 2017-05-16 16:03:51 -07:00
Andrew Meadows
805d23567d fix simple typo 2017-05-16 16:03:50 -07:00
Atlante45
201f81f20a Don't wait on the sandbox 2017-05-16 14:41:57 -07:00
Andrew Meadows
e9c703b147 add deprecation log for DYNAMIC_TYPE_SPRING 2017-05-16 10:34:39 -07:00
Andrew Meadows
9e08dadaf4 Remove ObjectActionSpring 2017-05-15 22:11:42 -07:00
samcake
0b393c845a Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-05-15 13:38:03 -07:00
Seth Alves
66a1dbfcfe Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation
cleanup Head::simulate() code
2017-05-15 11:21:43 -07: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
Vladyslav Stelmakhovskyi
cc10fc81b7 Fix crash in sit script 2017-05-13 20:57:04 +02: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
Seth Alves
4af0a85aa0 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-12 13:03:58 -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
Seth Alves
bc6fb182eb pull out motor action, fix import of slider and cone-twist constraints 2017-05-12 10:32:28 -07:00
Seth Alves
fabcd7e8e0 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-12 10:31:55 -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
Seth Alves
c6131916e1 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-12 09:46:21 -07:00
Seth Alves
b14b0ef403 Merge pull request #10449 from sethalves/fix-overlay-rayintersection-crash
lock in Overlays::findRayIntersectionInternal
2017-05-11 19:13:43 -07:00