Commit graph

54962 commits

Author SHA1 Message Date
David Rowe
98b943269b Sum of blendshapes is used sent through avatar mixer 2017-05-11 18:17:35 +12:00
David Rowe
21f9594f81 Sum of blendshapes is used for recording 2017-05-11 18:17:12 +12:00
David Rowe
1b855f2c6b Voice modulation and facetrackers write to transient blendshapes 2017-05-11 18:15:38 +12:00
Philip Rosedale
f9567d0330 Merge pull request #10182 from CraftsmanMG/master
hifi: #21216 - Resize entities with hand controllers while editing
2017-05-10 22:03:35 -07:00
David Rowe
3b06b03e01 Rename blendshapes variables in preparation for repurposing 2017-05-11 16:46:36 +12:00
Philip Rosedale
5fe18bc217 Merge pull request #10435 from AndrewMeadows/truncate-mouth-time
avoid floating point error when generating fake mouth shapes
2017-05-10 21:17:21 -07:00
Philip Rosedale
5f4625dbed Merge pull request #10232 from amvmoody/master
audience applause meter
2017-05-10 21:10:05 -07:00
David Kelly
4cc0aaf102 Fix for multiple settings dialogs 2017-05-10 18:31:57 -07:00
Seth Alves
c9868640c1 force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D 2017-05-10 18:14:50 -07:00
Anthony J. Thibault
147d067c4e Merge branch 'master' into feature/ik-solver-init-config 2017-05-10 18:12:39 -07:00
anshuman64
1be404ef87 Merge pull request #10438 from druiz17/input-recorder-fix
fix issue when loading recording file into the input recorder
2017-05-10 17:34:46 -07:00
Dante Ruiz
7687617e91 made requested changes 2017-05-11 00:32:42 +01:00
Dante Ruiz
0cae299192 fix issue when loading file to the input recorder 2017-05-11 00:20:21 +01:00
Atlante45
79d53d92a1 Use baked default skybox 2017-05-10 16:03:02 -07:00
Zach Fox
ae983658be Finally, the actual fix? 2017-05-10 15:59:19 -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
Howard Stearns
3c652a52d8 Merge pull request #10431 from davidkelly/dk/messageLoggedInStatus
minor handshake script update
2017-05-10 13:54:21 -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
Andrew Meadows
a3df55915b avoid floating point error in fake mouth shapes 2017-05-10 12:02:37 -07: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
Sam Gateau
33762b7c1a Merge pull request #10416 from jherico/texture_transfer_safety
Fixing crash in texture transfer logic, again
2017-05-10 10:42:39 -07:00
Chris Collins
cd317dadaf Merge pull request #10422 from huffman/fix/corrupt-ktx
Fix possible corruption of ktx cache files
2017-05-10 10:39:54 -07:00
Chris Collins
3b5b567578 Merge pull request #10409 from hyperlogic/bugfix/hand-lasers-in-third-person-view
Hand controller lasers work better in thirdPerson camera mode.
2017-05-10 10:35:35 -07:00
David Kelly
4536d3c484 cr feedback 2017-05-10 10:09:45 -07:00
Chris Collins
41ca447c2b Merge pull request #10405 from huffman/fix/ac-audio-randfloat
Fix randFloat error in ac audio searcher
2017-05-10 10:05:52 -07:00
Ryan Huffman
d92bdbf0ed Fix unsigned/signed comparision warning 2017-05-10 09:43:55 -07:00
Seth Alves
9184936496 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-10 09:30:39 -07:00
Andrew Meadows
9b2efac6fb Merge pull request #10430 from ctrlaltdavid/21335
Fix unreachable eye blink code
2017-05-10 09:11:31 -07:00
Anthony J. Thibault
93b8dc550c Merge branch 'master' into feature/ik-solver-init-config 2017-05-10 09:03:21 -07:00
druiz17
35745a0174 Merge pull request #10428 from druiz17/vive-head-input
Hmd now routes through the vive input plugin.
2017-05-10 08:53:18 -07:00
druiz17
ec5dd04230 Merge pull request #10418 from volansystech/Bug-4255-HMD-file-quit-AppCrashes
Bug 4255: When you are in HMD and you go to file menu quit, it crashe…
2017-05-10 08:50:11 -07:00
Dante Ruiz
0e1ef75d5b fix comment wording 2017-05-10 16:18:26 +01:00
Dante Ruiz
571f0d5951 made requested changes 2017-05-10 16:14:29 +01:00
Brad Davis
ee1fd69316 Fixing crash in texture transfer logic, again 2017-05-09 21:24:58 -07:00
David Kelly
a45dc673be minor handshake script update 2017-05-09 17:33:33 -07:00
David Rowe
a0bc8ae2ee Fix unreachable eye blink code 2017-05-10 11:40:42 +12:00
Ryan Huffman
6e4c5d1ab4 Update FileCache writing to check QSaveFile::write return value 2017-05-09 16:29:57 -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
Chris Collins
a302c220f4 Merge pull request #10424 from AndrewMeadows/fix-mouth-movement
Fix avatar mouth movement when driven by audio loudness
2017-05-09 16:09:05 -07: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
Ryan Huffman
bddfdfa838 Adjust Web3DOverlay to load QML even if not visible 2017-05-09 16:01:20 -07:00
Zach Pomerantz
a7895d42d3 Merge pull request #10414 from zzmp/fix/audio-underrun
Fix crackle in local audio
2017-05-09 18:54:51 -04:00
David Kelly
93296bb6d8 Merge pull request #10423 from davidkelly/dk/typoInHandshakeScript
fix typo in handshake script
2017-05-09 15:53:56 -07:00
Zach Fox
d7e4f02291 This is a better method. 2017-05-09 15:33:33 -07:00
Zach Fox
9ab643c416 I think this is all that must be done. 2017-05-09 15:33:33 -07:00
anshuman64
b796d8e484 Merge pull request #10412 from druiz17/config-pucks
Moved the puck configuration to actions into the vive controller plugin
2017-05-09 15:29:51 -07:00
Ryan Huffman
51db0cef98 Fix tablet showing up for a short time on launch 2017-05-09 15:12:12 -07:00