Merge branch 'master' of https://github.com/esengine/ecs-framework

# Conflicts: # extensions/ecs-tween/lib/framework.d.ts
2021-08-04 12:54:18 +08:00
parent 8fd8f74b27 9fc9b60de5
commit 8bc06f0476
13 changed files with 67 additions and 1477 deletions
--- a/docs/physics.md
+++ b/docs/physics.md
@@ -70,4 +70,4 @@ for( let collider of neighborColliders )
 	if( entity.getComponent(es.Collider).overlaps( collider ) )
 		console.log( `我们正在重叠一个collider : ${collider}` );
 }
-```
+```