diff --git a/examples/weapons/socketTest.js b/examples/weapons/socketTest.js index 2db6df77ec..d4ba68fb03 100644 --- a/examples/weapons/socketTest.js +++ b/examples/weapons/socketTest.js @@ -1,18 +1,22 @@ -var HOST = "localhost:5000" - // var HOST = "https://thawing-hamlet-8433.herokuapp.com/"; +// var HOST = "localhost:5000" +var HOST = "desolate-bastion-1742.herokuapp.com"; var client = new WebSocket("ws://" + HOST); -client.onerror - function() { - console.log("CONNECTION ERROR"); +var score = 1; +var username = GlobalServices.username; +client.onerror = function() { + print("CONNECTION ERROR"); } print("TESSST"); client.onopen = function() { print("Web Socket client connected"); function sendMessage() { - // if(client.readyState === client.OPEN) { - client.send("HEY"); - Script.setTimeout(sendMessage, 1000); - // } + if(client.readyState === client.OPEN) { + + Script.setTimeout(sendMessage, 3000); + client.send(JSON.stringify({id: score, username: username, score: score})) + score++; + } } sendMessage(); } \ No newline at end of file diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 9079f15f53..29303f4467 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -167,7 +167,7 @@ public: AvatarData(); virtual ~AvatarData(); - static const QUrl& defaultFullAvatarModelUrl(); + static const QUrl& defaultFullAvatarcodelUrl(); virtual bool isMyAvatar() const { return false; }