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
19401af3e1
Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage
2017-05-11 12:43:05 -07: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
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
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 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
volansystech
34edc2345c
Bug 4255: When you are in HMD and you go to file menu quit, it crashes and you have no menus when you come back.
...
Fixed NPE of buttonProxy while doing addButtonProxyToQmlTablet on quitting the application.
2017-05-09 22:07:32 +05:30
Andrew Meadows
e92e710cdc
Merge pull request #10413 from humbletim/fix_lookat_regression
...
Fix lookAt eye snapping
2017-05-09 08:51:10 -07:00
humbletim
29b1ac3572
optimizations per feedback
2017-05-08 21:50:24 -04:00
humbletim
68ca0d921e
use assert rather than whole if block
2017-05-08 21:34:55 -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
73a3bf413b
update local audio thread name
2017-05-08 20:14:09 -04:00
Zach Pomerantz
b6f652e0ea
use network period multiple for local audio buffer
2017-05-08 20:05:14 -04: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
humbletim
ef0e32643d
update refactored logic to match previous application behavior
2017-05-08 18:53:47 -04:00
Andrew Meadows
e44c2c8da3
init zero gravity to agree with init hover state
2017-05-08 12:47:32 -07:00
Thijs Wenker
5aed960c4c
Merge pull request #10389 from AndrewMeadows/render-collision-shapes-002
...
fix render of debug collision shapes
2017-05-08 20:35:59 +02:00
Brad Hefta-Gaub
d52daf3445
Merge pull request #10378 from samcake/orange
...
Adding a test to protect Uniform Buffer binding at wrong slot
2017-05-08 11:16:56 -07:00
Andrew Meadows
d9e893ac21
minior optimization/cleanup
2017-05-08 11:02:11 -07:00
Andrew Meadows
0f643b7d66
add check to avoid divide by zero
2017-05-08 10:59:15 -07:00
Andrew Meadows
f00a3cafb6
cleanup logic to be more readable
2017-05-08 10:52:54 -07: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
1264c34f6c
Merge pull request #10349 from birarda/machine-guid-fingerprint
...
use MachineGuid for slightly safer windows machine fingerprint
2017-05-08 10:42:14 -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
Chris Collins
b4118e5619
Merge pull request #10394 from zzmp/fix/local-audio-prep
...
Guard against local audio crashes
2017-05-08 09:04:41 -07:00
