Merge branch '0.7.0'

Conflicts: src/behaviors/sweep-prune.js
wellcaffeinated · Dec 8, 2014 · 509362f · 509362f
2 parents 2f3fa43 + 717ec8c
commit 509362f
Show file tree

Hide file tree

Showing 90 changed files with 20,976 additions and 3,762 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ node_modules
 .DS_Store
 _SpecRunner.html
 _working
-.sass-cache
+.sass-cache
+_site/
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A modular, extendable, and easy-to-use physics engine for javascript.
 
-Latest version: 0.6.0 (beta)
+Latest version: 0.7.0 (beta)
 
 ## Usage
 

diff --git a/bower.json b/bower.json
@@ -1,12 +1,12 @@
 {
  "name": "PhysicsJS",
- "version": "0.6.0",
+ "version": "0.7.0",
  "homepage": "https://wellcaffeinated.net/PhysicsJS",
  "authors": [
  "Jasper Palfree <[email protected]>"
  ],
  "description": "A modular, extendable, and easy-to-use physics engine for javascript",
- "main": "dist/physicsjs-full-0.6.0.js",
+ "main": "dist/physicsjs-full.js",
  "moduleType": [
  "amd",
  "globals",

diff --git a/dist/behaviors/attractor.js b/dist/behaviors/attractor.js
@@ -1,5 +1,5 @@
 /**
- * PhysicsJS v0.6.0 - 2014-04-22
+ * PhysicsJS v0.7.0 - 2014-12-08
  * A modular, extendable, and easy-to-use physics engine for javascript
  * https://wellcaffeinated.net/PhysicsJS
  *