Skip to content
This repository was archived by the owner on Dec 15, 2019. It is now read-only.

Commit 509362f

Browse files
Merge branch '0.7.0'
Conflicts: src/behaviors/sweep-prune.js
2 parents 2f3fa43 + 717ec8c commit 509362f

File tree

90 files changed

+20976
-3762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+20976
-3762
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ node_modules
33
.DS_Store
44
_SpecRunner.html
55
_working
6-
.sass-cache
6+
.sass-cache
7+
_site/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A modular, extendable, and easy-to-use physics engine for javascript.
44

5-
Latest version: 0.6.0 (beta)
5+
Latest version: 0.7.0 (beta)
66

77
## Usage
88

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "PhysicsJS",
3-
"version": "0.6.0",
3+
"version": "0.7.0",
44
"homepage": "http://wellcaffeinated.net/PhysicsJS",
55
"authors": [
66
"Jasper Palfree <[email protected]>"
77
],
88
"description": "A modular, extendable, and easy-to-use physics engine for javascript",
9-
"main": "dist/physicsjs-full-0.6.0.js",
9+
"main": "dist/physicsjs-full.js",
1010
"moduleType": [
1111
"amd",
1212
"globals",

dist/behaviors/attractor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* PhysicsJS v0.6.0 - 2014-04-22
2+
* PhysicsJS v0.7.0 - 2014-12-08
33
* A modular, extendable, and easy-to-use physics engine for javascript
44
* http://wellcaffeinated.net/PhysicsJS
55
*

0 commit comments

Comments
 (0)