Skip to content

Commit

Permalink
Merge pull request #1 from mrdoob/dev
Browse files Browse the repository at this point in the history
merge master
  • Loading branch information
gkjohnson authored May 20, 2018
2 parents ad22761 + 7dffdd2 commit 95b1cd2
Show file tree
Hide file tree
Showing 706 changed files with 32,929 additions and 26,634 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Please also include a live example if possible. You can start from these templat
##### Three.js version

- [ ] Dev
- [ ] r90
- [ ] r92
- [ ] ...

##### Browser
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ node_modules
npm-debug.log
.jshintrc
.vs/
test/unit/three.*.unit.js
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: node_js
node_js:
- "8.9.4"
script:
- npm run travis
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ three.js
[![License][license-badge]][license-badge-url]
[![Dependencies][dependencies-badge]][dependencies-badge-url]
[![Dev Dependencies][devDependencies-badge]][devDependencies-badge-url]
[![Build Status](https://travis-ci.org/mrdoob/three.js.svg?branch=dev)](https://travis-ci.org/mrdoob/three.js)

#### JavaScript 3D library ####

Expand Down
2,203 changes: 1,437 additions & 766 deletions build/three.js

Large diffs are not rendered by default.

1,658 changes: 837 additions & 821 deletions build/three.min.js

Large diffs are not rendered by default.

2,203 changes: 1,437 additions & 766 deletions build/three.module.js

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions docs/api/Polyfills.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@

<h1>Polyfills</h1>

<div class="desc">Three.js includes polyfills for the following functions and constants.</div>
<p class="desc">Three.js includes polyfills for the following functions and constants.</p>

<h3>[page:Number.EPSILON Number.EPSILON]</h3>
<div>
<p>
The difference between one and the smallest value greater than one that can be represented as a Number.
[link:https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/EPSILON MDN reference].
</div>
</p>

<h3>[page:Math.sign Math.sign]( [page:Number x] )</h3>
<div>
<p>
If the argument is a positive number, negative number, positive zero or negative zero,
the function will return 1, -1, 0 or -0 respectively. Otherwise, NaN is returned.
[link:https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sign MDN reference].
</div>
</p>

<h3>[page:Function.prototype.name Function.prototype.name]( [page:Number x] )</h3>
<div>
<p>
Returns the name of a function, or (before ES6 implementations) an empty string for anonymous functions.
[link:https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/name MDN reference].
</div>
</p>

<h3>[page:Object.assign Object.assign]( [page:Object target], [page:Object ...sources] )</h3>
<div>
<p>
The Object.assign() method is used to copy the values of all enumerable own properties from one or more source objects to a target object.
It will return the target object.
[link:https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign MDN reference].
</div>
</p>

<h2>Source</h2>

Expand Down
12 changes: 6 additions & 6 deletions docs/api/Template.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<h1>[name]</h1>

<div class="desc">todo</div>
<p class="desc">todo</p>


<h2>Example</h2>
Expand All @@ -23,22 +23,22 @@ <h2>Example</h2>
<h2>Constructor</h2>

<h3>[name]([param:Number todo])</h3>
<div></div>
<p></p>


<h2>Properties</h2>

<h3>[property:Number todo]</h3>
<div>
<p>
todo
</div>
</p>


<h2>Methods</h2>

<h3>[method:null todo]()</h3>
<div>todo</div>
<div>todo</div>
<p>todo</p>
<p>todo</p>


<h2>Source</h2>
Expand Down
Loading

0 comments on commit 95b1cd2

Please sign in to comment.