• 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
Name
Last commit
Last update
.idea Loading commit data...
debug Loading commit data...
examples Loading commit data...
scripts Loading commit data...
src Loading commit data...
.DS_Store Loading commit data...
.gitignore Loading commit data...
README.md Loading commit data...
manifest.json Loading commit data...
oss.config.js Loading commit data...
package.json Loading commit data...
px-token.js Loading commit data...
px-token.min.js Loading commit data...
rollup.config.js Loading commit data...
token-test.html Loading commit data...
token.html Loading commit data...
tsconfig.json Loading commit data...
yarn.lock Loading commit data...
zeroing-engine.iml Loading commit data...