Merge branch 'master' into imgui

# Conflicts:
#	scripts/std.js
#	source/engine/jsffi.c
This commit is contained in:
John Alanbrook 2024-07-02 16:21:22 -05:00
commit 50386c0e04

View file

@ -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);
},