Commit graph

17503 commits

Author SHA1 Message Date
Seth Alves
e1c805e76f lock in Overlays::findRayIntersectionInternal 2017-05-11 17:02: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
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
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
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
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
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
Vladyslav Stelmakhovskyi
d0111ac0bb Merge branch 'master' into audio-source-sync 2017-05-08 20:09:34 +02:00
Chris Collins
4bfb23b5d2 Merge pull request #10388 from humbletim/21308
CR #21308 Fix Script.print
2017-05-08 10:46:49 -07:00
Chris Collins
0351ac1575 Merge pull request #10401 from jherico/fix_benny_hill_animations
Fix sped up animations
2017-05-08 09:11:23 -07:00
Brad Davis
b63015eaea Fix sped up animations 2017-05-06 14:34:28 -07:00
Seth Alves
9e0845f17e Merge pull request #10387 from vladest/tablet-performance
Decrease CPU usage in tabletUI periodical updates
2017-05-06 07:07:29 -07:00
Chris Collins
820ed5049b Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire
Fix -- dont send non-entity edits to entity-server
2017-05-05 16:37:27 -07:00
Zach Pomerantz
ca7cd61c64 Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join 2017-05-05 13:04:01 -04:00
Chris Collins
fd836dcd68 Merge pull request #10366 from Atlante45/feat/normal-map-compression
Feat/normal map compression
2017-05-05 10:03:01 -07:00
Chris Collins
8d49540f3a Merge pull request #10380 from vladest/rightclick-fix
Rightclick fix
2017-05-05 10:01:11 -07:00
Andrew Meadows
63042eea3a fix flawed fix of bad rebase 2017-05-05 09:37:00 -07:00
Andrew Meadows
41ad25ade1 fix bad rebase of changed menu option 2017-05-05 09:37:00 -07:00
Andrew Meadows
fe401c7488 improved management of collisionless avatar state 2017-05-05 09:37:00 -07:00
Andrew Meadows
d34b667e82 remove kinematic character controller implemention 2017-05-05 09:35:49 -07:00
Andrew Meadows
0aa579225c even more correct API: MyAvatar.collisionsEnabled 2017-05-05 09:35:49 -07:00
Andrew Meadows
559f5836c5 restore MyAvatar.setCharacterControllerEnabled() 2017-05-05 09:35:49 -07:00
Andrew Meadows
94ee6d6838 fix driving motion of collisionless avatars 2017-05-05 09:35:49 -07:00
Andrew Meadows
c47e26174c support collisionless avatar when playing recording 2017-05-05 09:35:49 -07:00
Andrew Meadows
e21bd7a67a help avatar walk up steps 2017-05-05 09:35:49 -07:00
humbletim
25807a5258 fix warning color 2017-05-05 09:48:24 -04:00
Vladyslav Stelmakhovskyi
e395a51c60 Merge with master 2017-05-05 07:05:16 +02:00
Seth Alves
92966377fb Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 19:05:57 -07:00
Seth Alves
0406cc41e0 if model-overlay has no name, use its url 2017-05-04 18:37:04 -07:00
Seth Alves
c04c0c5b13 if model-overlay has no name, use its url 2017-05-04 18:36:51 -07:00
Seth Alves
960bab6e4e Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 16:42:57 -07:00
Atlante45
ecda313223 Add runtime access to compression settings 2017-05-04 15:07:59 -07:00
humbletim
6cb95b2393 add and connect handlers for scriptWarningMessage and scriptInfoMessage signals 2017-05-04 17:43:00 -04:00
Brad Davis
9def788956 Merge pull request #10314 from jherico/avatars-renderer
Migrate Avatar rendering code to library
2017-05-04 14:23:49 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Anthony Thibault
7006fa6da4 Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update
grab is driven by timer rather than update, load tablet model with high priority
2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi
ba5a371da1 Decrease CPU usage in tabletUI periodical updates 2017-05-04 22:54:41 +02:00