Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into develop #6712

Merged
merged 2 commits into from
Nov 30, 2024
Merged

Merge master into develop #6712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c87f0e
Fix rollers rotating angle In "omni_wheels.wbt" sample world (#6710)
MNikoliCC Nov 29, 2024
40894f3
Merge branch 'develop' into sync-master-7c87f0e29
omichel Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/reference/changelog-r2024.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Released on December **th, 2023.
- Fixed error on macos when when putting displays and cameras in separate windows ([#6635](https://github.com/cyberbotics/webots/pull/6635)).
- Fixed crash when `wb_supervisor_field_get_name` was called with NULL ([#6647](https://github.com/cyberbotics/webots/pull/6647)).
- Fixed bug where the wrong y coordinate was used for one corner of the box drawn to represent a box-plane collision ([#6677](https://github.com/cyberbotics/webots/pull/6677)).
- Fixed bug where the rotation axis of the omni wheel rollers were incorrect ([6710](https://github.com/cyberbotics/webots/pull/6710)).
- Fixed a bug where Webots would crash if a geometry was inserted into a `Shape` node used a bounding box ([#6691](https://github.com/cyberbotics/webots/pull/6691)).
- Removed the old `wb_supervisor_field_import_sf_node` and `wb_supervisor_field_import_mf_node` functions from the list of editor autocomplete suggestions ([#6701](https://github.com/cyberbotics/webots/pull/6701)).
- Fixed handling of remote assets from unofficial sources ([#6585](https://github.com/cyberbotics/webots/pull/6585)).
Expand Down
6 changes: 6 additions & 0 deletions projects/samples/howto/omni_wheels/worlds/omni_wheels.wbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ DEF OMNI_WHEELS Robot {
children [
DEF sr1 HingeJoint {
jointParameters HingeJointParameters {
axis 0 1 0
anchor -0.02 0 0.05
}
endPoint Solid {
Expand Down Expand Up @@ -100,6 +101,7 @@ DEF OMNI_WHEELS Robot {
}
DEF sr3 HingeJoint {
jointParameters HingeJointParameters {
axis 0 1 0
anchor -0.02 0 -0.05
}
endPoint Solid {
Expand Down Expand Up @@ -306,6 +308,7 @@ DEF OMNI_WHEELS Robot {
children [
DEF sr1 HingeJoint {
jointParameters HingeJointParameters {
axis 0 1 0
anchor -0.02 0 0.05
}
endPoint Solid {
Expand Down Expand Up @@ -343,6 +346,7 @@ DEF OMNI_WHEELS Robot {
}
DEF sr3 HingeJoint {
jointParameters HingeJointParameters {
axis 0 1 0
anchor -0.02 0 -0.05
}
endPoint Solid {
Expand Down Expand Up @@ -502,6 +506,7 @@ DEF OMNI_WHEELS Robot {
children [
DEF sr1 HingeJoint {
jointParameters HingeJointParameters {
axis 0 1 0
anchor -0.02 0 0.05
}
endPoint Solid {
Expand Down Expand Up @@ -539,6 +544,7 @@ DEF OMNI_WHEELS Robot {
}
DEF sr3 HingeJoint {
jointParameters HingeJointParameters {
axis 0 1 0
anchor -0.02 0 -0.05
}
endPoint Solid {
Expand Down
Loading