Skip to content

Commit

Permalink
Merge gz-sim7 into main
Browse files Browse the repository at this point in the history
Signed-off-by: Addisu Z. Taddese <[email protected]>
  • Loading branch information
azeey committed Jun 13, 2023
2 parents 309906a + 3bde4b5 commit a9e63f6
Show file tree
Hide file tree
Showing 212 changed files with 20,739 additions and 1,339 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
examples/* @mabelzhang
src/systems/physics/* @azeey
src/systems/sensors/* @iche033
*/gui/* @jennuine
tutorials/* @mabelzhang
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: pre-commit/[email protected]
with:
Expand All @@ -25,7 +25,7 @@ jobs:
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: pre-commit/[email protected]
with:
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

#--------------------------------------
# Find gz-transport
gz_find_package(gz-transport13 REQUIRED COMPONENTS log)
gz_find_package(gz-transport13 REQUIRED COMPONENTS log parameters)
set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})

#--------------------------------------
Expand Down Expand Up @@ -134,6 +134,7 @@ gz_find_package(gz-sensors8 REQUIRED
COMPONENTS
# non-rendering
air_pressure
air_speed
altimeter
imu
force_torque
Expand Down
176 changes: 0 additions & 176 deletions COPYING

This file was deleted.

Loading

0 comments on commit a9e63f6

Please sign in to comment.