Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@JujuAdams
JujuAdams committed May 3, 2023
2 parents 896e7fd + e9a6131 commit 7d932ab
Show file tree
Hide file tree
Showing 75 changed files with 1,175 additions and 1,179 deletions.
118 changes: 59 additions & 59 deletions Clean Shapes.resource_order
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
{
"ResourceOrderSettings": [
{"name":"rmTestPolyline","path":"rooms/rmTestPolyline/rmTestPolyline.yy","order":9,},
{"name":"CleanTriangle","path":"scripts/CleanTriangle/CleanTriangle.yy","order":11,},
{"name":"rmTestClockwise","path":"rooms/rmTestClockwise/rmTestClockwise.yy","order":23,},
{"name":"CleanCircle","path":"scripts/CleanCircle/CleanCircle.yy","order":3,},
{"name":"CleanAntialiasSet","path":"scripts/CleanAntialiasSet/CleanAntialiasSet.yy","order":1,},
{"name":"CleanEllipse","path":"scripts/CleanEllipse/CleanEllipse.yy","order":4,},
{"name":"oTestPug","path":"objects/oTestPug/oTestPug.yy","order":4,},
{"name":"oTestSurface","path":"objects/oTestSurface/oTestSurface.yy","order":20,},
{"name":"CleanTransformAddMove","path":"scripts/CleanTransformAddMove/CleanTransformAddMove.yy","order":2,},
{"name":"oTestConvex","path":"objects/oTestConvex/oTestConvex.yy","order":22,},
{"name":"CleanTransformAddRotate","path":"scripts/CleanTransformAddRotate/CleanTransformAddRotate.yy","order":3,},
{"name":"rmTestCircle","path":"rooms/rmTestCircle/rmTestCircle.yy","order":5,},
{"name":"rmTestRing","path":"rooms/rmTestRing/rmTestRing.yy","order":17,},
{"name":"rmTestSpline","path":"rooms/rmTestSpline/rmTestSpline.yy","order":11,},
{"name":"CleanSpline","path":"scripts/CleanSpline/CleanSpline.yy","order":2,},
{"name":"oTestClockwise","path":"objects/oTestClockwise/oTestClockwise.yy","order":24,},
{"name":"oTestSpline","path":"objects/oTestSpline/oTestSpline.yy","order":12,},
{"name":"oTestRectangle","path":"objects/oTestRectangle/oTestRectangle.yy","order":14,},
{"name":"CleanTransformReset","path":"scripts/CleanTransformReset/CleanTransformReset.yy","order":7,},
{"name":"CleanRectangleXYWH","path":"scripts/CleanRectangleXYWH/CleanRectangleXYWH.yy","order":8,},
{"name":"CleanTransformAddSkew","path":"scripts/CleanTransformAddSkew/CleanTransformAddSkew.yy","order":5,},
{"name":"CleanBatchEndDraw","path":"scripts/CleanBatchEndDraw/CleanBatchEndDraw.yy","order":1,},
{"name":"oTestMatrix","path":"objects/oTestMatrix/oTestMatrix.yy","order":2,},
{"name":"rmTestSurface","path":"rooms/rmTestSurface/rmTestSurface.yy","order":19,},
{"name":"oTestRing","path":"objects/oTestRing/oTestRing.yy","order":18,},
{"name":"CleanSegment","path":"scripts/CleanSegment/CleanSegment.yy","order":5,},
{"name":"CleanTransformOriginGet","path":"scripts/CleanTransformOriginGet/CleanTransformOriginGet.yy","order":1,},
{"name":"rmTestPug","path":"rooms/rmTestPug/rmTestPug.yy","order":3,},
{"name":"CleanBatchDrawVertexBuffer","path":"scripts/CleanBatchDrawVertexBuffer/CleanBatchDrawVertexBuffer.yy","order":3,},
{"name":"rmTestMatrix","path":"rooms/rmTestMatrix/rmTestMatrix.yy","order":1,},
{"name":"oTestPolyline","path":"objects/oTestPolyline/oTestPolyline.yy","order":10,},
{"name":"CleanRectangle","path":"scripts/CleanRectangle/CleanRectangle.yy","order":7,},
{"name":"CleanTransformAddScale","path":"scripts/CleanTransformAddScale/CleanTransformAddScale.yy","order":4,},
{"name":"rmTestSegment","path":"rooms/rmTestSegment/rmTestSegment.yy","order":15,},
{"name":"rmTestConvex","path":"rooms/rmTestConvex/rmTestConvex.yy","order":21,},
{"name":"rmTestLine","path":"rooms/rmTestLine/rmTestLine.yy","order":7,},
{"name":"CleanAntialiasGet","path":"scripts/CleanAntialiasGet/CleanAntialiasGet.yy","order":2,},
{"name":"oExample","path":"objects/oExample/oExample.yy","order":3,},
{"name":"CleanNgon","path":"scripts/CleanNgon/CleanNgon.yy","order":13,},
{"name":"CleanConvex","path":"scripts/CleanConvex/CleanConvex.yy","order":12,},
{"name":"CleanBatchEndReturnVertexBuffer","path":"scripts/CleanBatchEndReturnVertexBuffer/CleanBatchEndReturnVertexBuffer.yy","order":2,},
{"name":"rmTestRectangle","path":"rooms/rmTestRectangle/rmTestRectangle.yy","order":13,},
{"name":"__shdCleanAntialias","path":"shaders/__shdCleanAntialias/__shdCleanAntialias.yy","order":1,},
{"name":"CleanCapsuleVertical","path":"scripts/CleanCapsuleVertical/CleanCapsuleVertical.yy","order":10,},
{"name":"oTestCircle","path":"objects/oTestCircle/oTestCircle.yy","order":6,},
{"name":"oTestSegment","path":"objects/oTestSegment/oTestSegment.yy","order":16,},
{"name":"CleanCapsule","path":"scripts/CleanCapsule/CleanCapsule.yy","order":9,},
{"name":"oTestLine","path":"objects/oTestLine/oTestLine.yy","order":8,},
{"name":"CleanRing","path":"scripts/CleanRing/CleanRing.yy","order":6,},
{"name":"CleanPolyline","path":"scripts/CleanPolyline/CleanPolyline.yy","order":1,},
{"name":"__shdCleanJaggies","path":"shaders/__shdCleanJaggies/__shdCleanJaggies.yy","order":2,},
{"name":"rmExample","path":"rooms/rmExample/rmExample.yy","order":2,},
],
"FolderOrderSettings": [
{"name":"(System)","path":"folders/Clean Shapes/(System).yy","order":14,},
{"name":"Batches","path":"folders/Clean Shapes/Batches.yy","order":12,},
{"name":"Shapes","path":"folders/Clean Shapes/Shapes.yy","order":3,},
{"name":"Transform","path":"folders/Clean Shapes/Transform.yy","order":13,},
{"name":"Tests","path":"folders/Tests.yy","order":5,},
{"name":"(System)","order":14,"path":"folders/Clean Shapes/(System).yy",},
{"name":"Batches","order":12,"path":"folders/Clean Shapes/Batches.yy",},
{"name":"Shapes","order":3,"path":"folders/Clean Shapes/Shapes.yy",},
{"name":"Transform","order":13,"path":"folders/Clean Shapes/Transform.yy",},
{"name":"Tests","order":5,"path":"folders/Tests.yy",},
],
"ResourceOrderSettings": [
{"name":"rmTestPolyline","order":9,"path":"rooms/rmTestPolyline/rmTestPolyline.yy",},
{"name":"CleanTriangle","order":11,"path":"scripts/CleanTriangle/CleanTriangle.yy",},
{"name":"rmTestClockwise","order":23,"path":"rooms/rmTestClockwise/rmTestClockwise.yy",},
{"name":"CleanCircle","order":3,"path":"scripts/CleanCircle/CleanCircle.yy",},
{"name":"CleanAntialiasSet","order":1,"path":"scripts/CleanAntialiasSet/CleanAntialiasSet.yy",},
{"name":"CleanEllipse","order":4,"path":"scripts/CleanEllipse/CleanEllipse.yy",},
{"name":"oTestPug","order":4,"path":"objects/oTestPug/oTestPug.yy",},
{"name":"oTestSurface","order":20,"path":"objects/oTestSurface/oTestSurface.yy",},
{"name":"CleanTransformAddMove","order":2,"path":"scripts/CleanTransformAddMove/CleanTransformAddMove.yy",},
{"name":"oTestConvex","order":22,"path":"objects/oTestConvex/oTestConvex.yy",},
{"name":"CleanTransformAddRotate","order":3,"path":"scripts/CleanTransformAddRotate/CleanTransformAddRotate.yy",},
{"name":"rmTestCircle","order":5,"path":"rooms/rmTestCircle/rmTestCircle.yy",},
{"name":"rmTestRing","order":17,"path":"rooms/rmTestRing/rmTestRing.yy",},
{"name":"rmTestSpline","order":11,"path":"rooms/rmTestSpline/rmTestSpline.yy",},
{"name":"CleanSpline","order":2,"path":"scripts/CleanSpline/CleanSpline.yy",},
{"name":"oTestClockwise","order":24,"path":"objects/oTestClockwise/oTestClockwise.yy",},
{"name":"oTestSpline","order":12,"path":"objects/oTestSpline/oTestSpline.yy",},
{"name":"oTestRectangle","order":14,"path":"objects/oTestRectangle/oTestRectangle.yy",},
{"name":"CleanTransformReset","order":7,"path":"scripts/CleanTransformReset/CleanTransformReset.yy",},
{"name":"CleanRectangleXYWH","order":8,"path":"scripts/CleanRectangleXYWH/CleanRectangleXYWH.yy",},
{"name":"CleanTransformAddSkew","order":5,"path":"scripts/CleanTransformAddSkew/CleanTransformAddSkew.yy",},
{"name":"CleanBatchEndDraw","order":1,"path":"scripts/CleanBatchEndDraw/CleanBatchEndDraw.yy",},
{"name":"oTestMatrix","order":2,"path":"objects/oTestMatrix/oTestMatrix.yy",},
{"name":"rmTestSurface","order":19,"path":"rooms/rmTestSurface/rmTestSurface.yy",},
{"name":"oTestRing","order":18,"path":"objects/oTestRing/oTestRing.yy",},
{"name":"CleanSegment","order":5,"path":"scripts/CleanSegment/CleanSegment.yy",},
{"name":"CleanTransformOriginGet","order":1,"path":"scripts/CleanTransformOriginGet/CleanTransformOriginGet.yy",},
{"name":"rmTestPug","order":3,"path":"rooms/rmTestPug/rmTestPug.yy",},
{"name":"CleanBatchDrawVertexBuffer","order":3,"path":"scripts/CleanBatchDrawVertexBuffer/CleanBatchDrawVertexBuffer.yy",},
{"name":"rmTestMatrix","order":1,"path":"rooms/rmTestMatrix/rmTestMatrix.yy",},
{"name":"oTestPolyline","order":10,"path":"objects/oTestPolyline/oTestPolyline.yy",},
{"name":"CleanRectangle","order":7,"path":"scripts/CleanRectangle/CleanRectangle.yy",},
{"name":"CleanTransformAddScale","order":4,"path":"scripts/CleanTransformAddScale/CleanTransformAddScale.yy",},
{"name":"rmTestSegment","order":15,"path":"rooms/rmTestSegment/rmTestSegment.yy",},
{"name":"rmTestConvex","order":21,"path":"rooms/rmTestConvex/rmTestConvex.yy",},
{"name":"rmTestLine","order":7,"path":"rooms/rmTestLine/rmTestLine.yy",},
{"name":"CleanAntialiasGet","order":2,"path":"scripts/CleanAntialiasGet/CleanAntialiasGet.yy",},
{"name":"oExample","order":3,"path":"objects/oExample/oExample.yy",},
{"name":"CleanNgon","order":13,"path":"scripts/CleanNgon/CleanNgon.yy",},
{"name":"CleanConvex","order":12,"path":"scripts/CleanConvex/CleanConvex.yy",},
{"name":"CleanBatchEndReturnVertexBuffer","order":2,"path":"scripts/CleanBatchEndReturnVertexBuffer/CleanBatchEndReturnVertexBuffer.yy",},
{"name":"rmTestRectangle","order":13,"path":"rooms/rmTestRectangle/rmTestRectangle.yy",},
{"name":"__shdCleanAntialias","order":1,"path":"shaders/__shdCleanAntialias/__shdCleanAntialias.yy",},
{"name":"CleanCapsuleVertical","order":10,"path":"scripts/CleanCapsuleVertical/CleanCapsuleVertical.yy",},
{"name":"oTestCircle","order":6,"path":"objects/oTestCircle/oTestCircle.yy",},
{"name":"oTestSegment","order":16,"path":"objects/oTestSegment/oTestSegment.yy",},
{"name":"CleanCapsule","order":9,"path":"scripts/CleanCapsule/CleanCapsule.yy",},
{"name":"oTestLine","order":8,"path":"objects/oTestLine/oTestLine.yy",},
{"name":"CleanRing","order":6,"path":"scripts/CleanRing/CleanRing.yy",},
{"name":"CleanPolyline","order":1,"path":"scripts/CleanPolyline/CleanPolyline.yy",},
{"name":"__shdCleanJaggies","order":2,"path":"shaders/__shdCleanJaggies/__shdCleanJaggies.yy",},
{"name":"rmExample","order":2,"path":"rooms/rmExample/rmExample.yy",},
],
}
Loading

0 comments on commit 7d932ab

Please sign in to comment.