David Kelly
5b33e0233c
fix typo in handshake script
2017-05-09 13:27:42 -07:00
Anthony J. Thibault
d7f195bc42
warning fix
2017-05-09 13:17:06 -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
Anthony J. Thibault
0bcc3c023e
warning fixes
2017-05-09 13:07:06 -07: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
Anthony J. Thibault
7b35e8c7fd
Bug fix for hands, reduced elbow angle to 60 degrees from horizontal.
2017-05-09 11:57:41 -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
Seth Alves
b285a582bd
oops
2017-05-09 10:37:45 -07:00
Seth Alves
4f24a7618a
cleanups
2017-05-09 10:23:04 -07:00
Seth Alves
1c23f3b971
bump protocol version
2017-05-09 10:10:35 -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
Anthony J. Thibault
fe69f58174
Bug fix centerLimit rot for LeftArm, also, lower arms in centerLimit pose
...
Lowering the arms in centerLimit poses will help keep the elbows relaxed on the side of the body.
2017-05-09 09:47:26 -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
Seth Alves
1e1968357a
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-09 09:24:50 -07:00
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
Mike Moody
8daf9698bd
works with new version from catlyn.
2017-05-09 03:44:29 -07:00
Vladyslav Stelmakhovskyi
7ab6909c77
Merge branch 'master' into audio-source-sync
2017-05-09 11:08:08 +02:00
Seth Alves
4816e4f826
what does VS mean when it uses words?
2017-05-08 21:39:41 -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
humbletim
42d1498d20
call Model::updateRig (not Parent::updateRig)
2017-05-08 21:19:18 -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
Anthony J. Thibault
5a4b21c0a9
Removed debug code
2017-05-08 18:10:56 -07:00
Anthony J. Thibault
84aa86b464
Added animVar support for IK solutionSource.
2017-05-08 18:07:45 -07:00
Ken Cooke
807a6d5831
Bugfix: new threading changes in the Qt5.7.1 plugin were causing deadlock
2017-05-08 18:03:50 -07:00
Ken Cooke
746ae6dfd3
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-wasapi-qt562
2017-05-08 17:56:19 -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
Seth Alves
55056e730a
guard slider and cone-twist constraints against zero-length axisq
2017-05-08 17:02:37 -07: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
Seth Alves
f8cab08b19
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-08 16:37:19 -07:00
Seth Alves
de589a32f3
clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring
2017-05-08 16:36:51 -07:00
Zach Pomerantz
929079df97
add launch.tester to user_actions
2017-05-08 19:33:09 -04:00
Dante Ruiz
c3d57459d5
minimize diff 3.0
2017-05-09 00:32:47 +01:00
Dante Ruiz
03ba3f5944
minimize diff 2.0
2017-05-09 00:31:13 +01:00
Dante Ruiz
00546c55bb
minimize diff
2017-05-09 00:30:06 +01:00
Dante Ruiz
2d3eb7ba07
Merge branch 'master' of github.com:highfidelity/hifi into config-pucks
2017-05-09 00:28:09 +01:00
Dante Ruiz
23c3a75116
finally fixed rotation issue
2017-05-09 00:27:30 +01:00
Thijs Wenker
6da925a626
Merge pull request #10410 from huffman/fix/sphinx-copyright
...
Update copyright in sphinx scripts
2017-05-09 01:03:58 +02:00
Ryan Huffman
773e4346f9
Update copyright in sphinx scripts
...
These were meant to be updated before the PR was merged, but I
overlooked it.
2017-05-08 15:59:29 -07:00
Ryan Huffman
b7af9e20c9
Merge pull request #10211 from Delamare2112/InteractionJS
...
Just the interaction JS scripts
2017-05-08 15:54:16 -07:00
humbletim
ef0e32643d
update refactored logic to match previous application behavior
2017-05-08 18:53:47 -04:00
Seth Alves
1346ce22b9
don't crash if imported entities make a reference to an unknown entity
2017-05-08 15:51:25 -07:00
Ryan Huffman
e670037198
Adjust copyright on Limitless Sphinx script
2017-05-08 15:49:42 -07:00
