Skip to content

Commit

Permalink
Merge branch 'master' into fix/math-closest-point
Browse files Browse the repository at this point in the history
  • Loading branch information
HansRobo authored Dec 10, 2024
2 parents 9f3abdb + e6b8899 commit e4ce844
Show file tree
Hide file tree
Showing 126 changed files with 3,122 additions and 541 deletions.
84 changes: 84 additions & 0 deletions common/math/arithmetic/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,90 @@ Changelog for package arithmetic
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.0.0 (2024-12-10)
------------------
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
# Conflicts:
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
# Conflicts:
# external/concealer/include/concealer/autoware.hpp
# external/concealer/include/concealer/autoware_universe.hpp
# external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp
# external/concealer/src/autoware_universe.cpp
# external/concealer/src/field_operator_application_for_autoware_universe.cpp
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto
# Conflicts:
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski

6.3.1 (2024-12-10)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue-8-3
* Merge branch 'master' into fix/sonor-cloud-issue-8-3
* Contributors: Masaya Kataoka

6.3.0 (2024-12-10)
------------------
* Merge branch 'master' into feature/lane-change-everywhere
* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere
* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere
* Contributors: Kotaro Yoshimoto

6.2.5 (2024-12-09)
------------------
* Merge branch 'master' into fix/acc_by_slope
* Contributors: Kotaro Yoshimoto

6.2.4 (2024-12-09)
------------------
* Merge branch 'master' into refactor/speed-condition
* Merge branch 'master' into refactor/speed-condition
* Contributors: Tatsuya Yamasaki

6.2.3 (2024-12-05)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue-8-2
* Contributors: Masaya Kataoka

6.2.2 (2024-12-04)
------------------
* Merge branch 'master' into refactor/distance-condition
Expand Down
2 changes: 1 addition & 1 deletion common/math/arithmetic/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>arithmetic</name>
<version>6.2.2</version>
<version>7.0.0</version>
<description>arithmetic library for scenario_simulator_v2</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
84 changes: 84 additions & 0 deletions common/math/geometry/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,90 @@ Changelog for package geometry
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.0.0 (2024-12-10)
------------------
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
# Conflicts:
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
# Conflicts:
# external/concealer/include/concealer/autoware.hpp
# external/concealer/include/concealer/autoware_universe.hpp
# external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp
# external/concealer/src/autoware_universe.cpp
# external/concealer/src/field_operator_application_for_autoware_universe.cpp
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto
# Conflicts:
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski

6.3.1 (2024-12-10)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue-8-3
* Merge branch 'master' into fix/sonor-cloud-issue-8-3
* Contributors: Masaya Kataoka

6.3.0 (2024-12-10)
------------------
* Merge branch 'master' into feature/lane-change-everywhere
* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere
* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere
* Contributors: Kotaro Yoshimoto

6.2.5 (2024-12-09)
------------------
* Merge branch 'master' into fix/acc_by_slope
* Contributors: Kotaro Yoshimoto

6.2.4 (2024-12-09)
------------------
* Merge branch 'master' into refactor/speed-condition
* Merge branch 'master' into refactor/speed-condition
* Contributors: Tatsuya Yamasaki

6.2.3 (2024-12-05)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue-8-2
* Contributors: Masaya Kataoka

6.2.2 (2024-12-04)
------------------
* Merge branch 'master' into refactor/distance-condition
Expand Down
2 changes: 1 addition & 1 deletion common/math/geometry/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>geometry</name>
<version>6.2.2</version>
<version>7.0.0</version>
<description>geometry math library for scenario_simulator_v2 application</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
84 changes: 84 additions & 0 deletions common/scenario_simulator_exception/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,90 @@ Changelog for package scenario_simulator_exception
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.0.0 (2024-12-10)
------------------
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
# Conflicts:
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
# Conflicts:
# external/concealer/include/concealer/autoware.hpp
# external/concealer/include/concealer/autoware_universe.hpp
# external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp
# external/concealer/src/autoware_universe.cpp
# external/concealer/src/field_operator_application_for_autoware_universe.cpp
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge branch 'master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto
# Conflicts:
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support
* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski

6.3.1 (2024-12-10)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue-8-3
* Merge branch 'master' into fix/sonor-cloud-issue-8-3
* Contributors: Masaya Kataoka

6.3.0 (2024-12-10)
------------------
* Merge branch 'master' into feature/lane-change-everywhere
* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere
* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere
* Contributors: Kotaro Yoshimoto

6.2.5 (2024-12-09)
------------------
* Merge branch 'master' into fix/acc_by_slope
* Contributors: Kotaro Yoshimoto

6.2.4 (2024-12-09)
------------------
* Merge branch 'master' into refactor/speed-condition
* Merge branch 'master' into refactor/speed-condition
* Contributors: Tatsuya Yamasaki

6.2.3 (2024-12-05)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue-8-2
* Contributors: Masaya Kataoka

6.2.2 (2024-12-04)
------------------
* Merge branch 'master' into refactor/distance-condition
Expand Down
2 changes: 1 addition & 1 deletion common/scenario_simulator_exception/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_simulator_exception</name>
<version>6.2.2</version>
<version>7.0.0</version>
<description>Exception types for scenario simulator</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
Loading

0 comments on commit e4ce844

Please sign in to comment.