From 3147ac3ac4ccd9bb23321a54477bf8d42ce9ba3a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 12 Jul 2013 15:54:12 -0700
Subject: [PATCH 1/4] print packet version mismatch to Log

---
 libraries/shared/src/PacketHeaders.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/shared/src/PacketHeaders.cpp b/libraries/shared/src/PacketHeaders.cpp
index 9f8314e0b7..bbb19b4696 100644
--- a/libraries/shared/src/PacketHeaders.cpp
+++ b/libraries/shared/src/PacketHeaders.cpp
@@ -9,11 +9,12 @@
 #include <stdio.h>
 
 #include "PacketHeaders.h"
+#include "Log.h"
 
 PACKET_VERSION versionForPacketType(PACKET_TYPE type) {
     switch (type) {
         default:
-            return 0;
+            return 1;
             break;
     }
 }
@@ -24,7 +25,7 @@ bool packetVersionMatch(unsigned char* packetHeader) {
     if (packetHeader[1] == versionForPacketType(packetHeader[0])) {
         return true;
     } else {
-        printf("There is a packet version mismatch for packet with header %c\n", packetHeader[0]);
+        printLog("There is a packet version mismatch for packet with header %c\n", packetHeader[0]);
         return false;
     }
 }

From 023599336624104971db57b9f043fac9002e8d11 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 12 Jul 2013 16:00:44 -0700
Subject: [PATCH 2/4] reset default packet version to 0

---
 libraries/shared/src/PacketHeaders.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/shared/src/PacketHeaders.cpp b/libraries/shared/src/PacketHeaders.cpp
index bbb19b4696..2345e62ec2 100644
--- a/libraries/shared/src/PacketHeaders.cpp
+++ b/libraries/shared/src/PacketHeaders.cpp
@@ -14,7 +14,7 @@
 PACKET_VERSION versionForPacketType(PACKET_TYPE type) {
     switch (type) {
         default:
-            return 1;
+            return 0;
             break;
     }
 }

From 832e81b45fb7fff5e9e25c85b36d61c9734607bd Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@coffeeandpower.com>
Date: Fri, 12 Jul 2013 17:00:47 -0700
Subject: [PATCH 3/4] Less skeleton averaging, can see first person arms

---
 interface/src/Avatar.cpp | 6 +++---
 interface/src/Webcam.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp
index 88559ffdb1..881b436bf2 100755
--- a/interface/src/Avatar.cpp
+++ b/interface/src/Avatar.cpp
@@ -92,7 +92,7 @@ Avatar::Avatar(Node* owningNode) :
     _mouseRayOrigin(0.0f, 0.0f, 0.0f),
     _mouseRayDirection(0.0f, 0.0f, 0.0f),
     _interactingOther(NULL),
-    _isMouseTurningRight(false),
+    _isMouseTurningRight(false), 
     _elapsedTimeMoving(0.0f),
     _elapsedTimeStopped(0.0f),
     _elapsedTimeSinceCollision(0.0f),
@@ -1222,8 +1222,8 @@ glm::quat Avatar::computeRotationFromBodyToWorldUp(float proportion) const {
 }
 
 float Avatar::getBallRenderAlpha(int ball, bool lookingInMirror) const {
-    const float RENDER_OPAQUE_OUTSIDE = 1.25f; // render opaque if greater than this distance
-    const float DO_NOT_RENDER_INSIDE = 0.75f; // do not render if less than this distance
+    const float RENDER_OPAQUE_OUTSIDE = 0.25f; // render opaque if greater than this distance
+    const float DO_NOT_RENDER_INSIDE = 0.25f; // do not render if less than this distance
     float distanceToCamera = glm::length(Application::getInstance()->getCamera()->getPosition() - _bodyBall[ball].position);
     return (lookingInMirror || !isMyAvatar()) ? 1.0f : glm::clamp(
         (distanceToCamera - DO_NOT_RENDER_INSIDE) / (RENDER_OPAQUE_OUTSIDE - DO_NOT_RENDER_INSIDE), 0.f, 1.f);
diff --git a/interface/src/Webcam.cpp b/interface/src/Webcam.cpp
index 169151861c..0d417583d2 100644
--- a/interface/src/Webcam.cpp
+++ b/interface/src/Webcam.cpp
@@ -215,7 +215,7 @@ void Webcam::setFrame(const Mat& frame, int format, const Mat& depth, const Rota
             if (!_joints[i].isValid) {
                 continue;
             }
-            const float JOINT_SMOOTHING = 0.9f;
+            const float JOINT_SMOOTHING = 0.5f;
             _estimatedJoints[i].isValid = true;
             _estimatedJoints[i].position = glm::mix(_joints[i].position - origin,
                 _estimatedJoints[i].position, JOINT_SMOOTHING);

From ac3b95efe77034fe665a76dad3ddbd2fb468726a Mon Sep 17 00:00:00 2001
From: tosh <tosh@monster.hlan>
Date: Sat, 13 Jul 2013 22:51:57 +0200
Subject: [PATCH 4/4] fixes sliced-away initialization (crashes program during
 shutdown when running without audio device)

---
 interface/src/Audio.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index 7af42478d5..75c1198d58 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -318,6 +318,7 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples) :
     _lastAcceleration(0),
     _totalPacketsReceived(0),
     _firstPacketReceivedTime(),
+    _echoSamplesLeft(NULL),
     _packetsReceivedThisPlayback(0),
     _isSendingEchoPing(false),
     _pingAnalysisPending(false),