aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstonedDiscord <stoned@derpymail.org>2017-12-28 00:26:34 +0100
committerstonedDiscord <stoned@derpymail.org>2017-12-28 00:26:34 +0100
commit1b7dbf351dee87bc1184803a0c96c5eedecac89f (patch)
treebf76c53a1a47b3ea1be036a96b7f4615c0be79d8
parent9c7099b2e0dfc2cb6cef3aa5578be72d951dc69f (diff)
added note on webclient
also added red for vanilla
-rw-r--r--client.js3
-rw-r--r--master.html5
-rw-r--r--master.js9
-rw-r--r--stylesheet.css5
4 files changed, 18 insertions, 4 deletions
diff --git a/client.js b/client.js
index 63ee646..8de2046 100644
--- a/client.js
+++ b/client.js
@@ -437,7 +437,8 @@ function onMessage(e) {
break;
case "EI":
document.getElementById("client_loadingtext").innerHTML = "Loading Evidence " + arguments[1];
- serv.send("AE#" + (arguments[1] + 1) + "#%");
+ //serv.send("AE#" + (arguments[1] + 1) + "#%");
+ serv.send("RM#%");
break;
case "EM":
document.getElementById("client_loadingtext").innerHTML = "Loading Music " + arguments[1];
diff --git a/master.html b/master.html
index 15db393..bc36f68 100644
--- a/master.html
+++ b/master.html
@@ -34,6 +34,11 @@
</a>
</div>
<div id="content">
+ <center>
+ <p>Please note that the webclient is still in beta</p><br>
+ <p style="color:#ff0000;">The downloadable client is recommended</p><br>
+ <p>The green servers are more likely to work, red ones will not</p>
+ </center>
<div id="serverthumb">
<div id="serverthumbC">
diff --git a/master.js b/master.js
index 675db1a..abfdabd 100644
--- a/master.js
+++ b/master.js
@@ -7,7 +7,7 @@ masterserver.onmessage = function(evt) { onMessage(evt) };
masterserver.onerror = function(evt) { onError(evt) };
var idnow;
var descs = [];
-descs[99]="This is your computer. It probably sucks.";
+descs[99]="This is your computer on port 27016";
var serverpics = [];
function UrlExists(url)
{
@@ -49,9 +49,12 @@ function onMessage(e) {
if (header == 'SN') {
console.log(arguments[2].substring(0, 7));
if (arguments[2].substring(0, 7) == 'serverD') {
- unavv = 'class="available" '
+ unavv = 'class="available" ';
+ }
+ else if (arguments[2] == 'VANILLA'){
+ unavv = 'class="unavailable" ';
}else{
- unavv = ''
+ unavv = '';
}
document.getElementById('masterlist').innerHTML += '<li ' + unavv + 'onmouseover="setServ(' + arguments[0] + ')"><p>' + arguments[4] + '</p> <a class=\"button\" href=\"client.html?mode=watch&ip=' + arguments[1] + ':' + arguments[3] + '\">Watch</a><a class=\"button\" href=\"client.html?mode=join&ip=' + arguments[1] + ':' + arguments[3] + '\">Join</a></li><br/>'
serverpics[arguments[0]] = arguments[2];
diff --git a/stylesheet.css b/stylesheet.css
index cd9b2bc..15a81ea 100644
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -241,6 +241,11 @@ body {
border-color: #21AD21;
}
+.servs .unavailable {
+ background-color: #ff6b6B;
+ border-color: #ad2121;
+}
+
.servs .button:hover {
box-shadow: 0 0 0 1px #EFAD21;
}