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

Conflicts: api/latest/scenejs.js api/latest/scenejs.min.js build/4.2.0/scenejs-4.2.0.js build/4.2.0/scenejs-4.2.0.min.js package.json
xeolabs · Jun 11, 2015 · 72529d0 · 72529d0
2 parents 55b9c59 + d51ec42
commit 72529d0
Show file tree

Hide file tree

Showing 10 changed files with 20,478 additions and 208 deletions.
diff --git a/build/scenejs.js b/build/scenejs.js
diff --git a/build/scenejs.min.js b/build/scenejs.min.js
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 -->