codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-17 08:50:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source 
Conflicts:
	app/assets/javascripts/workers/worker_world.js
This commit is contained in:
Michael Schmatz 2014-05-09 14:50:08 -07:00
commit f05af0fbe7
3 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/assets/javascripts/workers/worker_world.js
View file

@ -14,8 +14,8 @@ if (!Function.prototype.bind) {
throw new TypeError("Function.prototype.bind (Shim) - target is not callable");
}
var aArgs = Array.prototype.slice.call(arguments, 1),
fToBind = this,
var aArgs = Array.prototype.slice.call(arguments, 1),
fToBind = this,
fNOP = function () {},
fBound = function () {
return fToBind.apply(this instanceof fNOP && oThis
@ -326,22 +326,10 @@ self.onDebugWorldLoaded = function onDebugWorldLoaded() {
};
self.onDebugWorldError = function onDebugWorldError(error) {
if(error.isUserCodeProblem) {
var errorKey = error.userInfo.key;
if(!errorKey || !self.debugPostedErrors[errorKey]) {
self.postMessage({type: 'user-code-problem', problem: error});
self.debugPostedErrors[errorKey] = error;
}
if(!error.isUserCodeProblem) {
console.log("Debug Non-UserCodeError:", error.toString() + "\n" + error.stack || error.stackTrace);
}
else {
console.log("Non-UserCodeError:", error.toString() + "\n" + error.stack || error.stackTrace);
}
/* We don't actually have the recoverable property any more; hmm
if(!self.firstWorld && !error.recoverable) {
self.abort();
return false;
}
*/
return true;
};
@ -365,7 +353,7 @@ self.runWorld = function runWorld(args) {
self.firstWorld = args.firstWorld;
self.postedErrors = false;
self.logsLogged = 0;
try {
self.world = new World(args.worldName, args.userCodeMap);
if(args.level)

2
app/lib/God.coffee
View file

@ -82,7 +82,7 @@ module.exports = class God
when 'new-debug-world'
console.log "New Debug world!"
when 'console-log'
console.log "|" + @id + "'s debugger |", event.data.args...
console.log "|" + @id + "'s debugger|", event.data.args...
when 'debug-value-return'
Backbone.Mediator.publish 'god:debug-value-return', event.data.serialized

1
app/lib/surface/Mark.coffee
View file

@ -246,6 +246,7 @@ module.exports = class Mark extends CocoClass
size = @sprite.getAverageDimension()
size += 60 if @name is 'selection'
size += 60 if @name is 'repair'
size *= @sprite.scaleFactor
scale = size / {selection: 128, target: 128, repair: 320, highlight: 160}[@name]
if @sprite?.thang.spriteName.search(/(dungeon|indoor).wall/i) isnt -1
scale *= 2