Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mrdoob/three.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: timoxley/threejs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 5 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 16, 2012

  1. Add component.json

    timoxley committed Oct 16, 2012
    Copy the full SHA
    4869af4 View commit details

Commits on Oct 17, 2012

  1. Copy the full SHA
    9b33da3 View commit details
  2. Copy the full SHA
    c3b7539 View commit details
  3. Update README

    timoxley committed Oct 17, 2012
    Copy the full SHA
    ca1deb9 View commit details

Commits on Oct 24, 2012

  1. Copy the full SHA
    e2f0b41 View commit details
Showing with 34,560 additions and 671 deletions.
  1. +27 −670 README.md
  2. +12 −0 component.json
  3. +4 −1 examples/webgl_terrain_dynamic.html
  4. +34,517 −0 index.js
697 changes: 27 additions & 670 deletions README.md

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions component.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "threejs",
"repo": "timoxley/threejs",
"description": "JavaScript 3D library",
"version": "0.0.52",
"keywords": [],
"dependencies": {},
"development": {},
"scripts": [
"index.js"
]
}
5 changes: 4 additions & 1 deletion examples/webgl_terrain_dynamic.html
Original file line number Diff line number Diff line change
@@ -62,7 +62,10 @@
<source src="sounds/Five_Armies.ogg" type='audio/ogg'>
</audio>
-->
<script src="../build/three.min.js"></script>
<script src="/build/build.js"></script>
<script>
window.THREE = require('threejs')
</script>

<script src="js/controls/TrackballControls.js"></script>

34,517 changes: 34,517 additions & 0 deletions index.js

Large diffs are not rendered by default.