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.

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

Merge released into master #2654

Merged
merged 9 commits into from
Jan 14, 2021
Merged

Conversation

stefaniapedrazzi
Copy link
Member

Conflicts:

  • docs/guide/controller-programming.md
  • docs/guide/samples-howto.md
  • docs/reference/examples.md
  • docs/reference/supervisor.md

omichel and others added 9 commits January 4, 2021 11:37
* Replaced references to master with released in documentation

* Fixed CONTRIBUTING.md
* Update the-3d-window.md

* Update webots-doc.css

* Update the-3d-window.md

* Update webots-doc.css

* Update the-3d-window.md

* Update the-3d-window.md

* Update the-3d-window.md

* Update bioloid.md

* Update samples-devices.md

* Update the-scene-tree.md

* Update tutorial-1-your-first-simulation-in-webots.md

* Update tutorial-2-modification-of-the-environment.md

* Update tutorial-2-modification-of-the-environment.md

* Update using-your-ide.md

* Update debugging-c-cpp-controllers.md

* Update matlab.md

* Update installation-procedure.md

* Update tutorial-1-your-first-simulation-in-webots.md

* Update tutorial-3-appearance.md

* Update tutorial-6-4-wheels-robot.md

* Update samples-howto.md

* Update the-3d-window.md

* Update keyboard.md

* Update docs/guide/debugging-c-cpp-controllers.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Update docs/guide/matlab.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Update docs/guide/tutorial-6-4-wheels-robot.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Update docs/guide/the-scene-tree.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Update tutorial-3-appearance.md

* Update docs/reference/keyboard.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Update docs/guide/tutorial-3-appearance.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>
* Update supervisor.md

make the addForce description more clear, especially for Python users.

* Update docs/reference/supervisor.md

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
* Added "option key on Mac" instead of Alt key

* Update tutorial-1-your-first-simulation-in-webots.md

* Update tutorial-1-your-first-simulation-in-webots.md

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
The maximum speed is 2 rad per second. The velocity is set to 10% of MAX_SPEED. Therefore the wheels should rotate at 0.2 rads / s.
@stefaniapedrazzi stefaniapedrazzi added the documentation Improve or fix the documentation (MD files only, no software development) label Jan 14, 2021
@stefaniapedrazzi stefaniapedrazzi added this to the R2021a.rev1 milestone Jan 14, 2021
@stefaniapedrazzi stefaniapedrazzi self-assigned this Jan 14, 2021
@stefaniapedrazzi stefaniapedrazzi marked this pull request as ready for review January 14, 2021 11:05
@stefaniapedrazzi stefaniapedrazzi requested a review from a team January 14, 2021 11:05
Copy link
Member

@omichel omichel 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.

@stefaniapedrazzi stefaniapedrazzi merged commit 57fe623 into master Jan 14, 2021
@stefaniapedrazzi stefaniapedrazzi deleted the merge-released-into-master branch January 14, 2021 11:52
@stefaniapedrazzi stefaniapedrazzi modified the milestones: R2021a-rev1, R2021b May 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improve or fix the documentation (MD files only, no software development)
Development

Successfully merging this pull request may close these issues.

4 participants