Merge remote branch 'remotes/upstream/master'

This commit is contained in:
alteredq
2011-02-27 07:02:09 +01:00
4 changed files with 9 additions and 8 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
The MIT License
Copyright (c) 2010-2011 Three.js Authors. All rights reserved.
Copyright (c) 2010-2011 three.js Authors. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
+1
View File
@@ -117,6 +117,7 @@ This code creates a camera, then creates a scene object, adds a bunch of random
function animate() {
// Include examples/js/RequestAnimationFrame.js for cross-browser compatibility.
requestAnimationFrame( animate );
render();
+6 -6
View File
@@ -26,12 +26,12 @@ Detector = {
var html = [
'Sorry, your browser doesn\'t support <a href="http://khronos.org/webgl/wiki/Getting_a_WebGL_Implementation">WebGL</a><br/>',
'<br/>',
'Please try with',
'<a href="http://www.google.com/chrome">Chrome 9+</a> /',
'<a href="http://www.mozilla.com/en-US/firefox/all-beta.html">Firefox 4+</a> /',
'<a href="http://nightly.webkit.org/">Safari OSX 10.6+</a>'
'Sorry, your browser doesn\'t support <a href="http://khronos.org/webgl/wiki/Getting_a_WebGL_Implementation">WebGL</a><br/>',
'<br/>',
'Please try with',
'<a href="http://www.google.com/chrome">Chrome 9+</a> /',
'<a href="http://www.mozilla.com/en-US/firefox/all-beta.html">Firefox 4+</a> /',
'<a href="http://nightly.webkit.org/">Safari 10.6+</a>'
].join("\n");
+1 -1
View File
@@ -1,6 +1,6 @@
/**
* Provides requestAnimationFrame in a cross browser way.
* @author paulirish / http://paulirish.com/
* http://paulirish.com/2011/requestanimationframe-for-smart-animating/
*/
if ( !window.requestAnimationFrame ) {