Skip to content

Commit

Permalink
Merge danielmahal/Rumpetroll into mongodb_storage
Browse files Browse the repository at this point in the history
  • Loading branch information
Pixl-Coder authored and Pixl-Coder committed Oct 25, 2010
2 parents 3e51a69 + 26179cb commit a5c1cb0
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 3 deletions.
Empty file removed data/error.out
Empty file.
11 changes: 11 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,17 @@ <h2>Created with scandinavian love by:</h2>
</ul>
</section>
</aside>
<aside id="frogMode">
<h3>Frog Mode</h3>
<section id="tadpoles">
<h4>Tadpoles</h4>
<ul id="tadpoleList">
</ul>
</section>
<section id="console">
<h4>Console</h4>
</section>
</aside>

<div id="cant-connect">
Ooops. Did you do this?<br />Our <a href="http://rumpetroll.com/motherfailtroll/" title="Rumpetroll - You broke Mother Fail Frog!">Mother-frog</a> is unable to deliver you to the primordial multiplayer pond.<br />Please <a href="http://rumpetroll.com" title="Rumpetroll">try again</a> later to play with other Rumpetrolls.
Expand Down
4 changes: 2 additions & 2 deletions public/js/Settings.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
var Settings = function() {
this.socketServer = 'ws://localhost:8181';
}
this.socketServer = 'ws://rumpetroll.six12.co:8180';
}
9 changes: 8 additions & 1 deletion public/js/Tadpole.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var Tadpole = function() {

this.onclick = function(e) {
if(e.which == 1) {
if(tadpole.name.charAt('0') == "@") {
if(isAuthorized()) {
window.open("http://twitter.com/" + tadpole.name.substring(1));
}
}
Expand Down Expand Up @@ -112,6 +112,9 @@ var Tadpole = function() {
if(tadpole.hover) {
context.fillStyle = 'rgba(72, 253, 238,'+opacity+')';
context.shadowColor = 'rgba(249, 136, 119, '+opacity*0.7+')';
if(tadpole.hover && isAuthorized()) {
context.fillStyle = 'rgba(192, 253, 247,'+opacity+')';
// context.shadowColor = 'rgba(249, 136, 119, '+opacity*0.7+')';
}
else {
context.fillStyle = 'rgba(226,219,226,'+opacity+')';
Expand All @@ -138,6 +141,10 @@ var Tadpole = function() {
drawMessages(context);
};

var isAuthorized = function() {
return tadpole.name.charAt('0') == "@";
}

var drawName = function(context) {
var opacity = Math.max(Math.min(20 / Math.max(tadpole.timeSinceLastServerUpdate-300,1),1),.2).toFixed(3);
context.fillStyle = 'rgba(226,219,226,'+opacity+')';
Expand Down
1 change: 1 addition & 0 deletions public/js/WebSocketService.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ var WebSocketService = function(model, webSocket) {
token: token,
verifier: verifier
};

webSocket.send(JSON.stringify(sendObj));
}
}
3 changes: 3 additions & 0 deletions public/js/frogMode.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
var frogMode = function() {

}
Empty file modified scripts/launchloop.sh
100755 → 100644
Empty file.

0 comments on commit a5c1cb0

Please sign in to comment.