From 422c1e4dff4ff32c12726e17b3364b549c53399d Mon Sep 17 00:00:00 2001 From: liabru Date: Wed, 9 Nov 2016 20:46:45 +0000 Subject: [PATCH] release 0.11.1 --- CHANGELOG.md | 8 ++ Gulpfile.js | 4 +- bower.json | 2 +- build/matter.js | 318 ++++++++++++++++++++++---------------------- build/matter.min.js | 4 +- package.json | 2 +- 6 files changed, 173 insertions(+), 165 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ce8a103..429d0a08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ + +## 0.11.1 (2016-11-09) + + +* added derequire to build ([ded796c](https://github.com/liabru/matter-js/commit/ded796c)) + + + # 0.11.0 (2016-11-04) diff --git a/Gulpfile.js b/Gulpfile.js index db32cbd8..6921d943 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -237,7 +237,7 @@ var serve = function(isTest) { }; var build = function(options) { - var isDev = options.version.indexOf('-dev'), + var isDev = options.version.indexOf('-dev') !== -1, filename = buildDirectory + (isDev ? '/matter-dev' : '/matter'), dest = filename + '.js', destMin = filename + '.min.js'; @@ -258,7 +258,7 @@ var build = function(options) { .pipe(derequire()) .pipe(replace('@@VERSION@@', options.version)); - if (isDev === -1) { + if (!isDev) { compiled.pipe(preprocess({ context: { DEBUG: false } })); } diff --git a/bower.json b/bower.json index 6aff9f89..0a8c6619 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "Matter", - "version": "0.11.0", + "version": "0.11.1", "homepage": "https://github.com/liabru/matter-js", "authors": [ "Liam Brummitt (http://brm.io/)" diff --git a/build/matter.js b/build/matter.js index 15abe2d2..3563747a 100644 --- a/build/matter.js +++ b/build/matter.js @@ -1,5 +1,5 @@ /** -* matter-js 0.11.0 by @liabru 2016-11-04 +* matter-js 0.11.1 by @liabru 2016-11-09 * http://brm.io/matter-js/ * License MIT */ @@ -28,7 +28,7 @@ * THE SOFTWARE. */ -(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Matter = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o0&&u.trigger(n,"collisionStart",{pairs:w.collisionStart}),s.preSolvePosition(w.list),c=0;c0&&u.trigger(n,"collisionActive",{pairs:w.collisionActive}),w.collisionEnd.length>0&&u.trigger(n,"collisionEnd",{pairs:w.collisionEnd}),e(x),u.trigger(n,"afterUpdate",g),n},n.merge=function(e,t){if(f.extend(e,t),t.world){e.world=t.world,n.clear(e);for(var o=d.allBodies(e.world),i=0;ir?(i.warn("Plugin.register:",n.toString(t),"was upgraded to",n.toString(e)),n._registry[e.name]=e):r>o?i.warn("Plugin.register:",n.toString(t),"can not be downgraded to",n.toString(e)):e!==t&&i.warn("Plugin.register:",n.toString(e),"is already registered to different plugin object"); diff --git a/package.json b/package.json index f932d73a..ab5cce41 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matter-js", - "version": "0.11.0", + "version": "0.11.1", "license": "MIT", "homepage": "http://brm.io/matter-js/", "author": "Liam Brummitt (http://brm.io/)",