Merge branch 'master' into feature-hero-3

assets/levels/2.obj

@@ -73,39 +73,39 @@ f 29//16 30//16 32//16 31//16
 f 31//17 32//17 2//17 1//17
 f 1//18 3//18 5//18 7//18 9//18 11//18 13//18 15//18 17//18 19//18 21//18 23//18 25//18 27//18 29//18 31//18
 o Cube
-v -0.442124 -0.500000 -1.000000
-v -0.442124 -0.500000 1.000000
+v -0.442123 -0.500000 -1.000000
+v -0.442123 -0.500000 1.000000
 v -1.000000 -0.500000 1.000000
 v -1.000000 -0.500000 -1.000000
 v 0.035616 3.028683 -3.093358
 v 0.459703 3.028683 -2.730898
-v 0.035617 -0.500000 -3.093358
+v 0.035616 -0.500000 -3.093358
 v 0.459703 -0.500000 -2.730898
-v -0.442123 3.028683 -0.999999
-v -0.442124 3.028683 1.000001
+v -0.442123 3.028683 -1.000000
+v -0.442123 3.028683 1.000000
 v -1.000000 3.028683 -1.000000
 v -1.000000 3.028683 1.000000
 v 1.645283 3.028683 -3.690401
 v 1.645283 -0.500000 -3.690402
 v 1.440994 3.028683 -4.209528
-v 1.440995 -0.500000 -4.209527
-v 3.827186 3.028684 -3.976319
-v 3.827187 -0.499999 -3.976320
-v 3.887618 3.028684 -4.530913
-v 3.887618 -0.499999 -4.530913
+v 1.440994 -0.500000 -4.209527
+v 3.827187 3.028684 -3.976319
+v 3.827187 -0.499999 -3.976319
+v 3.887617 3.028684 -4.530913
+v 3.887619 -0.499999 -4.530913
 v 6.682775 3.028684 -4.001755
 v 6.682776 -0.499999 -4.001756
 v 6.679988 3.028684 -4.559625
-v 6.679988 -0.499999 -4.559624
+v 6.679989 -0.499999 -4.559625
 v 13.545973 3.028685 -3.998853
-v 13.545973 -0.499998 -3.998854
+v 13.545973 -0.499998 -3.998855
 v 13.543184 3.028685 -4.556724
 v 13.543185 -0.499998 -4.556723
 v 16.230053 3.028686 -2.760436
 v 16.230053 -0.499997 -2.760437
 v 16.507290 3.028686 -3.244550
 v 16.507290 -0.499997 -3.244549
-v 17.980101 3.028686 -0.781774
+v 17.980101 3.028686 -0.781775
 v 17.980101 -0.499997 -0.781775
 v 18.411112 3.028686 -1.135972
 v 18.411112 -0.499997 -1.135971
@@ -129,22 +129,54 @@ v 33.344460 2.963631 15.051935
 v 33.325962 -0.564995 15.043987
 v 33.808910 2.961892 14.742889
 v 33.790413 -0.566734 14.734942
-v -0.442124 -0.842891 -1.000000
+v -0.442123 -0.842891 -1.000000
 v -1.000000 -0.842891 -1.000000
 v 0.459703 -0.839636 -2.730898
-v 0.035617 -0.839636 -3.093358
+v 0.035616 -0.839636 -3.093358
 v 1.767750 -0.500000 1.541167
-v -0.442124 -0.846145 1.000000
-v 1.767750 -0.500000 -0.458833
-v -1.000000 -0.846145 1.000000
-v 2.669576 -0.500000 -2.189732
-v 1.767750 -0.842891 -0.458833
-v 2.669576 -0.839636 -2.189732
-v 1.767750 -0.846145 1.541167
+v -0.442123 -0.846144 1.000000
+v 1.767750 -0.500000 -0.458834
+v -1.000000 -0.846144 1.000000
+v 2.669577 -0.500000 -2.189732
+v 1.767750 -0.842891 -0.458834
+v 2.669577 -0.839636 -2.189732
+v 1.767750 -0.846144 1.541167
+v 27.463531 -0.494920 13.305507
+v 27.463531 3.099848 13.305507
+v 27.990839 -0.459699 12.931167
+v 27.990839 3.135069 12.931167
+v 33.526730 -0.494920 23.492260
+v 33.526730 3.099848 23.492260
+v 34.054035 -0.459699 23.117918
+v 34.054035 3.135069 23.117918
+v 35.559315 0.415305 19.392246
+v 35.559315 4.010073 19.392246
+v 36.086620 0.415305 19.017906
+v 36.086620 4.010073 19.017906
+v 38.816082 0.415305 28.086817
+v 38.816082 4.010073 28.086817
+v 39.343388 0.415305 27.712475
+v 39.343388 4.010073 27.712475
+v 33.959831 1.560369 26.989784
+v 33.959831 5.155138 26.989784
+v 34.487137 1.560369 26.615444
+v 34.487137 5.155138 26.615444
+v 35.857040 1.560369 35.684357
+v 35.857040 5.155138 35.684357
+v 36.384346 1.560369 35.310013
+v 36.384346 5.155138 35.310013
+v 39.078175 2.449099 32.907867
+v 39.078175 6.043867 32.907867
+v 39.605480 2.449099 32.533524
+v 39.605480 6.043867 32.533524
+v 39.215954 2.449099 40.322853
+v 39.215954 6.043867 40.322853
+v 39.743259 2.449099 39.948509
+v 39.743259 6.043867 39.948509
 vn 0.0004 -1.0000 -0.0017
-vn -0.0000 1.0000 -0.0000
-vn -0.8963 -0.0000 -0.4434
-vn -1.0000 -0.0000 -0.0000
+vn -0.0000 1.0000 0.0000
+vn -0.8963 0.0000 -0.4434
+vn -1.0000 0.0000 0.0000
 vn -0.0000 -0.0000 1.0000
 vn 0.6497 0.0000 -0.7602
 vn 0.8868 -0.0000 0.4621
@@ -184,6 +216,18 @@ vn 0.2379 0.0000 -0.9713
 vn 0.0000 -1.0000 -0.0016
 vn 0.0004 -1.0000 -0.0016
 vn -0.2379 0.0000 0.9713
+vn -0.5789 0.0000 -0.8154
+vn 0.8593 0.0000 -0.5115
+vn 0.5789 0.0000 0.8154
+vn -0.8593 0.0000 0.5115
+vn 0.0469 -0.9985 -0.0279
+vn -0.0469 0.9985 0.0279
+vn 0.9365 0.0000 -0.3508
+vn -0.9365 0.0000 0.3508
+vn 0.9770 0.0000 -0.2132
+vn -0.9770 0.0000 0.2132
+vn 0.9998 0.0000 -0.0186
+vn -0.9998 0.0000 0.0186
 usemtl Material
 s off
 f 89//19 91//19 99//19 98//19
@@ -253,3 +297,27 @@ f 33//20 34//20 93//20 95//20
 f 94//60 89//60 98//60 100//60
 f 34//61 94//61 100//61 93//61
 f 40//20 33//20 95//20 97//20
+f 101//62 102//62 104//62 103//62
+f 103//63 104//63 108//63 107//63
+f 107//64 108//64 106//64 105//64
+f 105//65 106//65 102//65 101//65
+f 103//66 107//66 105//66 101//66
+f 108//67 104//67 102//67 106//67
+f 109//62 110//62 112//62 111//62
+f 111//68 112//68 116//68 115//68
+f 115//64 116//64 114//64 113//64
+f 113//69 114//69 110//69 109//69
+f 111//29 115//29 113//29 109//29
+f 116//20 112//20 110//20 114//20
+f 117//62 118//62 120//62 119//62
+f 119//70 120//70 124//70 123//70
+f 123//64 124//64 122//64 121//64
+f 121//71 122//71 118//71 117//71
+f 119//29 123//29 121//29 117//29
+f 124//20 120//20 118//20 122//20
+f 125//62 126//62 128//62 127//62
+f 127//72 128//72 132//72 131//72
+f 131//64 132//64 130//64 129//64
+f 129//73 130//73 126//73 125//73
+f 127//29 131//29 129//29 125//29
+f 132//20 128//20 126//20 130//20

scenes/heroes/0.tscn

@@ -13,4 +13,8 @@ script = ExtResource( 2 )
 
 _sections_unfolded = [ "Pause", "Transform", "Visibility" ]
 
+[node name="Crosshair" parent="MasterOnly" index="0"]
+
+text = ""
+
 

scripts/heroes/0.gd

@@ -1,8 +1,8 @@
 extends "res://scripts/player.gd"
 
 const wallride_speed_necessary = 2
-const wallride_leap_height = 14
-const wallride_leap_side = 8
+const wallride_leap_height = 25
+const wallride_leap_side = 6
 const wallride_leap_build = 0.01
 
 var since_on_wall = 0