Merge branch 'master' into merge_upstream

2020-01-15 13:24:59 +01:00
parent ee9f25405e 6428ed5e5f
commit ef20f9e62c
370 changed files with 496645 additions and 22916 deletions
--- a/examples/pybullet/gym/pybullet_envs/deep_mimic/testrl.py
+++ b/examples/pybullet/gym/pybullet_envs/deep_mimic/testrl.py
@@ -37,6 +37,8 @@ def build_arg_parser(args):
  arg_parser.load_args(args)

  arg_file = arg_parser.parse_string('arg_file', '')
+  if arg_file == '':
+    arg_file = "run_humanoid3d_backflip_args.txt"
  if (arg_file != ''):
    path = pybullet_data.getDataPath() + "/args/" + arg_file
    succ = arg_parser.load_file(path)