Commit graph

17563 commits

Author SHA1 Message Date
Zach Fox
8efac1e7f1 Prevent another GIF from being captured while one is processing 2017-05-18 14:30:08 -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
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
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
Seth Alves
66a1dbfcfe Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation
cleanup Head::simulate() code
2017-05-15 11:21:43 -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
c6131916e1 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-12 09:46:21 -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
Andrew Meadows
f4df223d23 cleanup Head::simulation() code 2017-05-11 14:46:00 -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
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
Ryan Huffman
bddfdfa838 Adjust Web3DOverlay to load QML even if not visible 2017-05-09 16:01:20 -07:00
Zach Pomerantz
45feee38b2 Merge pull request #10269 from zzmp/fix/audio-bg-join
Cleanup Audio background threads on shutdown
2017-05-09 17:23:36 -04:00
trent
a3545661dc Merged hifi/master into this PR and resolved merge conflicts. 2017-05-09 15:09:53 -04:00
trent
9c8b844e26 Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270 2017-05-09 12:51:28 -04:00
trent
7faed38bb5 Just use the smooth time constant instead of a variable. 2017-05-09 12:51:25 -04:00
Seth Alves
1e1968357a Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-09 09:24:50 -07:00
Andrew Meadows
e92e710cdc Merge pull request #10413 from humbletim/fix_lookat_regression
Fix lookAt eye snapping
2017-05-09 08:51:10 -07:00
Vladyslav Stelmakhovskyi
7ab6909c77 Merge branch 'master' into audio-source-sync 2017-05-09 11:08:08 +02:00
humbletim
29b1ac3572 optimizations per feedback 2017-05-08 21:50:24 -04:00
humbletim
42d1498d20 call Model::updateRig (not Parent::updateRig) 2017-05-08 21:19:18 -04:00
Andrew Meadows
2835a73c6b Merge pull request #10071 from AndrewMeadows/walk-up-steps
avatar can walk up steps
2017-05-08 18:17:16 -07:00
Zach Pomerantz
defc3c1c4f Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join 2017-05-08 19:55:10 -04:00
Seth Alves
de589a32f3 clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring 2017-05-08 16:36:51 -07:00
Zach Pomerantz
929079df97 add launch.tester to user_actions 2017-05-08 19:33:09 -04:00
humbletim
ef0e32643d update refactored logic to match previous application behavior 2017-05-08 18:53:47 -04:00
Anthony J. Thibault
712fcbe27a Removed cruft/debug code & comments 2017-05-08 15:06:30 -07:00