From 321aa5f4c24e1a34e2d72ef1096c246e85e14ae7 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Mon, 28 Apr 2014 21:56:43 -0300
Subject: [PATCH] -Added OpenSSL and HTTPS support -Built-in version of the
 library for Windows, Android and iOS (other OSs use system one) -Small fixes
 all around

---
 2d/kinematic_char/colworld.scn | Bin 5065 -> 5090 bytes
 2d/platformer/engine.cfg       |   4 ++--
 2d/platformer/tileset_edit.xml |  17 ++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/2d/kinematic_char/colworld.scn b/2d/kinematic_char/colworld.scn
index b1285b48118c799fde6ad921ad8bf1a25e034b1f..b3a0a1f168e44f6f2815c01eb38fe16b726133a0 100644
GIT binary patch
delta 2477
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
E1#xB86951J

delta 2524
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
DpP}0<

diff --git a/2d/platformer/engine.cfg b/2d/platformer/engine.cfg
index d2a998d8..d6fa25c9 100644
--- a/2d/platformer/engine.cfg
+++ b/2d/platformer/engine.cfg
@@ -15,8 +15,8 @@ stretch_aspect="keep"
 
 [image_loader]
 
-filter=false
-gen_mipmaps=false
+;filter=false
+;gen_mipmaps=false
 repeat=false
 
 [input]
diff --git a/2d/platformer/tileset_edit.xml b/2d/platformer/tileset_edit.xml
index 6d5b84de..2473656a 100644
--- a/2d/platformer/tileset_edit.xml
+++ b/2d/platformer/tileset_edit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <resource_file type="PackedScene" subresource_count="12" version="1.0" version_name="Godot Engine v1.0.3917-beta1">
-	<ext_resource path="res://tiles_demo.*" type="Texture"></ext_resource>
+	<ext_resource path="res://tiles_demo.png" type="Texture"></ext_resource>
 	<resource type="ConvexPolygonShape2D" path="local://1">
 		<real name="custom_solver_bias"> 0 </real>
 		<vector2_array name="points" len="4"> 			0, 8, 64, 8, 64, 64, 0, 64 </vector2_array>
@@ -54,7 +54,7 @@
 	<main_resource>
 		<dictionary name="_bundled" shared="false">
 			<string> "names" </string>
-			<string_array  len="76">
+			<string_array  len="75">
 				<string> "Node" </string>
 				<string> "__meta__" </string>
 				<string> "floor" </string>
@@ -62,7 +62,7 @@
 				<string> "visibility/visible" </string>
 				<string> "visibility/opacity" </string>
 				<string> "visibility/self_opacity" </string>
-				<string> "visibility/on_top" </string>
+				<string> "visibility/behind_parent" </string>
 				<string> "transform/pos" </string>
 				<string> "transform/rot" </string>
 				<string> "transform/scale" </string>
@@ -83,7 +83,6 @@
 				<string> "shapes/0/shape" </string>
 				<string> "shapes/0/transform" </string>
 				<string> "shapes/0/trigger" </string>
-				<string> "simulate_motion" </string>
 				<string> "constant_linear_velocity" </string>
 				<string> "constant_angular_velocity" </string>
 				<string> "friction" </string>
@@ -148,9 +147,9 @@
 							<string> "pixel_snap" </string>
 							<bool> False </bool>
 							<string> "zoom" </string>
-							<real> 1.360374 </real>
+							<real> 1.670182 </real>
 							<string> "ofs" </string>
-							<vector2> 272.509, -91.6367 </vector2>
+							<vector2> -58.9115, 60.1605 </vector2>
 						</dictionary>
 						<string> "3D" </string>
 						<dictionary  shared="false">
@@ -241,11 +240,11 @@
 				</dictionary>
 				<bool> True </bool>
 				<nil>  </nil>
+				<nil>  </nil>
 				<vector2> 0, 0 </vector2>
 				<nil>  </nil>
 				<vector2> 1, 1 </vector2>
-				<resource  resource_type="Texture" path="res://tiles_demo.*">  </resource>
-				<nil>  </nil>
+				<resource  resource_type="Texture" path="res://tiles_demo.png">  </resource>
 				<int> 1 </int>
 				<nil>  </nil>
 				<color> 1, 1, 1, 1 </color>
@@ -305,7 +304,7 @@
 				<real> -1 </real>
 			</array>
 			<string> "nodes" </string>
-			<int_array  len="1316"> 				-1, -1, 0, 0, -1, 1, 1, 0, 0, 0, 0, 3, 2, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 11, 0, 1, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 12, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 2, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 14, 0, 0, 0, 3, 36, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 15, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 16, 0, 4, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 17, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 5, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 18, 0, 0, 0, 3, 37, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 19, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 20, 0, 7, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 21, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 8, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 22, 0, 0, 0, 3, 38, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 23, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 24, 0, 10, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 25, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 11, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 22, 0, 0, 0, 3, 39, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 26, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 27, 0, 13, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 28, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 14, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 29, 0, 0, 0, 3, 40, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 30, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 31, 0, 16, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 32, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 17, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 33, 0, 0, 0, 3, 41, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 34, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 35, 0, 19, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 36, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 20, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 37, 0, 0, 0, 3, 42, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 38, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 39, 0, 22, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 40, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 23, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 37, 0, 0, 0, 3, 43, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 41, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 42, 0, 0, 0, 3, 44, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 43, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 44, 0, 0, 0, 3, 45, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 45, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 46, 0, 0, 0, 3, 46, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 47, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 48, 0, 0, 0, 3, 47, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 49, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 50, 0, 29, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 51, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 30, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 52, 0, 0, 0, 3, 48, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 53, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 54, 0, 32, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 55, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 33, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 22, 0, 0, 0, 50, 49, -1, 29, 4, 1, 5, 2, 6, 2, 7, 1, 51, 56, 52, 57, 53, 58, 54, 59, 55, 60, 56, 60, 57, 60, 58, 60, 59, 1, 60, 1, 61, 61, 62, 2, 63, 4, 64, 62, 65, 2, 66, 62, 67, 4, 68, 7, 69, 7, 70, 63, 71, 9, 72, 9, 73, 7, 74, 7, 75, 64, 0 </int_array>
+			<int_array  len="1296"> 				-1, -1, 0, 0, -1, 1, 1, 0, 0, 0, 0, 3, 2, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 11, 0, 1, 0, 23, 22, -1, 15, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 24, 8, 25, 12, 26, 13, 27, 3, 28, 4, 29, 5, 30, 2, 31, 5, 0, 2, 0, 32, 32, -1, 9, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 33, 9, 34, 14, 0, 0, 0, 3, 35, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 15, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 16, 0, 4, 0, 23, 22, -1, 15, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 24, 8, 25, 17, 26, 13, 27, 3, 28, 4, 29, 5, 30, 2, 31, 5, 0, 5, 0, 32, 32, -1, 9, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 33, 9, 34, 18, 0, 0, 0, 3, 36, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 19, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 20, 0, 7, 0, 23, 22, -1, 15, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 24, 8, 25, 21, 26, 13, 27, 3, 28, 4, 29, 5, 30, 2, 31, 5, 0, 8, 0, 32, 32, -1, 9, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 33, 9, 34, 22, 0, 0, 0, 3, 37, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 23, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 24, 0, 10, 0, 23, 22, -1, 15, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 24, 8, 25, 25, 26, 13, 27, 3, 28, 4, 29, 5, 30, 2, 31, 5, 0, 11, 0, 32, 32, -1, 9, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 33, 9, 34, 22, 0, 0, 0, 3, 38, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 26, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 27, 0, 13, 0, 23, 22, -1, 15, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 24, 8, 25, 28, 26, 13, 27, 3, 28, 4, 29, 5, 30, 2, 31, 5, 0, 14, 0, 32, 32, -1, 9, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 33, 9, 34, 29, 0, 0, 0, 3, 39, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 30, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 31, 0, 16, 0, 23, 22, -1, 15, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 24, 8, 25, 32, 26, 13, 27, 3, 28, 4, 29, 5, 30, 2, 31, 5, 0, 17, 0, 32, 32, -1, 9, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 33, 9, 34, 33, 0, 0, 0, 3, 40, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 34, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 35, 0, 19, 0, 23, 22, -1, 15, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 24, 8, 25, 36, 26, 13, 27, 3, 28, 4, 29, 5, 30, 2, 31, 5, 0, 20, 0, 32, 32, -1, 9, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 33, 9, 34, 37, 0, 0, 0, 3, 41, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 38, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 39, 0, 22, 0, 23, 22, -1, 15, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 24, 8, 25, 40, 26, 13, 27, 3, 28, 4, 29, 5, 30, 2, 31, 5, 0, 23, 0, 32, 32, -1, 9, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 33, 9, 34, 37, 0, 0, 0, 3, 42, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 41, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 42, 0, 0, 0, 3, 43, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 43, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 44, 0, 0, 0, 3, 44, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 45, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 46, 0, 0, 0, 3, 45, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 47, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 48, 0, 0, 0, 3, 46, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 49, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 50, 0, 29, 0, 23, 22, -1, 15, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 24, 8, 25, 51, 26, 13, 27, 3, 28, 4, 29, 5, 30, 2, 31, 5, 0, 30, 0, 32, 32, -1, 9, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 33, 9, 34, 52, 0, 0, 0, 3, 47, -1, 18, 4, 1, 5, 2, 6, 2, 7, 3, 8, 53, 9, 5, 10, 6, 11, 7, 12, 3, 13, 4, 14, 3, 15, 3, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 54, 0, 32, 0, 23, 22, -1, 15, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 24, 8, 25, 55, 26, 13, 27, 3, 28, 4, 29, 5, 30, 2, 31, 5, 0, 33, 0, 32, 32, -1, 9, 4, 1, 5, 2, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 33, 9, 34, 22, 0, 0, 0, 49, 48, -1, 29, 4, 1, 5, 2, 6, 2, 7, 3, 50, 56, 51, 57, 52, 58, 53, 59, 54, 60, 55, 60, 56, 60, 57, 60, 58, 1, 59, 1, 60, 61, 61, 2, 62, 5, 63, 62, 64, 2, 65, 62, 66, 5, 67, 3, 68, 3, 69, 63, 70, 9, 71, 9, 72, 3, 73, 3, 74, 64, 0 </int_array>
 			<string> "conns" </string>
 			<int_array  len="0"> 				 </int_array>
 		</dictionary>