Skip to content

Commit

Permalink
Merge pull request mrdoob#3 from mrdoob/dev
Browse files Browse the repository at this point in the history
Merge with repo
  • Loading branch information
cabanier authored Dec 3, 2020
2 parents 1418c2b + 65b712a commit a8f0beb
Show file tree
Hide file tree
Showing 173 changed files with 4,624 additions and 1,859 deletions.
3 changes: 1 addition & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Many linting errors can be fixed automatically by running

If you’d like to make a minified version of the build files i.e. ‘build/three.min.js’ run:

npm run-script build-closure
npm run build

## Making changes

Expand Down Expand Up @@ -75,7 +75,6 @@ When you’ve decided to make changes, start with the following:

npm run make-screenshot <example_1_name> ...<example_N_name>

* Watch out for Closure compiler warnings when building the libs, there should not be any.
* Once done with a patch / feature do not add more commits to a feature branch
* Create separate branches per patch or feature.
* If you make a PR but it is not actually ready to be pulled into the dev branch, add `[Draft]` into the PR title and/or convert it to a draft PR
Expand Down
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These are supported funding model platforms

github: [mrdoob, HumanInteractive]
Loading

0 comments on commit a8f0beb

Please sign in to comment.