Skip to content

Commit

Permalink
Merge pull request #73 from The-World-Space/dev
Browse files Browse the repository at this point in the history
0.4.48
  • Loading branch information
noname0310 committed Mar 29, 2023
2 parents ceb47e7 + c8425ae commit 08b37a8
Show file tree
Hide file tree
Showing 10 changed files with 1,233 additions and 1,101 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/npm_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
- run: npm ci
- run: npm test
- run: npm run build
- run: npm publish
env:
NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}

- uses: JS-DevTools/npm-publish@v1
with:
token: ${{ secrets.NPM_TOKEN }}
3 changes: 2 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ node_modules
src
docs
.babelrc
.eslintcache
.eslintrc.json
.gitattributes
.gitignore
package-lock.json
package.json
testbundle
tsconfig.json
tsconsig.webpack.json
tsconfig.webpack.json
webpack.config.ts
gulpfile.ts
test
Expand Down
2,266 changes: 1,198 additions & 1,068 deletions package-lock.json

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "the-world-engine",
"version": "0.4.47",
"version": "0.4.48",
"description": "three.js based, unity like game engine for browser",
"main": "dist/esm/index.js",
"scripts": {
Expand Down Expand Up @@ -31,15 +31,15 @@
},
"homepage": "https://github.com/noname0310/the-world-engine.ts#readme",
"peerDependencies": {
"@types/three": "^0.149.0",
"three": "^0.149.0"
"@types/three": "^0.150.0",
"three": "^0.150.1"
},
"devDependencies": {
"@babel/core": "^7.20.12",
"@babel/plugin-transform-modules-commonjs": "^7.20.11",
"@babel/plugin-transform-runtime": "^7.19.6",
"@babel/core": "^7.21.3",
"@babel/plugin-transform-modules-commonjs": "^7.21.2",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.20.2",
"@commitlint/cli": "^17.4.4",
"@commitlint/cli": "^17.5.1",
"@commitlint/config-conventional": "^17.4.4",
"@gulp-plugin/alias": "^2.2.2",
"@rollup/plugin-alias": "^4.0.3",
Expand All @@ -50,14 +50,14 @@
"@types/gulp-rename": "^2.0.1",
"@types/gulp-sourcemaps": "^0.0.35",
"@types/gulp-terser": "^1.2.1",
"@types/jest": "^29.4.0",
"@types/jest": "^29.5.0",
"@types/jest-dev-server": "^5.0.0",
"@types/jest-environment-puppeteer": "^5.0.3",
"@types/puppeteer": "^7.0.4",
"@types/webpack-bundle-analyzer": "^4.6.0",
"@typescript-eslint/eslint-plugin": "^5.52.0",
"@typescript-eslint/parser": "^5.52.0",
"eslint": "^8.34.0",
"@typescript-eslint/eslint-plugin": "^5.57.0",
"@typescript-eslint/parser": "^5.57.0",
"eslint": "^8.37.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.1",
Expand All @@ -73,28 +73,28 @@
"gulp-typescript": "^6.0.0-alpha.1",
"html-webpack-plugin": "^5.5.0",
"husky": "^8.0.3",
"jest": "^29.4.3",
"jest-dev-server": "^7.0.1",
"jest-environment-jsdom": "^29.4.3",
"jest-environment-node": "^29.4.3",
"jest-mock": "^29.4.3",
"puppeteer": "^19.7.1",
"rollup-plugin-external-globals": "^0.7.1",
"jest": "^29.5.0",
"jest-dev-server": "^8.0.5",
"jest-environment-jsdom": "^29.5.0",
"jest-environment-node": "^29.5.0",
"jest-mock": "^29.5.0",
"puppeteer": "^19.8.0",
"rollup-plugin-external-globals": "^0.7.3",
"rollup-plugin-typescript2": "^0.34.1",
"terser-webpack-plugin": "^5.3.6",
"terser-webpack-plugin": "^5.3.7",
"ts-jest": "^29.0.5",
"ts-loader": "^9.4.2",
"ts-node": "^10.9.1",
"ts-transformer-minify-privates": "^0.5.0",
"ttypescript": "^1.5.15",
"typescript": "4.9.5",
"webpack": "^5.75.0",
"webpack": "^5.76.3",
"webpack-bundle-analyzer": "^4.8.0",
"webpack-cli": "^5.0.1",
"webpack-dev-server": "^4.11.1"
"webpack-dev-server": "^4.13.1"
},
"dependencies": {
"js-sdsl": "^4.3.0"
"js-sdsl": "^4.4.0"
},
"sideEffects": false
}
4 changes: 2 additions & 2 deletions src/engine/script/controller/MovementAnimationController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import { SpriteAtlasAnimator } from "../post_render/SpriteAtlasAnimator";
* require components: `Directable`, `SpriteAtlasAnimator`
*/
export class MovementAnimationController extends Component {
protected readonly _disallowMultipleComponent: boolean = true;
protected readonly _requiredComponents: ComponentConstructor[] = [Directable, SpriteAtlasAnimator];
public override readonly disallowMultipleComponent: boolean = true;
public override readonly requiredComponents: ComponentConstructor[] = [Directable, SpriteAtlasAnimator];

private _directable: Directable|null = null;
private _spriteAtlasAnimator: SpriteAtlasAnimator|null = null;
Expand Down
2 changes: 1 addition & 1 deletion src/engine/script/event/GridEventMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export class GridEventMap extends Component implements IGridCoordinatable {
for (let y = 0; y < array.length; y++) {
for (let x = 0; x < array[y].length; x++) {
if (array[y][x] === null) continue;
this.addEvent(x + xOffset, array.length - (y + yOffset), array[y][x]!);
this.addEvent(x + xOffset, array.length - (y + yOffset) - 1, array[y][x]!);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/script/grid_physics2d/GridCollideMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export class GridCollideMap extends Component implements IGridCollidable {
for (let y = 0; y < array.length; y++) {
for (let x = 0; x < array[y].length; x++) {
if (array[y][x] === 1) {
this.addCollider(x + xOffset, array.length - (y + yOffset));
this.addCollider(x + xOffset, array.length - (y + yOffset) - 1);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/script/grid_physics2d/GridCollider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export class GridCollider extends Component {
for (let y = 0; y < array.length; y++) {
for (let x = 0; x < array[y].length; x++) {
if (array[y][x] === 1) {
this.addCollider(x + xOffset, array.length - y - 1 + yOffset);
this.addCollider(x + xOffset, array.length - y + yOffset - 1);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/script/grid_physics2d/GridObjectCollideMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class GridObjectCollideMap extends Component implements IGridCollidable {
for (let y = 0; y < array.length; y++) {
for (let x = 0; x < array[y].length; x++) {
if (array[y][x] === 1) {
this.addCollider(x + xOffset, array.length - (y + yOffset));
this.addCollider(x + xOffset, array.length - (y + yOffset) - 1);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/script/helper/TwoDimensionalStringMapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class TwoDimensionalStringMapper {
for (let column = 0; column < str.length; ++column) {
const char = str[column];
if (converter[char] === undefined) {
throw new Error(`conversion not found for ${char}`);
throw new Error(`conversion not found for '${char}'`);
}
rowArray.push(converter[char](column, row));
}
Expand Down

0 comments on commit 08b37a8

Please sign in to comment.