summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2013-03-05 03:37:25 -0500
committerJules Laplace <jules@okfoc.us>2013-03-05 03:37:25 -0500
commit5213a75d1d4692bb7244f0116289ef17e15320f3 (patch)
tree8f7488ce9797363d27217462fb4cd1eddb9cf71c
parent44f85b846574bdf7f7e21a3e925889548221c17c (diff)
add underscore.js
-rw-r--r--public/index.html2
-rw-r--r--public/js/game.js1
-rw-r--r--server.js2
3 files changed, 4 insertions, 1 deletions
diff --git a/public/index.html b/public/index.html
index 2cd95d4..7e4a7ac 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,6 +6,8 @@
<link rel="stylesheet" href="/css/chat.css" type="text/css">
<script type="text/javascript" src="/js/jquery-1.9.1.min.js"></script>
<script type="text/javascript" src="/socket.io/socket.io.js"></script>
+<script type="text/javascript" src="/js/underscore-min.js"></script>
+<script type="text/javascript" src="/js/canvasquery.min.js"></script>
<script type="text/javascript" src="/js/util.js"></script>
<script type="text/javascript" src="/js/auth.js"></script>
<script type="text/javascript" src="/js/color.js"></script>
diff --git a/public/js/game.js b/public/js/game.js
index 598e3c6..cd88014 100644
--- a/public/js/game.js
+++ b/public/js/game.js
@@ -162,6 +162,7 @@ UI[ State.WINNING ] = new function(){
for (var i in data.scores) {
scores.push( [data.scores[i], i] );
}
+ console.log(scores);
var topthree = scores.sort(function(a,b){ a[0] - b[0] }).splice(0, 3);
console.log(data);
for (var i in topthree) {
diff --git a/server.js b/server.js
index 9d26aa8..78bff7f 100644
--- a/server.js
+++ b/server.js
@@ -72,7 +72,7 @@ var State = {
var Delay = {
DRAWING: 60 * 1000,
VOTING: 30 * 1000,
- WINNING: 30 * 1000,
+ WINNING: 120 * 1000,
}
function Channel() {
this.state = State.WAITING;