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 develop in feature-web-proto #5637

Merged
merged 6 commits into from
Dec 7, 2022
Merged

Merge develop in feature-web-proto #5637

merged 6 commits into from
Dec 7, 2022

Conversation

BenjaminDeleze
Copy link

Conflicts:

  • resources/web/wwi/nodes/WbAppearance.js
  • resources/web/wwi/nodes/WbGeometry.js
  • resources/web/wwi/nodes/WbPbrAppearance.js
  • resources/web/wwi/nodes/WbPointSet.js
  • resources/web/wwi/nodes/WbShape.js

omichel and others added 6 commits December 5, 2022 10:01
@omichel @ygoumaz
Removed useless Python installations on macOS (#5616)
6e0304d 
* Removed useless Python installations on macOS

* More simplifications

* Use Python 3.11

* Use python 3.11

Co-authored-by: Yannick Goumaz <[email protected]>
@Jean-Eudes-le-retour @omichel
Improved the bounding boxes of the nao to make them not collide (#5622)
7094276 
* Improved the bounding boxes of the nao to make them not collide

* Forgot to change version

* Improved TIBIA, forward now works

* Forward walking working

* Fixed 21 DOF wrists

* Added pull request to changelog

* Update changelog-r2023.md

Co-authored-by: Olivier Michel <[email protected]>
Merge pull request #5630 from cyberbotics/sync-master-6e0304d1c
306912b 
Merge master into develop
Cleanup webotsJs import (#5632)
d02be09
Merge pull request #5636 from cyberbotics/sync-master-d02be09b7
675eb3a 
Merge master into develop
fix conflicts
1388cf2
@BenjaminDeleze BenjaminDeleze added the synchronization Synchronization of branches label Dec 7, 2022
@BenjaminDeleze BenjaminDeleze self-assigned this Dec 7, 2022
@BenjaminDeleze BenjaminDeleze changed the title Merge develop in featurewebproto Merge develop in feature-web-proto Dec 7, 2022
@BenjaminDeleze BenjaminDeleze marked this pull request as ready for review December 7, 2022 07:24
@BenjaminDeleze BenjaminDeleze requested a review from a team as a code owner December 7, 2022 07:24
@omichel omichel requested a review from ad-daniel December 7, 2022 07:25
ad-daniel
ad-daniel approved these changes Dec 7, 2022
View reviewed changes
Copy link
Contributor

@ad-daniel ad-daniel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

@BenjaminDeleze BenjaminDeleze merged commit 15360f2 into feature-web-proto Dec 7, 2022
@BenjaminDeleze BenjaminDeleze deleted the merge-develop-in-featurewebproto branch December 7, 2022 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ad-daniel ad-daniel ad-daniel approved these changes

Assignees

@BenjaminDeleze BenjaminDeleze

Labels
synchronization Synchronization of branches
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@BenjaminDeleze @ad-daniel @omichel @Jean-Eudes-le-retour