01-06-2017 Actualización repositorio

Author: jemora

menu/idioma/idiomas.scn

@@ -15,12 +15,12 @@
 			<string> "conn_count" </string>
 			<int> 1 </int>
 			<string> "conns" </string>
-			<int_array  len="6"> 				0, 0, 73, 72, 2, 0 </int_array>
+			<int_array  len="6"> 				0, 0, 75, 74, 2, 0 </int_array>
 			<string> "editable_instances" </string>
 			<array  len="0" shared="false">
 			</array>
 			<string> "names" </string>
-			<string_array  len="74">
+			<string_array  len="76">
 				<string> "player" </string>
 				<string> "transform/pos" </string>
 				<string> "transform/scale" </string>
@@ -53,8 +53,11 @@
 				<string> "air_acceleration" </string>
 				<string> "extra_gravity" </string>
 				<string> "offset_x_velocidad" </string>
+				<string> "offset_y_velocidad" </string>
 				<string> "offset_y_up_limite" </string>
 				<string> "offset_y_down_limite" </string>
+				<string> "offset_y_down_limite2" </string>
+				<string> "offset_x_limite_ave" </string>
 				<string> "RigidBody2D" </string>
 				<string> "Camera2D" </string>
 				<string> "offset" </string>
@@ -87,7 +90,6 @@
 				<string> "Sprite" </string>
 				<string> "player_sprite1" </string>
 				<string> "character_sprites" </string>
-				<string> "linear_damp" </string>
 				<string> "character_sprites 2" </string>
 				<string> "CollisionShape2D" </string>
 				<string> "shape" </string>
@@ -102,9 +104,9 @@
 			<array  len="0" shared="false">
 			</array>
 			<string> "nodes" </string>
-			<int_array  len="207"> 				-1, -1, 34, 0, -1, 33, 1, 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 2, 7, 5, 8, 5, 9, 6, 10, 7, 11, 8, 12, 8, 13, 7, 14, 2, 15, 9, 16, 9, 17, 2, 18, 2, 19, 10, 20, 11, 21, 8, 22, 12, 23, 12, 24, 13, 25, 14, 26, 15, 27, 15, 28, 15, 29, 5, 30, 5, 31, 16, 32, 17, 33, 18, 0, 0, 0, 35, 35, -1, 17, 36, 19, 37, 9, 38, 2, 39, 10, 40, 20, 41, 21, 42, 22, 43, 23, 44, 24, 45, 10, 46, 10, 47, 10, 48, 25, 49, 8, 50, 8, 51, 8, 52, 26, 0, 0, 0, 53, 53, -1, 5, 1, 27, 54, 10, 55, 28, 56, 5, 57, 29, 0, 0, 0, 59, 58, -1, 0, 0, 3, 0, 63, 60, -1, 2, 61, 2, 62, 30, 0, 3, 0, 63, 64, -1, 4, 61, 2, 1, 31, 2, 32, 62, 30, 0, 3, 0, 2147483647, 65, 33, 3, 1, 34, 2, 35, 66, 36, 0, 3, 0, 2147483647, 67, 37, 2, 1, 38, 2, 39, 0, 0, 0, 68, 68, -1, 6, 61, 2, 1, 40, 2, 41, 69, 3, 70, 2, 71, 9, 0 </int_array>
+			<int_array  len="211"> 				-1, -1, 37, 0, -1, 36, 1, 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 2, 7, 5, 8, 5, 9, 6, 10, 7, 11, 8, 12, 8, 13, 7, 14, 2, 15, 9, 16, 9, 17, 2, 18, 2, 19, 10, 20, 11, 21, 8, 22, 12, 23, 12, 24, 13, 25, 14, 26, 15, 27, 15, 28, 15, 29, 5, 30, 5, 31, 16, 32, 16, 33, 17, 34, 18, 35, 19, 36, 20, 0, 0, 0, 38, 38, -1, 17, 39, 21, 40, 9, 41, 2, 42, 10, 43, 22, 44, 23, 45, 24, 46, 25, 47, 26, 48, 10, 49, 10, 50, 10, 51, 27, 52, 8, 53, 8, 54, 8, 55, 28, 0, 0, 0, 56, 56, -1, 5, 1, 29, 57, 10, 58, 30, 59, 5, 60, 31, 0, 0, 0, 62, 61, -1, 0, 0, 3, 0, 66, 63, -1, 2, 64, 2, 65, 32, 0, 3, 0, 66, 67, -1, 4, 64, 2, 1, 33, 2, 34, 65, 32, 0, 3, 0, 2147483647, 68, 35, 2, 1, 36, 2, 37, 0, 3, 0, 2147483647, 69, 38, 2, 1, 39, 2, 40, 0, 0, 0, 70, 70, -1, 6, 64, 2, 1, 41, 2, 42, 71, 3, 72, 2, 73, 9, 0 </int_array>
 			<string> "variants" </string>
-			<array  len="42" shared="false">
+			<array  len="43" shared="false">
 				<vector2> 24.5187, 46.9277 </vector2>
 				<vector2> 0.391448, 0.391448 </vector2>
 				<bool> False </bool>
@@ -127,6 +129,8 @@
 				<int> 3 </int>
 				<int> 750 </int>
 				<int> 600 </int>
+				<int> 300 </int>
+				<int> 700 </int>
 				<vector2> -300, -750 </vector2>
 				<vector2> 1.5, 1.5 </vector2>
 				<int> -2000 </int>
@@ -144,7 +148,6 @@
 				<resource  external="2">  </resource>
 				<vector2> 4.72469, -144.19 </vector2>
 				<vector2> 0.186142, 0.186142 </vector2>
-				<real> 0.1 </real>
 				<resource  external="3">  </resource>
 				<vector2> 4.37984, -144.182 </vector2>
 				<vector2> 0.184605, 0.188176 </vector2>

mundos/caminos/camino.scn

@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<resource_file type="PackedScene" subresource_count="6" version="2.0" version_name="Godot Engine v2.0.stable.official">
-	<ext_resource path="res://sonidos/samplelibrary.res" type="SampleLibrary" index="3">
-	</ext_resource>
-	<ext_resource path="res://scripts/player.gd" type="Script" index="0">
-	</ext_resource>
-	<ext_resource path="res://textures/player/gBot_head.png" type="Texture" index="1">
-	</ext_resource>
-	<ext_resource path="res://personajes/character_sprites.xml" type="PackedScene" index="2">
-	</ext_resource>
+<resource_file type="PackedScene" subresource_count="7" version="2.0" version_name="Godot Engine v2.0.stable.official">
+	<ext_resource path="res://sonidos/samplelibrary.res" type="SampleLibrary" index="4"></ext_resource>
+	<ext_resource path="res://scripts/player.gd" type="Script" index="0"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_head.png" type="Texture" index="1"></ext_resource>
+	<ext_resource path="res://personajes/character_sprites.xml" type="PackedScene" index="2"></ext_resource>
+	<ext_resource path="res://personajes/character_sprites_indigena.xml" type="PackedScene" index="3"></ext_resource>
 	<resource type="CapsuleShape2D" path="local://1">
-
 		<real name="custom_solver_bias"> 0 </real>
 		<real name="radius"> 44.528008 </real>
 		<real name="height"> 212.356705 </real>
@@ -20,12 +16,12 @@
 			<string> "conn_count" </string>
 			<int> 1 </int>
 			<string> "conns" </string>
-			<int_array  len="6"> 				0, 0, 80, 79, 2, 0 </int_array>
+			<int_array  len="6"> 				0, 0, 87, 86, 2, 0 </int_array>
 			<string> "editable_instances" </string>
 			<array  len="0" shared="false">
 			</array>
 			<string> "names" </string>
-			<string_array  len="81">
+			<string_array  len="88">
 				<string> "player" </string>
 				<string> "transform/pos" </string>
 				<string> "transform/scale" </string>
@@ -58,6 +54,12 @@
 				<string> "acceleration" </string>
 				<string> "air_acceleration" </string>
 				<string> "extra_gravity" </string>
+				<string> "offset_x_velocidad" </string>
+				<string> "offset_y_velocidad" </string>
+				<string> "offset_y_up_limite" </string>
+				<string> "offset_y_down_limite" </string>
+				<string> "offset_y_down_limite2" </string>
+				<string> "offset_x_limite_ave" </string>
 				<string> "RigidBody2D" </string>
 				<string> "Camera2D" </string>
 				<string> "offset" </string>
@@ -91,6 +93,7 @@
 				<string> "player_sprite1" </string>
 				<string> "character_sprites" </string>
 				<string> "linear_damp" </string>
+				<string> "character_sprites 2" </string>
 				<string> "CollisionShape2D" </string>
 				<string> "shape" </string>
 				<string> "trigger" </string>
@@ -109,14 +112,14 @@
 				<string> "body_enter" </string>
 			</string_array>
 			<string> "node_count" </string>
-			<int> 10 </int>
+			<int> 11 </int>
 			<string> "node_paths" </string>
 			<array  len="0" shared="false">
 			</array>
 			<string> "nodes" </string>
-			<int_array  len="238"> 				-1, -1, 32, 0, -1, 31, 1, 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 3, 8, 6, 9, 6, 10, 7, 11, 8, 12, 9, 13, 9, 14, 8, 15, 3, 16, 10, 17, 10, 18, 3, 19, 3, 20, 11, 21, 12, 22, 9, 23, 13, 24, 13, 25, 14, 26, 15, 27, 16, 28, 17, 29, 18, 30, 6, 31, 19, 0, 0, 0, 33, 33, -1, 17, 34, 20, 35, 10, 36, 3, 37, 11, 38, 21, 39, 22, 40, 23, 41, 24, 42, 19, 43, 11, 44, 11, 45, 11, 46, 25, 47, 9, 48, 8, 49, 9, 50, 26, 0, 0, 0, 51, 51, -1, 5, 1, 27, 52, 11, 53, 28, 54, 6, 55, 29, 0, 0, 0, 57, 56, -1, 0, 0, 3, 0, 61, 58, -1, 2, 59, 3, 60, 30, 0, 3, 0, 61, 62, -1, 4, 59, 3, 1, 31, 2, 32, 60, 30, 0, 3, 0, 2147483647, 63, 33, 3, 1, 34, 2, 35, 64, 36, 0, 0, 0, 65, 65, -1, 6, 59, 3, 1, 37, 2, 38, 66, 4, 67, 3, 68, 10, 0, 0, 0, 69, 69, -1, 8, 70, 9, 71, 8, 72, 8, 73, 39, 74, 8, 75, 6, 76, 40, 77, 9, 0, 0, 0, 69, 78, -1, 8, 70, 25, 71, 8, 72, 8, 73, 39, 74, 8, 75, 6, 76, 40, 77, 9, 0 </int_array>
+			<int_array  len="263"> 				-1, -1, 38, 0, -1, 37, 1, 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 3, 8, 6, 9, 6, 10, 7, 11, 8, 12, 9, 13, 9, 14, 8, 15, 3, 16, 10, 17, 10, 18, 3, 19, 3, 20, 11, 21, 12, 22, 9, 23, 13, 24, 13, 25, 14, 26, 15, 27, 16, 28, 17, 29, 18, 30, 6, 31, 19, 32, 20, 33, 20, 34, 21, 35, 16, 36, 22, 37, 17, 0, 0, 0, 39, 39, -1, 17, 40, 23, 41, 10, 42, 3, 43, 11, 44, 24, 45, 25, 46, 26, 47, 27, 48, 19, 49, 11, 50, 11, 51, 11, 52, 28, 53, 9, 54, 8, 55, 9, 56, 29, 0, 0, 0, 57, 57, -1, 5, 1, 30, 58, 11, 59, 31, 60, 6, 61, 32, 0, 0, 0, 63, 62, -1, 0, 0, 3, 0, 67, 64, -1, 2, 65, 3, 66, 33, 0, 3, 0, 67, 68, -1, 4, 65, 3, 1, 34, 2, 35, 66, 33, 0, 3, 0, 2147483647, 69, 36, 3, 1, 37, 2, 38, 70, 39, 0, 3, 0, 2147483647, 71, 40, 3, 1, 41, 2, 42, 70, 39, 0, 0, 0, 72, 72, -1, 6, 65, 3, 1, 43, 2, 44, 73, 4, 74, 3, 75, 10, 0, 0, 0, 76, 76, -1, 8, 77, 9, 78, 8, 79, 8, 80, 45, 81, 8, 82, 6, 83, 46, 84, 9, 0, 0, 0, 76, 85, -1, 8, 77, 28, 78, 8, 79, 8, 80, 45, 81, 8, 82, 6, 83, 46, 84, 9, 0 </int_array>
 			<string> "variants" </string>
-			<array  len="41" shared="false">
+			<array  len="47" shared="false">
 				<vector2> 24.5187, 46.9277 </vector2>
 				<vector2> 0.391448, 0.391448 </vector2>
 				<int> 9 </int>
@@ -140,6 +143,9 @@
 				<int> 700 </int>
 				<int> 5 </int>
 				<int> 1400 </int>
+				<int> 3 </int>
+				<int> 750 </int>
+				<int> 300 </int>
 				<vector2> -630, -750 </vector2>
 				<vector2> 1.5, 1.5 </vector2>
 				<int> -600 </int>
@@ -157,10 +163,13 @@
 				<vector2> 4.72469, -144.19 </vector2>
 				<vector2> 0.186142, 0.186142 </vector2>
 				<real> 0.1 </real>
+				<resource  external="3">  </resource>
+				<vector2> 4.05904, -144.897 </vector2>
+				<vector2> 0.200238, 0.200238 </vector2>
 				<vector2> -2.72259, -152.701 </vector2>
 				<vector2> 0.854187, 0.861835 </vector2>
 				<real> 2048 </real>
-				<resource  external="3">  </resource>
+				<resource  external="4">  </resource>
 			</array>
 			<string> "version" </string>
 			<int> 2 </int>

personajes/character.xml

@@ -2,9 +2,9 @@
 <resource_file type="PackedScene" subresource_count="7" version="2.0" version_name="Godot Engine v2.0.stable.official">
 	<ext_resource path="res://sonidos/samplelibrary.res" type="SampleLibrary" index="4"></ext_resource>
 	<ext_resource path="res://scripts/player.gd" type="Script" index="0"></ext_resource>
-	<ext_resource path="res://personajes/character_sprites_indigena.xml" type="PackedScene" index="3"></ext_resource>
 	<ext_resource path="res://textures/player/gBot_head.png" type="Texture" index="1"></ext_resource>
 	<ext_resource path="res://personajes/character_sprites.xml" type="PackedScene" index="2"></ext_resource>
+	<ext_resource path="res://personajes/character_sprites_indigena.xml" type="PackedScene" index="3"></ext_resource>
 	<resource type="CapsuleShape2D" path="local://1">
 		<real name="custom_solver_bias"> 0 </real>
 		<real name="radius"> 44.528008 </real>
@@ -16,12 +16,12 @@
 			<string> "conn_count" </string>
 			<int> 1 </int>
 			<string> "conns" </string>
-			<int_array  len="6"> 				0, 0, 84, 83, 2, 0 </int_array>
+			<int_array  len="6"> 				0, 0, 87, 86, 2, 0 </int_array>
 			<string> "editable_instances" </string>
 			<array  len="0" shared="false">
 			</array>
 			<string> "names" </string>
-			<string_array  len="85">
+			<string_array  len="88">
 				<string> "player" </string>
 				<string> "transform/pos" </string>
 				<string> "transform/scale" </string>
@@ -55,8 +55,11 @@
 				<string> "air_acceleration" </string>
 				<string> "extra_gravity" </string>
 				<string> "offset_x_velocidad" </string>
+				<string> "offset_y_velocidad" </string>
 				<string> "offset_y_up_limite" </string>
 				<string> "offset_y_down_limite" </string>
+				<string> "offset_y_down_limite2" </string>
+				<string> "offset_x_limite_ave" </string>
 				<string> "RigidBody2D" </string>
 				<string> "Camera2D" </string>
 				<string> "offset" </string>
@@ -114,9 +117,9 @@
 			<array  len="0" shared="false">
 			</array>
 			<string> "nodes" </string>
-			<int_array  len="257"> 				-1, -1, 35, 0, -1, 34, 1, 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 3, 8, 6, 9, 6, 10, 7, 11, 8, 12, 9, 13, 9, 14, 8, 15, 3, 16, 10, 17, 10, 18, 3, 19, 3, 20, 11, 21, 12, 22, 9, 23, 13, 24, 13, 25, 14, 26, 15, 27, 16, 28, 17, 29, 18, 30, 6, 31, 19, 32, 20, 33, 21, 34, 16, 0, 0, 0, 36, 36, -1, 17, 37, 22, 38, 10, 39, 3, 40, 11, 41, 23, 42, 24, 43, 25, 44, 26, 45, 19, 46, 11, 47, 11, 48, 11, 49, 27, 50, 9, 51, 8, 52, 9, 53, 28, 0, 0, 0, 54, 54, -1, 5, 1, 29, 55, 11, 56, 30, 57, 6, 58, 31, 0, 0, 0, 60, 59, -1, 0, 0, 3, 0, 64, 61, -1, 2, 62, 3, 63, 32, 0, 3, 0, 64, 65, -1, 4, 62, 3, 1, 33, 2, 34, 63, 32, 0, 3, 0, 2147483647, 66, 35, 3, 1, 36, 2, 37, 67, 38, 0, 3, 0, 2147483647, 68, 39, 3, 1, 40, 2, 41, 67, 38, 0, 0, 0, 69, 69, -1, 6, 62, 3, 1, 42, 2, 43, 70, 4, 71, 3, 72, 10, 0, 0, 0, 73, 73, -1, 8, 74, 9, 75, 8, 76, 8, 77, 44, 78, 8, 79, 6, 80, 45, 81, 9, 0, 0, 0, 73, 82, -1, 8, 74, 27, 75, 8, 76, 8, 77, 44, 78, 8, 79, 6, 80, 45, 81, 9, 0 </int_array>
+			<int_array  len="263"> 				-1, -1, 38, 0, -1, 37, 1, 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 3, 8, 6, 9, 6, 10, 7, 11, 8, 12, 9, 13, 9, 14, 8, 15, 3, 16, 10, 17, 10, 18, 3, 19, 3, 20, 11, 21, 12, 22, 9, 23, 13, 24, 13, 25, 14, 26, 15, 27, 16, 28, 17, 29, 18, 30, 6, 31, 19, 32, 20, 33, 20, 34, 21, 35, 16, 36, 22, 37, 17, 0, 0, 0, 39, 39, -1, 17, 40, 23, 41, 10, 42, 3, 43, 11, 44, 24, 45, 25, 46, 26, 47, 27, 48, 19, 49, 11, 50, 11, 51, 11, 52, 28, 53, 9, 54, 8, 55, 9, 56, 29, 0, 0, 0, 57, 57, -1, 5, 1, 30, 58, 11, 59, 31, 60, 6, 61, 32, 0, 0, 0, 63, 62, -1, 0, 0, 3, 0, 67, 64, -1, 2, 65, 3, 66, 33, 0, 3, 0, 67, 68, -1, 4, 65, 3, 1, 34, 2, 35, 66, 33, 0, 3, 0, 2147483647, 69, 36, 3, 1, 37, 2, 38, 70, 39, 0, 3, 0, 2147483647, 71, 40, 3, 1, 41, 2, 42, 70, 39, 0, 0, 0, 72, 72, -1, 6, 65, 3, 1, 43, 2, 44, 73, 4, 74, 3, 75, 10, 0, 0, 0, 76, 76, -1, 8, 77, 9, 78, 8, 79, 8, 80, 45, 81, 8, 82, 6, 83, 46, 84, 9, 0, 0, 0, 76, 85, -1, 8, 77, 28, 78, 8, 79, 8, 80, 45, 81, 8, 82, 6, 83, 46, 84, 9, 0 </int_array>
 			<string> "variants" </string>
-			<array  len="46" shared="false">
+			<array  len="47" shared="false">
 				<vector2> 24.5187, 46.9277 </vector2>
 				<vector2> 0.391448, 0.391448 </vector2>
 				<int> 9 </int>
@@ -142,6 +145,7 @@
 				<int> 1400 </int>
 				<int> 3 </int>
 				<int> 750 </int>
+				<int> 300 </int>
 				<vector2> -630, -750 </vector2>
 				<vector2> 1.5, 1.5 </vector2>
 				<int> -600 </int>

personajes/character_2.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <resource_file type="PackedScene" subresource_count="27" version="2.0" version_name="Godot Engine v2.0.stable.official">
-	<ext_resource path="res://textures/player/gBot_head_2.png" type="Texture" index="15"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_head.png" type="Texture" index="6"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_shin_r.tex" type="Texture" index="10"></ext_resource>
 	<ext_resource path="res://textures/player/gBot_foot_r.png" type="Texture" index="11"></ext_resource>
-	<ext_resource path="res://textures/player/gBot_hip.png" type="Texture" index="8"></ext_resource>
-	<ext_resource path="res://textures/player/gBot_shin_l.png" type="Texture" index="13"></ext_resource>
-	<ext_resource path="res://textures/player/gBot_arm_l.png" type="Texture" index="4"></ext_resource>
-	<ext_resource path="res://textures/player/gBot_forearm_l.png" type="Texture" index="5"></ext_resource>
-	<ext_resource path="res://textures/player/gBot_arm_r.png" type="Texture" index="2"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_forearm_l.tex" type="Texture" index="5"></ext_resource>
 	<ext_resource path="res://textures/player/gBot_head_3.png" type="Texture" index="16"></ext_resource>
-	<ext_resource path="res://textures/player/gBot_shin_r.png" type="Texture" index="10"></ext_resource>
-	<ext_resource path="res://sprite_shaders_contorno.shd" type="Shader" index="0"></ext_resource>
-	<ext_resource path="res://textures/player/gBot_forearm_r.png" type="Texture" index="3"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_foot_l.png" type="Texture" index="14"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_head_2.png" type="Texture" index="15"></ext_resource>
 	<ext_resource path="res://textures/player/gBot_body.png" type="Texture" index="1"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_arm_r.tex" type="Texture" index="2"></ext_resource>
+	<ext_resource path="res://sprite_shaders_contorno.shd" type="Shader" index="0"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_forearm_r.tex" type="Texture" index="3"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_shin_l.tex" type="Texture" index="13"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_hip.png" type="Texture" index="8"></ext_resource>
 	<ext_resource path="res://textures/player/gBot_leg_r.png" type="Texture" index="9"></ext_resource>
-	<ext_resource path="res://textures/player/gBot_head.png" type="Texture" index="6"></ext_resource>
-	<ext_resource path="res://textures/player/gorrapng.png" type="Texture" index="7"></ext_resource>
-	<ext_resource path="res://textures/player/gBot_foot_l.png" type="Texture" index="14"></ext_resource>
+	<ext_resource path="res://textures/player/gBot_arm_l.tex" type="Texture" index="4"></ext_resource>
 	<ext_resource path="res://textures/player/gBot_leg_l.png" type="Texture" index="12"></ext_resource>
+	<ext_resource path="res://textures/player/gorrapng.png" type="Texture" index="7"></ext_resource>
 	<resource type="CanvasItemMaterial" path="local://6">
 		<resource name="shader/shader" external="0">  </resource>
 		<int name="shader/shading_mode"> 0 </int>