Skip to content

Commit

Permalink
Merge branch 'url-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
fancyzhong committed Oct 6, 2020
2 parents e08ab47 + 5dcd915 commit 493bd46
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions build/proton.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/proton.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "proton-engine",
"version": "4.1.5",
"version": "4.2.0",
"description": "Proton is a simple and powerful javascript particle animation engine.",
"keywords": [
"particle",
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import ImageZone from "./zone/ImageZone";
import Debug from "./debug/Debug";

// namespace
Proton.Particle = Proton.P = Particle;
Proton.Particle = Particle;
Proton.Pool = Pool;

Proton.Util = Util;
Expand Down Expand Up @@ -91,7 +91,7 @@ Proton.RandomDrift = Proton.RD = RandomDrift;
Proton.Gravity = Proton.G = Gravity;
Proton.Collision = Collision;
Proton.CrossZone = CrossZone;
Proton.Alpha = Proton.A = Alpha;
Proton.Alpha = Alpha;
Proton.Scale = Proton.S = Scale;
Proton.Rotate = Rotate;
Proton.Color = Color;
Expand Down

0 comments on commit 493bd46

Please sign in to comment.