Commit graph

22510 commits

Author SHA1 Message Date
Brad Hefta-Gaub
a88f72024d Merge pull request #10243 from birarda/bake-textures
Add an internal tool for domain/model/skybox KTX texture baking
2017-05-12 12:26:33 -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
4b0e51ca54 Merge pull request #10439 from sethalves/word-align--memorystorage
fix - avoid crash in glTextureSubImage2D
2017-05-12 10:31:44 -07:00
Seth Alves
4aa683363c back out previous changes, do compressionOptions.setPitchAlignment(4) instead 2017-05-11 16:22:12 -07:00
Zach Fox
9289cd2022 Merge pull request #10398 from zfox23/PAL_FixIDPacketOrder
Fix the PAL not showing user info for user who opened PAL
2017-05-11 15:16:05 -07:00
Atlante45
6378b96b4c CR 2017-05-11 14:41:02 -07:00
Seth Alves
ac2bc39a27 try, try again 2017-05-11 14:10:03 -07:00
Seth Alves
a26f9c7887 make _size const 2017-05-11 13:36: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
045e93fb95 Code style fixes #2 2017-05-11 21:49:07 +02:00
Seth Alves
19401af3e1 Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage 2017-05-11 12:43:05 -07:00
Atlante45
e0863aa50f Only open files for write if necessary 2017-05-11 11:54:52 -07:00
Zach Fox
15574f509e Clarifying comments 2017-05-11 11:45:07 -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
dfb9fecf17 pad MemoryStorage size to multiple of 4 rather than using a vector of uint32_t -- this gets the same alignment without needs casts 2017-05-11 07:11:40 -07:00
Seth Alves
712386f256 Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage 2017-05-11 06:55:49 -07:00
Vladyslav Stelmakhovskyi
4290eb21ea Fixed possible crashes/freezes on input audio switch 2017-05-11 15:41:07 +02:00
Vladyslav Stelmakhovskyi
f963233a7b Merge branch 'master' into audio-source-sync 2017-05-11 15:25:24 +02:00
Vladyslav Stelmakhovskyi
e4d9772bbc Fixed crashes/freezes on audio switch 2017-05-11 15:20:36 +02:00
David Rowe
e426d70437 Improve variable name 2017-05-11 18:37:23 +12:00
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
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
Seth Alves
c9868640c1 force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D 2017-05-10 18:14:50 -07:00
Dante Ruiz
0cae299192 fix issue when loading file to the input recorder 2017-05-11 00:20:21 +01:00
Zach Fox
ae983658be Finally, the actual fix? 2017-05-10 15:59:19 -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
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
Ryan Huffman
d92bdbf0ed Fix unsigned/signed comparision warning 2017-05-10 09:43:55 -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
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
Brad Davis
ee1fd69316 Fixing crash in texture transfer logic, again 2017-05-09 21:24:58 -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
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
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
Zach Pomerantz
219062b76a Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-underrun 2017-05-09 17:32:24 -04: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
Ryan Huffman
542001b14f Update FileCache to use QSaveFile for atomic writes 2017-05-09 14:08:43 -07:00
Andrew Meadows
2be6d19dfe always call Head::simulate() for Avatar in view 2017-05-09 14:00:18 -07:00
Zach Pomerantz
c478f1a752 synchronously fill injector buffer on underrun 2017-05-09 16:34:42 -04:00
Ryan Huffman
d86071d783 Fix possible corruption of ktx cache files
When creating a file like this:

  1. Create file
  2. Write file
  3. Close file

there is an opening before the file is written and closed where, if the
application were to crash (or not finish for any other reason), the file
would be left in an undefined state. Instead, this change updates it to
do this:

  1. Create temp file
  2. Write temp file
  3. Close temp file
  4. Move temp file to final path

This ensures that at step 3 we have a valid file, before we rename it.
We should never end up with a final file in an undefined state, but it is
possible to end up with a temp file that is an undefined state if we,
for instance, crash during step 2.
2017-05-09 12:08:52 -07:00
Seth Alves
48c78584c3 fix a bug that could cause OBJ models with external mtl references to hang the loading thread 2017-05-09 11:09:39 -07:00