Merge branch 'ue5-dev' into marcel/windows-package-crash-fix

PythonAPI/examples/automatic_control.py

@@ -839,8 +839,8 @@ def main():
     argparser.add_argument(
         '--generation',
         metavar='G',
-        default='2',
-        help='restrict to certain actor generation (values: "1","2","All" - default: "2")')
+        default='All',
+        help='restrict to certain actor generation (values: "2","3","All" - default: "All")')
     argparser.add_argument(
         '-l', '--loop',
         action='store_true',

PythonAPI/examples/draw_skeleton.py

@@ -327,6 +327,7 @@ def main():
     ped_bp = random.choice(world.get_blueprint_library().filter("walker.pedestrian.*"))
     trans = carla.Transform()
     trans.location = world.get_random_location_from_navigation()
+    trans.location.z += 1 # Apply an offset in vertical axis to avoid collision spawning
     ped = world.spawn_actor(ped_bp, trans)
     walker_controller_bp = world.get_blueprint_library().find('controller.ai.walker')
     controller = world.spawn_actor(walker_controller_bp, carla.Transform(), ped)

PythonAPI/examples/generate_traffic.py

@@ -101,8 +101,8 @@ def main():
     argparser.add_argument(
         '--generationw',
         metavar='G',
-        default='2',
-        help='restrict to certain pedestrian generation (values: "2","3","All" - default: "2")')
+        default='All',
+        help='restrict to certain pedestrian generation (values: "2","3","All" - default: "All")')
     argparser.add_argument(
         '--tm-port',
         metavar='P',

PythonAPI/examples/manual_control.py

@@ -1330,7 +1330,7 @@ def main():
         '--generation',
         metavar='G',
         default='All',
-        help='restrict to certain actor generation (values: "1","2","3","4","All" - default: "4")')
+        help='restrict to certain actor generation (values: "2","3","All" - default: "All")')
     argparser.add_argument(
         '--rolename',
         metavar='NAME',

PythonAPI/examples/vehicle_physics.py

@@ -85,7 +85,7 @@ def main(arg):
         # Impulse/Force at the center of mass of the object
         impulse = 10 * car_mass
 
-        print("# Adding an Impulse of %f N s" % impulse)
+        print("# Adding an Impulse of {:.1f} N s".format(impulse))
         vehicle.add_impulse(carla.Vector3D(0, 0, impulse))
 
         wait(world)
@@ -93,7 +93,7 @@ def main(arg):
         vehicle.set_target_velocity(carla.Vector3D(0, 0, 0))
         wait(world)
 
-        print("# Adding a Force of %f N" % (impulse / delta))
+        print("# Adding a Force of {:.1f} N".format(impulse / delta))
         # The add_force method should not be use for instantaneous forces like this one,
         # it is more useful for constant or variable forces acting in a finite amount of time.
         # In this script it is done with the proper scaling to show the equivalence
@@ -107,8 +107,6 @@ def main(arg):
         vehicle.set_target_velocity(carla.Vector3D(0, 0, 0))
         wait(world)
 
-        wait(world, 500)
-
 
     finally:
         world.apply_settings(original_settings)
@@ -134,7 +132,7 @@ if __name__ == "__main__":
     argparser.add_argument(
         '--filter',
         metavar='PATTERN',
-        default='model3',
+        default='vehicle.*',
         help='actor filter (default: "vehicle.*")')
     args = argparser.parse_args()