Skip to content

Merge master into develop #5647

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
Merged
omichel merged 2 commits into from
Dec 9, 2022
Merged

Merge master into develop #5647

omichel merged 2 commits into from
Dec 9, 2022
+111 −60

Conversation

@omichel
Copy link
Member

@omichel omichel commented Dec 9, 2022 •
edited
Loading

No conflict.

omichel and others added 2 commits December 9, 2022 14:52
@omichel @ygoumaz
Fixes supervisor node python API (#5633)
1fd807c 
* Update node.py

* Update changelog-r2023.md

* clean-up

* Update changelog-r2023.md

* Fixed more references to deprecated API function

* clang-format

* Update wb_supervisor_node_enable_contact_points_tracking.m

* Update supervisor.c

* PEP8

* Update changelog-r2023.md

* Update changelog-r2023.md

* Fixed return value of field getters in case a field is not existing and moved VR functions in the supevisor.py file

* Fixed pointless argument to wb_supervisor_node_disable_contact_points_tracking

* MATLAB function

* Removed deprecation from R2023a-rev1

* More changelog information

* Fixed MATLAB generator

* webots_ros

* Update src/controller/cpp/Node.cpp

Co-authored-by: Yannick Goumaz <[email protected]>

* Removed duplicate functions

Co-authored-by: Yannick Goumaz <[email protected]>
@omichel
Manual merge
231de49
@omichel omichel added the synchronization Synchronization of branches label Dec 9, 2022
@omichel omichel added this to the R2023b milestone Dec 9, 2022
@omichel omichel self-assigned this Dec 9, 2022
@omichel omichel requested a review from a team as a code owner December 9, 2022 14:02
@omichel omichel added synchronization Synchronization of branches and removed synchronization Synchronization of branches labels Dec 9, 2022
@omichel omichel requested a review from ygoumaz December 9, 2022 14:38
@omichel omichel merged commit 83aa605 into develop Dec 9, 2022
@omichel omichel deleted the sync-merge-master-into-develop branch December 9, 2022 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ygoumaz ygoumaz ygoumaz approved these changes

Assignees

@omichel omichel

Labels

synchronization Synchronization of branches

Milestone

R2023b

Development

Successfully merging this pull request may close these issues.

3 participants

@omichel @ygoumaz