Commit graph

54764 commits

Author SHA1 Message Date
Anthony Thibault
c40e3d6ac9 Merge pull request #10272 from Triplelexx/21292
21292 - Implement a script to hand-raise while in desktop mode
2017-05-11 17:38:27 -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
druiz17
e4df4369ad Merge pull request #10436 from druiz17/config-ui
Added the ability to choose puck configuration from the general settings
2017-05-11 13:39: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
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
David Kelly
0ea5bf7834 Merge pull request #10440 from davidkelly/dk/fixSettingsDialog
Fix for multiple settings dialogs
2017-05-11 08:11:16 -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
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
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
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
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