Skip to content

merge #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Jan 1, 2019
Merged

merge #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e7fdee0
Initial fire example
Dec 4, 2018
5e3c5b3
Run through code beautifier
Dec 4, 2018
665b441
Fix up spacing
Dec 4, 2018
eb29d42
Fix up spacing
Dec 4, 2018
810f42a
Fix review comments
Dec 5, 2018
0dac3aa
Adding LightningStrike, LightningStorm with examples
yomboprime Dec 8, 2018
1825277
LDrawLoader
yomboprime Dec 20, 2018
1ece645
Added pack utility and packed models. Optimized pack loading.
yomboprime Dec 23, 2018
9e66015
Optmized rendering (merge all primitives in one object) and loading t…
yomboprime Dec 24, 2018
06e5d01
Fix missing last triangle of each material
yomboprime Dec 25, 2018
a79f877
Beautify model dropdown list with labels
yomboprime Dec 25, 2018
c6b8ab8
Docs: Change place of customDepthMaterial and customDistanceMaterial.
Mugen87 Dec 29, 2018
62f8cd6
Examples: Simplify webgl_loader_fbx
Mugen87 Dec 29, 2018
7e77d64
Merge pull request #15489 from Mugen87/dev21
mrdoob Dec 31, 2018
c76b296
Merge pull request #15487 from Mugen87/dev11
mrdoob Dec 31, 2018
931cbbc
Merge pull request #15453 from yomboprime/ldraw
mrdoob Dec 31, 2018
043a5c8
Improved LDrawLoader example.
mrdoob Dec 31, 2018
356d25c
Merge pull request #15366 from mikepiecuch/fire_example
mrdoob Dec 31, 2018
78b5041
Merge pull request #15397 from yomboprime/storm
mrdoob Dec 31, 2018
b789747
Cleaned up exporter examples.
mrdoob Dec 31, 2018
3cafa88
Improved ColladaExporter example.
mrdoob Dec 31, 2018
a6e5353
Tweaker LDrawLoader example.
mrdoob Dec 31, 2018
7043802
r100
mrdoob Dec 31, 2018
97aaecc
Merge pull request #6 from mrdoob/dev
HypnosNova Dec 31, 2018
5fd51da
Update Useful-links.html
brettkromkamp Jan 1, 2019
a48ecad
Merge pull request #15495 from brettkromkamp/patch-1
mrdoob Jan 1, 2019
a8794dc
Upgrade dev dependencies
Mugen87 Jan 1, 2019
6f8fe9b
r101dev
mrdoob Jan 1, 2019
0dde081
Merge pull request #15496 from Mugen87/dev21
mrdoob Jan 1, 2019
ccd4d87
merge
HypnosNova Jan 1, 2019
ef14438
Merge branch 'mrdoob-dev' into dev
HypnosNova Jan 1, 2019
bf7065c
solve conflicts
HypnosNova Jan 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
View file
Open in desktop
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
- [ ] r99
- [ ] r100
- [ ] ...

##### Browser
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.DS_Store
.package-lock.json
*.swp
.project
node_modules
Expand All @@ -9,3 +8,4 @@ npm-debug.log
.jshintrc
.vs/
test/unit/three.*.unit.js
.package-lock.json
Loading