summaryrefslogtreecommitdiff
path: root/demos/2d
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-04-28 21:56:43 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-04-28 21:56:43 -0300
commit87f37bc5a305e6a68ef232be580350588e300fcc (patch)
tree608af97f58c0dd7f2f6f86d973b072f7888bfca0 /demos/2d
parent7fadc2f93a18f2b5487fbcd6e90bcde781c53fec (diff)
-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
Diffstat (limited to 'demos/2d')
-rw-r--r--demos/2d/kinematic_char/colworld.scnbin5065 -> 5090 bytes
-rw-r--r--demos/2d/platformer/engine.cfg4
-rw-r--r--demos/2d/platformer/tileset_edit.xml17
3 files changed, 10 insertions, 11 deletions
diff --git a/demos/2d/kinematic_char/colworld.scn b/demos/2d/kinematic_char/colworld.scn
index b1285b4811..b3a0a1f168 100644
--- a/demos/2d/kinematic_char/colworld.scn
+++ b/demos/2d/kinematic_char/colworld.scn
Binary files differ
diff --git a/demos/2d/platformer/engine.cfg b/demos/2d/platformer/engine.cfg
index d2a998d831..d6fa25c918 100644
--- a/demos/2d/platformer/engine.cfg
+++ b/demos/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/demos/2d/platformer/tileset_edit.xml b/demos/2d/platformer/tileset_edit.xml
index 6d5b84deaa..2473656a6a 100644
--- a/demos/2d/platformer/tileset_edit.xml
+++ b/demos/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>