Skip to content

Commit 9fa3edc

Browse files
committed
Merge branch 'dev' of github.com:mrdoob/three.js into gltf_khr_lights_v2
2 parents f22daf7 + 36dc4a7 commit 9fa3edc

File tree

636 files changed

+39096
-36668
lines changed

Some content is hidden

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

636 files changed

+39096
-36668
lines changed

.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Please also include a live example if possible. You can start from these templat
1919
##### Three.js version
2020

2121
- [ ] Dev
22-
- [ ] r90
22+
- [ ] r91
2323
- [ ] ...
2424

2525
##### Browser

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ node_modules
77
npm-debug.log
88
.jshintrc
99
.vs/
10+
test/unit/three.*.unit.js

.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ test/
55
utils/
66
docs/
77
editor/
8+
.DS_Store

.travis.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
language: node_js
2+
node_js:
3+
- "8.9.4"
4+
script:
5+
- npm run travis

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
three.js
22
========
33

4-
[![Gitter][gitter-badge]][gitter-badge-url]
54
[![Latest NPM release][npm-badge]][npm-badge-url]
65
[![License][license-badge]][license-badge-url]
76
[![Dependencies][dependencies-badge]][dependencies-badge-url]
87
[![Dev Dependencies][devDependencies-badge]][devDependencies-badge-url]
8+
[![Build Status](https://travis-ci.org/mrdoob/three.js.svg?branch=dev)](https://travis-ci.org/mrdoob/three.js)
99

1010
#### JavaScript 3D library ####
1111

@@ -16,7 +16,9 @@ The aim of the project is to create an easy to use, lightweight, 3D library. The
1616
[Wiki](https://github.com/mrdoob/three.js/wiki) —
1717
[Migrating](https://github.com/mrdoob/three.js/wiki/Migration-Guide) —
1818
[Questions](http://stackoverflow.com/questions/tagged/three.js) —
19-
[Forum](https://discourse.threejs.org/)
19+
[Forum](https://discourse.threejs.org/) —
20+
[Gitter](https://gitter.im/mrdoob/three.js) —
21+
[Slack](https://threejs-slack.herokuapp.com/)
2022

2123
### Usage ###
2224

@@ -74,8 +76,6 @@ If everything went well you should see [this](https://jsfiddle.net/f2Lommf5/).
7476
[releases](https://github.com/mrdoob/three.js/releases)
7577

7678

77-
[gitter-badge]: https://badges.gitter.im/mrdoob/three.js.svg
78-
[gitter-badge-url]: https://gitter.im/mrdoob/three.js
7979
[npm-badge]: https://img.shields.io/npm/v/three.svg
8080
[npm-badge-url]: https://www.npmjs.com/package/three
8181
[license-badge]: https://img.shields.io/npm/l/three.svg

0 commit comments

Comments
 (0)