Merge branch 'master' into imgui
# Conflicts: # scripts/std.js # source/engine/jsffi.c
This commit is contained in:
commit
50386c0e04
|
@ -93,7 +93,7 @@ var sprite = {
|
|||
pick() { return this; },
|
||||
boundingbox() {
|
||||
var dim = this.dimensions();
|
||||
dim = dim.scale(this.gameobject.gscale());
|
||||
dim = dim.scale(this.gameobject.scale);
|
||||
var realpos = dim.scale(0.5).add(this.pos);
|
||||
return bbox.fromcwh(realpos,dim);
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue