Merge branch 'master' into controls

This commit is contained in:
logsol 2014-12-22 02:43:57 +01:00
commit 9100215ceb
4 changed files with 4 additions and 7 deletions

View file

@ -8,7 +8,7 @@ function() {
return f + this.substr(1); return f + this.substr(1);
} }
if(GLOBALS.context == "Channel") { if(typeof process !== 'undefined') {
console.checkpoint = function (s) { console.checkpoint = function (s) {
console.log(' \033[32mbeep - \033[0m' + s); console.log(' \033[32mbeep - \033[0m' + s);

View file

@ -1,12 +1,11 @@
define([ define([
"Server/User", "Server/User",
"Game/Channel/Channel",
"Server/PipeToChannel", "Server/PipeToChannel",
"Lib/Utilities/NotificationCenter", "Lib/Utilities/NotificationCenter",
"Game/Config/Settings" "Game/Config/Settings"
], ],
function (User, Channel, PipeToChannel, Nc, Settings) { function (User, PipeToChannel, Nc, Settings) {
"use strict"; "use strict";

View file

@ -1,6 +1,4 @@
"use strict"; GLOBALS = { context: "Channel" };
var GLOBALS = { context: "Channel" };
var requirejs = require('requirejs'); var requirejs = require('requirejs');
requirejs.config({ requirejs.config({

View file

@ -1,4 +1,4 @@
"use strict"; "use strict"
var GLOBALS = { context: "Channel" }; var GLOBALS = { context: "Channel" };
var requirejs = require('requirejs'); var requirejs = require('requirejs');