• rockyl's avatar
    Merge branch 'auto_align_qx' into designtime · 185d9d4f
    rockyl authored
    # Conflicts:
    #	debug/engine.js
    #	debug/engine.js.map
    #	manifest.json
    #	src/2d/display/Container.ts
    #	src/2d/display/Sprite.ts
    #	src/2d/display/Stage.ts
    #	src/2d/text/TextField.ts
    #	src/zeroing/game-warpper/GameStage.ts
    #	src/zeroing/game-warpper/StackContainer.ts
    #	src/zeroing/game-warpper/assets-manager.ts
    #	src/zeroing/launcher.ts
    #	src/zeroing/utils/utils.ts
    185d9d4f
shapes.ts 1.82 KB