Commit graph

20336 commits

Author SHA1 Message Date
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
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
Seth Alves
e1c805e76f lock in Overlays::findRayIntersectionInternal 2017-05-11 17:02:00 -07:00
Andrew Meadows
a43447310d remove physics dependency from avatars-render lib 2017-05-11 15:22:22 -07:00
David Kelly
ae5f9e4fb1 animate scroll of partially visible cards 2017-05-11 15:10:19 -07:00
Andrew Meadows
f4df223d23 cleanup Head::simulation() code 2017-05-11 14:46:00 -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
Seth Alves
9d63113e62 Merge pull request #10337 from vladest/audio-source-sync
Audio source sync
2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi
bd6ac7a39e Code style fixes 2017-05-11 20:38:09 +02:00
Andrew Meadows
0852852f39 Merge pull request #10443 from ctrlaltdavid/21326-2
Fix avatar recording playback mouth not moving
2017-05-11 10:41:41 -07:00
Seth Alves
4042e2bceb Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-11 09:29:30 -07:00
Vladyslav Stelmakhovskyi
f963233a7b Merge branch 'master' into audio-source-sync 2017-05-11 15:25:24 +02:00
Thijs Wenker
0a3a2705af Merge pull request #10426 from huffman/fix/tablet-invisible-by-default
Fix tablet showing up for a short period of time on launch
2017-05-11 15:03:52 +02:00
David Rowe
1b855f2c6b Voice modulation and facetrackers write to transient blendshapes 2017-05-11 18:15:38 +12:00
Anthony J. Thibault
147d067c4e Merge branch 'master' into feature/ik-solver-init-config 2017-05-10 18:12:39 -07:00
Atlante45
79d53d92a1 Use baked default skybox 2017-05-10 16:03:02 -07:00
Dante Ruiz
0f0bf79367 Merge branch 'master' of github.com:highfidelity/hifi into config-ui 2017-05-10 22:12:26 +01: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
Brad Hefta-Gaub
f91f42b0c8 Merge pull request #10411 from zzmp/feat/tester-flag
Add launch.tester to user_actions
2017-05-10 11:58:24 -07:00
Seth Alves
9184936496 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-10 09:30:39 -07: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