Merge branch 'patch-2' of https://github.com/gero3/three.js into dev

docs/api/loaders/Loader.html

@@ -17,10 +17,10 @@
 
 		<h3>[name]([page:Boolean showStatus])</h3>
 		<div>
-		showStatus -- todo
+		showStatus -- Show the status of loading div.
 		</div>
 		<div>
-		todo
+		Creates a new [name]. This should be called as base class.
 		</div>
 
 
@@ -46,34 +46,34 @@
 		
 		<h3>.[page:string crossOrigin]</h3>
 		<div>
-		todo
+		The crossOrigin string to implement CORS for loading the url from a different domain that allows CORS.
 		</div> 
 
 		<h2>Methods</h2>
 
-		<h3>.needsTangents([page:todo materials]) [page:todo]</h3>
+		<h3>.needsTangents([page:Array materials]) [page:todo]</h3>
 		<div>
-		materials -- todo
+		materials -- an array of [page:Material]
 		</div>
 		<div>
-		todo
+		Checks if the loaded object needs tangents based on its materials.
 		</div>
 
-		<h3>.updateProgress([page:todo progress]) [page:todo]</h3>
+		<h3>.updateProgress([page:object progress]) [page:todo]</h3>
 		<div>
-		progress -- todo
+		progress -- an object containing loaded(contains the amount of bytes loaded) and optionally total (containing the total amount of bytes).
 		</div>
 		<div>
-		todo
+		Updates the DOM object with the progress made.
 		</div>
 
-		<h3>.createMaterial([page:todo m], [page:todo texturePath]) [page:todo]</h3>
+		<h3>.createMaterial([page:object m], [page:string texturePath]) [page:todo]</h3>
 		<div>
-		m -- todo <br />
-		texturePath -- todo
+		m -- The parameters to create the material. <br />
+		texturePath -- The base path of the textures.
 		</div>
 		<div>
-		todo
+		Creates the Material based on the parameters m.
 		</div>
 
 		<h3>.initMaterials([page:todo materials], [page:todo texturePath]) [page:todo]</h3>