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

2016-02-19 13:17:31 +01:00
parent 8c9f4bb84b 2ac584bafb
commit cf2bf4e14d
28 changed files with 639 additions and 69 deletions
@@ -25,4 +25,6 @@ C=ConnectToServer
 N=SwitchToServer
 M=SwitchToClient
 P=SwitchToPlayer
-K=TakeDamage,1500
+K=TakeDamage,1500
+F2=PerformanceTimingResetAllTimers
+F3=PerformanceTimingCreateExcelData
@@ -144,7 +144,7 @@
          </Team>
        </c:Team>
        <c:Transform>
-          <Position X="57.7363472" Y="2.38900018" Z="79.5"/>
+          <Position X="57.7363472" Y="4.98900032" Z="79.5"/>
        </c:Transform>
      </Components>
      <Children>
@@ -206,14 +206,16 @@
          </Team>
        </c:Team>
        <c:Transform>
-          <Position X="-60.2567062" Y="3.4000001" Z="-78.1000061"/>
+          <Position X="-60.2567062" Y="9.40000057" Z="-78.1000061"/>
        </c:Transform>
      </Components>
      <Children>
        <Entity>
          <Components>
            <c:SpawnPoint/>
-            <c:Transform/>
+            <c:Transform>
+              <Position X="0" Y="2.10000014" Z="0"/>
+            </c:Transform>
          </Components>
          <Children/>
        </Entity>