1. 09 Jan, 2021 1 commit
    • Uwe Woessner's avatar
      Merge remote-tracking branch 'remotes/origin/servant' into hlrs · be959447
      Uwe Woessner authored
      # Conflicts:
      #	OpenPass_Source_Code/openPASS/Common/basicEvent.h
      #	OpenPass_Source_Code/openPASS/Common/collisionEvent.h
      #	OpenPass_Source_Code/openPASS/Common/commonTools.h
      #	OpenPass_Source_Code/openPASS/Common/dynamicsSignal.h
      #	OpenPass_Source_Code/openPASS/Common/globalDefinitions.h
      #	OpenPass_Source_Code/openPASS/Common/postCrashDynamic.h
      #	OpenPass_Source_Code/openPASS/Common/spawnPointDefinitions.h
      #	OpenPass_Source_Code/openPASS/Components/AgentUpdater/agentUpdaterImplementation.cpp
      #	OpenPass_Source_Code/openPASS/Components/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_CollisionPostCrash/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_CollisionPostCrash/dynamics_collisionPostCrash.cpp
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_CollisionPostCrash/dynamics_collisionPostCrashImplementation.cpp
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_CollisionPostCrash/dynamics_collisionPostCrashImplementation.h
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_RegularTwoTrack/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_RegularTwoTrack/Dynamics_RegularTwoTrack.pro
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_RegularTwoTrack/dynamics_regularTwoTrack.cpp
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_RegularTwoTrack/dynamics_regularTwoTrack.h
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_RegularTwoTrack/dynamics_regularTwoTrackGlobal.h
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_RegularTwoTrack/dynamics_regularTwoTrackImplementation.cpp
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_RegularTwoTrack/dynamics_regularTwoTrackImplementation.h
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_TrajectoryFollower/trajectoryFollowerCommonBase.cpp
      #	OpenPass_Source_Code/openPASS/Components/Dynamics_TrajectoryFollower/trajectoryFollowerImplementation.h
      #	OpenPass_Source_Code/openPASS/Components/Sensor_RecordState/sensor_recordStateImplementation.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/CoreShare/parameters.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/CoreShare/parameters.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/framework/runInstantiator.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/importer/profiles.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/importer/road.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/importer/road/roadSignal.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/importer/slaveConfigImporter.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/importer/vehicleModels.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/importer/vehicleModels.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/importer/vehicleModelsImporter.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/modelElements/agentBlueprint.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/modelElements/agentBlueprint.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/modelElements/component.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/modelElements/spawnPointNetwork.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/modelElements/spawnPointNetwork.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/modelInterface/modelBinding.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/modelInterface/modelBinding.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/observationInterface/observationBinding.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/observationInterface/observationBinding.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/spawnPointInterface/spawnPointBinding.cpp
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/spawnPointInterface/spawnPointBinding.h
      #	OpenPass_Source_Code/openPASS/CoreFramework/OpenPassSlave/worldInterface/world.h
      #	OpenPass_Source_Code/openPASS/CoreModules/Manipulator/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS/CoreModules/Manipulator/CollisionManipulator.cpp
      #	OpenPass_Source_Code/openPASS/CoreModules/Manipulator/CollisionManipulator.h
      #	OpenPass_Source_Code/openPASS/CoreModules/Manipulator/Manipulator.pro
      #	OpenPass_Source_Code/openPASS/CoreModules/Manipulator/srcCollisionPostCrash/collisionDetection_Impact_implementation.cpp
      #	OpenPass_Source_Code/openPASS/CoreModules/Manipulator/srcCollisionPostCrash/collisionDetection_Impact_implementation.h
      #	OpenPass_Source_Code/openPASS/CoreModules/Manipulator/srcCollisionPostCrash/polygon.cpp
      #	OpenPass_Source_Code/openPASS/CoreModules/Manipulator/srcCollisionPostCrash/polygon.h
      #	OpenPass_Source_Code/openPASS/CoreModules/Observation_Log/observationFileHandler.cpp
      #	OpenPass_Source_Code/openPASS/CoreModules/Observation_Log/observation_logImplementation.h
      #	OpenPass_Source_Code/openPASS/CoreModules/SpawnPoint_OSI/SpawnPoint.cpp
      #	OpenPass_Source_Code/openPASS/CoreModules/World_OSI/AgentAdapter.cpp
      #	OpenPass_Source_Code/openPASS/CoreModules/World_OSI/AgentAdapter.h
      #	OpenPass_Source_Code/openPASS/CoreModules/World_OSI/SceneryConverter.cpp
      #	OpenPass_Source_Code/openPASS/CoreModules/World_OSI/SceneryConverter.h
      #	OpenPass_Source_Code/openPASS/CoreModules/World_OSI/TrafficObjectAdapter.cpp
      #	OpenPass_Source_Code/openPASS/CoreModules/World_OSI/TrafficObjectAdapter.h
      #	OpenPass_Source_Code/openPASS/CoreModules/World_OSI/WorldImplementation.cpp
      #	OpenPass_Source_Code/openPASS/CoreModules/World_OSI/WorldImplementation.h
      #	OpenPass_Source_Code/openPASS/Interfaces/agentBlueprintInterface.h
      #	OpenPass_Source_Code/openPASS/Interfaces/agentInterface.h
      #	OpenPass_Source_Code/openPASS/Interfaces/eventInterface.h
      #	OpenPass_Source_Code/openPASS/Interfaces/parameterInterface.h
      #	OpenPass_Source_Code/openPASS/Interfaces/roadInterface/roadInterface.h
      #	OpenPass_Source_Code/openPASS/Interfaces/spawnPointInterface.h
      #	OpenPass_Source_Code/openPASS/Interfaces/spawnPointNetworkInterface.h
      #	OpenPass_Source_Code/openPASS/Interfaces/vehicleModelsInterface.h
      #	OpenPass_Source_Code/openPASS/Interfaces/worldInterface.h
      #	OpenPass_Source_Code/openPASS/OpenPass_OSI.pro
      #	OpenPass_Source_Code/openPASS_Resource/AEB/configs/VehicleModelsCatalog.xosc
      #	OpenPass_Source_Code/openPASS_Resource/StaticAgentCollision/configs/PedestrianModelsCatalog.xosc
      #	OpenPass_Source_Code/openPASS_Resource/StaticAgentCollision/configs/ProfilesCatalog.xml
      #	OpenPass_Source_Code/openPASS_Resource/StaticAgentCollision/configs/ProfilesCatalog_GUI.ui
      #	OpenPass_Source_Code/openPASS_Resource/StaticAgentCollision/configs/Scenario.xosc
      #	OpenPass_Source_Code/openPASS_Resource/StaticAgentCollision/configs/SceneryConfiguration.xodr
      #	OpenPass_Source_Code/openPASS_Resource/StaticAgentCollision/configs/SystemConfig.xml
      #	OpenPass_Source_Code/openPASS_Resource/StaticAgentCollision/configs/VehicleModelsCatalog.xosc
      #	OpenPass_Source_Code/openPASS_Resource/StaticAgentCollision/configs/slaveConfig.xml
      #	OpenPass_Source_Code/openPASS_Resource/StaticAgentCollision/configs/systemConfigBlueprint.xml
      #	OpenPass_Source_Code/openPASS_Resource/StaticAgentCollision/masterConfig.xml
      #	OpenPass_Source_Code/openPASS_Resource/Static_AgentProfiles/configs/VehicleModelsCatalog.xosc
      be959447
  2. 08 Jan, 2021 2 commits
  3. 02 Dec, 2020 5 commits
  4. 25 Nov, 2020 1 commit
  5. 12 Nov, 2020 1 commit
  6. 10 Nov, 2020 1 commit
  7. 02 Nov, 2020 1 commit
  8. 27 Oct, 2020 1 commit
  9. 18 Oct, 2020 2 commits
  10. 14 Oct, 2020 6 commits
  11. 08 Oct, 2020 1 commit
  12. 11 Sep, 2020 2 commits
  13. 04 Sep, 2020 4 commits
  14. 25 Aug, 2020 2 commits
  15. 24 Aug, 2020 1 commit
    • Dmitri Fix's avatar
      Merge remote-tracking branch 'remotes/origin/itk' into hlrs · 82aeaf90
      Dmitri Fix authored
      # Conflicts (solved by taking "itk" branch):
      #	OpenPass_Source_Code/openPASS_GUI/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-AgentConfiguration/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-AgentConfiguration/Views/DelegateComboBoxView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-AgentConfiguration/Views/DelegateComboBoxView.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-AgentConfiguration/Views/DelegateDoubleView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-AgentConfiguration/Views/DelegateDoubleView.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-Component/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-Project/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-Project/Models/ProjectModel.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-System/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-System/Models/SystemModel.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-System/Views/SystemComponentManagerView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Interfaces/openPASS-TrafficSimulation/EnvironmentInterface.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Interfaces/openPASS-TrafficSimulation/TrafficInterface.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/EnvironmentItemModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/EnvironmentModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/ExperimentModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/ScenarioModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficItemMapModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficItemModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficSimulationModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficSimulationXMLLoadModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficSimulationXMLSaveModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/EnvironmentDisplayPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/EnvironmentMapPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/EnvironmentPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/ExperimentPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/LibrariesPresenter.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/LibrariesPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/LoggingGroupsPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/ScenarioAgentsPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/ScenarioDisplayPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/ScenarioPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/TrafficDisplayPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/TrafficItemMapPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/TrafficPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/TrafficSimulationPresenter.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/TrafficSimulationPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Views/EnvironmentItemView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Views/TrafficItemView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Views/TrafficVolumeView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-Window/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS/openPASS.rc
      82aeaf90
  16. 10 Aug, 2020 1 commit
  17. 05 Aug, 2020 5 commits
  18. 26 Jul, 2020 1 commit
  19. 02 Jul, 2020 2 commits