Merge remote-tracking branch 'origin/master' into Networking

# Conflicts:
#	src/Game/Game.cpp

resources/DefaultConfig.ini

@@ -2,6 +2,7 @@
 
 LogLevel=1
 LoadMap=
+EditorEnabled=false
 
 
 [Video]

resources/DefaultInput.ini

@@ -14,3 +14,9 @@ R=Reload
 Space=Jump
 LeftControl=Crouch
 LeftShift=Sprint
+F1=ToggleEditor
+1=EditorToolMove
+2=EditorToolRotate
+3=EditorToolScale
+X=EditorToggleTransformSpace
+C=ConnectToServer

resources/Schema/Components/Transform.xml

@@ -1,5 +1,5 @@
 <c:Transform>
 	<Position X="0" Y="0" Z="0"/>
-	<Orientation X="0" Y="0" Z="0" W="0"/>
+	<Orientation X="0" Y="0" Z="0"/>
 	<Scale X="1" Y="1" Z="1"/>
 </c:Transform>

resources/Schema/Entities/EditorTestWorld.xml

@@ -2,7 +2,10 @@
 
 <Entity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd" xmlns:c="components">
 	<Components>
-		<c:Transform></c:Transform>
+		<c:Transform>
+			<Position X="0" Y="0" Z="0"/>
+			<Orientation X="0" Y="0" Z="0"/>
+		</c:Transform>
 	</Components>
 	<Children>
 		<Entity>
@@ -19,12 +22,28 @@
 		<Entity>
 			<Components>
 				<c:Transform>
-					<Position X="0" Y="1" Z="0"/>
+					<Position X="1" Y="1" Z="0"/>
+					<Orientation X="0" Y="0.78539" Z="0"/>
 				</c:Transform>
 				<c:Model>
 					<Resource>An error</Resource>
 				</c:Model>
 			</Components>
+			<Children>
+				<Entity>
+					<Components>
+						<c:Transform>
+							<Position X="2" Y="0" Z="0"/>
+							<Orientation X="0" Y="0.78539" Z="0"/>
+						</c:Transform>
+						<c:Model>
+							<Resource>An error</Resource>
+						</c:Model>
+					</Components>
+					<Children>
+					</Children>
+				</Entity>
+			</Children>
 		</Entity>
 	</Children>
 </Entity>