Merge remote-tracking branch 'refs/remotes/origin/development' into development

engine/source/platformiOS/platformiOS.h

@@ -35,6 +35,9 @@
 #include "platformiOS/T2DView.h"
 #include "platformiOS/T2DViewController.h"
 
+// Mich Note: Do not try to spend too much time analyzing this class.
+// It is planned to refactor the iOS platform layer and replace this
+// with a platform state similar to what OS X uses.
 class iOSPlatState
 {
 public:

modules/ShapeVectorToy/1/main.cs

@@ -34,7 +34,7 @@ function ShapeVectorToy::create( %this )
     // "Square": Simple box
     // "Triangle": Equilateral triangle
     // "Circle": Simple circle
-    // "Complexe":
+    // "Complex": Shape with enough vertices to make an uncommon shape
     ShapeVectorToy.shape = "Square";
 
     // Toggles filling the shape with color or leaving as an outline