1. 16 Oct, 2019 7 commits
  2. 14 Oct, 2019 2 commits
  3. 10 Oct, 2019 2 commits
  4. 08 Oct, 2019 2 commits
  5. 04 Oct, 2019 1 commit
  6. 03 Oct, 2019 2 commits
  7. 18 Sep, 2019 1 commit
  8. 17 Sep, 2019 5 commits
    • Daniel Lehmberg's avatar
      Merge branch... · 77cb5e47
      Daniel Lehmberg authored
      Merge branch '260-change-pedestrianpositionprocessor-to-use-interpolation-of-pedestrianfootstepprocessor' into 'master'
      
      Resolve "Change PedestrianPositionProcessor to use interpolation of PedestrianFootStepProcessor"
      
      Closes #263, #262, and #260
      
      See merge request !83
      77cb5e47
    • Benedikt Zoennchen's avatar
    • Daniel Lehmberg's avatar
      potential bugfix with correct times · e85918c7
      Daniel Lehmberg authored
      e85918c7
    • Daniel Lehmberg's avatar
      resolve merge conflicts · 1fa7f5ed
      Daniel Lehmberg authored
      1fa7f5ed
    • Daniel Lehmberg's avatar
      Merge remote-tracking branch 'origin/master' into... · 831a0ba3
      Daniel Lehmberg authored
      Merge remote-tracking branch 'origin/master' into 260-change-pedestrianpositionprocessor-to-use-interpolation-of-pedestrianfootstepprocessor
      
      # Conflicts:
      #	VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario
      #	VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario
      #	VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario
      #	VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
      #	VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario
      #	VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/regular_...
      831a0ba3
  9. 16 Sep, 2019 1 commit
  10. 05 Sep, 2019 7 commits
  11. 04 Sep, 2019 5 commits
  12. 03 Sep, 2019 5 commits