Commit graph

54706 commits

Author SHA1 Message Date
Atlante45
e0863aa50f Only open files for write if necessary 2017-05-11 11:54:52 -07:00
Atlante45
79d53d92a1 Use baked default skybox 2017-05-10 16:03:02 -07:00
Howard Stearns
3c652a52d8 Merge pull request #10431 from davidkelly/dk/messageLoggedInStatus
minor handshake script update
2017-05-10 13:54:21 -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
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
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
Zach Pomerantz
219062b76a Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-underrun 2017-05-09 17:32:24 -04:00
Dante Ruiz
53e254152d fixed puck location 2017-05-09 22:30:29 +01: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
David Kelly
5b33e0233c fix typo in handshake script 2017-05-09 13:27:42 -07:00
Dante Ruiz
b70d26d10b Merge branch 'master' of github.com:highfidelity/hifi into vive-head-input 2017-05-09 21:12:20 +01: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
Howard Stearns
713ddd5cef Merge pull request #10408 from davidkelly/dk/updatePalForProfileUrl
Use new images in api/v1/users response json
2017-05-09 12:01:47 -07:00
Seth Alves
902fd2b215 Merge pull request #10421 from sethalves/fix-obj-mtl-loader-hang
fix OBJ model load hang
2017-05-09 11:46:36 -07:00
Dante Ruiz
c362ba9164 better calibration event 2017-05-09 19:13:47 +01: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
Dante Ruiz
d688b60282 no magic numbers 2017-05-09 18:02:12 +01:00
Dante Ruiz
bce9e9ea82 made requested chnages 2017-05-09 17:51:30 +01: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
David Kelly
d40984b475 Merge pull request #10384 from davidkelly/dk/minorHandshakeImprovement
Some minor handshake improvements
2017-05-09 09:14:31 -07:00
Andrew Meadows
e92e710cdc Merge pull request #10413 from humbletim/fix_lookat_regression
Fix lookAt eye snapping
2017-05-09 08:51:10 -07:00
Ken Cooke
a96a89f9f6 Merge pull request #10320 from kencooke/audio-wasapi-qt562
Update WASAPI audio plugin for Qt5.6.2
2017-05-09 07:57:23 -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