Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
TS committed Apr 28, 2020
2 parents f60e488 + 048b9c9 commit 6aba41f
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 9 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ before_script:
- yarn
script:
- gulp prod
- yarn run test
after_success:
- git reset -hard

4 changes: 1 addition & 3 deletions dist/tgen.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var SeamlessTextureGenerator = (function() {

return {

version: '1.2.1',
version: '1.2.2',
defaults: {},
effects: {},
filters: [],
Expand Down Expand Up @@ -686,8 +686,6 @@ if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
seed: [1, Number.MAX_SAFE_INTEGER]
}, function ($g, params) {

console.log(params);

switch (params.mode) {

case 'color':
Expand Down
4 changes: 2 additions & 2 deletions dist/tgen.min.js

Large diffs are not rendered by default.

Binary file modified dist/tgen.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "seamless-texture-generator",
"version": "1.2.1",
"version": "1.2.2",
"description": "Seamless texture generator",
"homepage": "https://github.com/schalkt/tgen/",
"scripts": {
Expand Down
2 changes: 0 additions & 2 deletions src/effects/noise.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
seed: [1, Number.MAX_SAFE_INTEGER]
}, function ($g, params) {

console.log(params);

switch (params.mode) {

case 'color':
Expand Down
2 changes: 1 addition & 1 deletion src/tgen-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var SeamlessTextureGenerator = (function() {

return {

version: '1.2.1',
version: '1.2.2',
defaults: {},
effects: {},
filters: [],
Expand Down

0 comments on commit 6aba41f

Please sign in to comment.