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 |
|
David Kelly
|
0ea5bf7834
|
Merge pull request #10440 from davidkelly/dk/fixSettingsDialog
Fix for multiple settings dialogs
|
2017-05-11 08:11:16 -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 |
|
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
|
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 |
|
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 |
|
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
|
0cae299192
|
fix issue when loading file to the input recorder
|
2017-05-11 00:20:21 +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 |
|
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 |
|
Andrew Meadows
|
9b2efac6fb
|
Merge pull request #10430 from ctrlaltdavid/21335
Fix unreachable eye blink code
|
2017-05-10 09:11:31 -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 |
|
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 |
|
Zach Fox
|
cf3c10c5b1
|
Fix the bugs, add the feature
|
2017-05-09 14:40:41 -07:00 |
|
Dante Ruiz
|
2ee71d3002
|
Merge branch 'config-pucks' into vive-head-input
|
2017-05-09 22:36:21 +01:00 |
|
Dante Ruiz
|
f90bfd0c9e
|
Merge branch 'master' of github.com:highfidelity/hifi into config-pucks
|
2017-05-09 22:35:13 +01:00 |
|