• Benedikt Kleinmeier's avatar
    Merge branch 'master' into add_event_handling · 183c0de1
    Benedikt Kleinmeier authored
    # Conflicts:
    #	.gitlab-ci.yml
    #	VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java
    #	VadereSimulator/src/org/vadere/simulator/models/bhm/PedestrianBHM.java
    #	VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeEventDriven.java
    #	VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeSequential.java
    #	VadereState/src/org/vadere/state/scenario/Pedestrian.java
    #	VadereState/src/org/vadere/state/util/StateJsonConverter.java
    183c0de1