Merge remote-tracking branch 'origin/master' into shader-optimizations

Conflicts: .gitignore README.markdown build.xml resources/web/style.css src/scenejs/boundary/boundingBox.js src/scenejs/geometry/objects/sphere.js src/scenejs/interpolation/interpolator.js src/scenejs/scene/scene.js src/scenejs/scene/sceneModule.js
xeolabs · Jun 3, 2015 · bc8c36b · bc8c36b
1 parent 9e6cec5
commit bc8c36b
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 217 deletions.
diff --git a/examples/features.json b/examples/features.json
@@ -195,6 +195,14 @@
                         "page": "optimization_uintIndex"
                     }
                 ]
+            },
+            {
+                "nodes": [
+                    {
+                        "title": "Super sample anti-aliasing",
+                        "page": "canvas_SSAA"
+                    }
+                ]
             }
         ]
     },

diff --git a/examples/index.html b/examples/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>SceneJS v4.0 - Examples</title>
+    <title>SceneJS v4.2.0 - Examples</title>
 
     <!--Examples viewer adapted from the one over at THREE.js -->
     <!-- threejs.com -->