1. 22 Nov, 2020 1 commit
  2. 20 Nov, 2020 1 commit
    • Daniel Lehmberg's avatar
      Merge branch 'master' into generalize_source · 23268b9f
      Daniel Lehmberg authored
      # Conflicts:
      #	VadereSimulator/src/org/vadere/simulator/control/scenarioelements/SourceController.java
      #	VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java
      #	VadereSimulator/tests/org/vadere/simulator/control/TestSourceControllerUsingConstantSpawnRate.java
      23268b9f
  3. 12 Nov, 2020 2 commits
  4. 05 Nov, 2020 1 commit
  5. 04 Nov, 2020 3 commits
  6. 30 Oct, 2020 3 commits
  7. 29 Oct, 2020 4 commits
  8. 28 Oct, 2020 7 commits
  9. 27 Oct, 2020 1 commit
  10. 24 Oct, 2020 1 commit
    • Benedikt Kleinmeier's avatar
      Removed test scenario... · 039848b1
      Benedikt Kleinmeier authored
      Removed test scenario "TestPsychology/CognitionAndBehavior/scenarios/19-CounterFlow-CounterflowCognitionModel.scenario" (not necessary anymore because OSM is not used here)
      039848b1
  11. 23 Oct, 2020 4 commits
  12. 08 Oct, 2020 1 commit
  13. 29 Sep, 2020 2 commits
  14. 09 Sep, 2020 3 commits
  15. 03 Sep, 2020 1 commit
  16. 31 Aug, 2020 1 commit
  17. 28 Aug, 2020 2 commits
  18. 27 Aug, 2020 2 commits
    • Christina's avatar
      resolve merge requests · 235617e7
      Christina authored
      # Conflicts:
      #	Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario
      #	VadereSimulator/src/org/vadere/simulator/control/strategy/models/IStrategyModel.java
      #	VadereSimulator/src/org/vadere/simulator/models/strategy/ReadSetControllerInputs.java
      235617e7
    • Christina's avatar
      write strategyLayer data with data processor · c997acf3
      Christina authored
      c997acf3