Skip to content

Commit

Permalink
Merge master into develop (#3813)
Browse files Browse the repository at this point in the history
* Fix call of getkey() keyboard during robot_step for ROS and add Battery warning when it is empty (#3783)

* add changelog and copy of PR 3772

* fix changelog PR number

* Update changelog-r2021.md

* fix typo changelog

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

* Missed i (#3789)

Found a missing I in API

* Added animation example (#3796)

* Update web-interface.md

* Update web-animation.md

* Show only one layer for lidar and update cloud type message (#3795)

* init

* docs and fixes

* review adaptation

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

* fix typo (#3800)

* Update discord docs. (#3803)

Co-authored-by: DavidMansolino <DavidMansolino@github.com>

* Add Python example (#3802)

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

* Update Info.plist (#3804)

according to your documentation you require 10.14 "Mojave", but the requirements are missing from the binary

* fix openai controller (#3805)

* Update keyboard.md (#3811)

* fix Matlab constants (#3808)

* fix Matlab constants

* Update changelog-r2021.md

* Fix sources

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Fixed missing DLL and order aphabatically (#3814)

* Fix Windows packaging (#3820)

* Fix Windows packaging

* Update Makefile

Co-authored-by: BenjaminHug8 <61198898+BenjaminHug8@users.noreply.github.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: maciejlichon <66528645+maciejlichon@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DavidMansolino <DavidMansolino@github.com>
Co-authored-by: CoreCode <core-code@users.noreply.github.com>
Co-authored-by: joachimhgg <48200998+joachimhgg@users.noreply.github.com>
Co-authored-by: Justin-Fisher <jacief@yahoo.com>
  • Loading branch information
9 people committed Oct 25, 2021
1 parent 46dc401 commit a009f5a
Show file tree
Hide file tree
Showing 21 changed files with 614 additions and 159 deletions.
2 changes: 2 additions & 0 deletions Contents/Info.plist
Expand Up @@ -52,6 +52,8 @@
<string>wbt </string>
<key>CFBundleVersion</key>
<string>R2021c</string>
<key>LSMinimumSystemVersion</key>
<string>10.14</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
Expand Down
12 changes: 12 additions & 0 deletions docs/discord/development-2021.md
Expand Up @@ -2757,3 +2757,15 @@ It looks like there was some discussion of doing what `@mironix` suggests last y
##### mironix 10/13/2021 10:39:12
thanks `@Justin Fisher` i'll check this out

##### Meghana|Contributor 10/18/2021 02:44:57
Hi


Can we develop a mini game in webots which uses our hand gestures to control the game

##### rozgo 10/18/2021 19:47:55
You could use something like this: [https://handtracking.io/](https://handtracking.io/)


With some minimal websockets server in the controller.

24 changes: 24 additions & 0 deletions docs/discord/documentation.md
Expand Up @@ -2218,3 +2218,27 @@ thank you. do you have a PDF version? the PDF version link on the website is br
##### Mlungost 09/30/2021 09:10:04
thank you.

##### mironix 10/16/2021 15:36:06
hello i think i found a bug in the doc - i think this should not be AP but API
%figure
![unknown.png](https://cdn.discordapp.com/attachments/565155720933146637/898957483480084541/unknown.png)
%end

##### Olivier Michel [Cyberbotics] 10/16/2021 15:40:11
Yes, can you please propose a fix, it should easy from the page where you found the bug, by following the link:
%figure
![unknown.png](https://cdn.discordapp.com/attachments/565155720933146637/898958508203069511/unknown.png)
%end


Click on "Contribute on GitHub!" link.

##### mironix 10/16/2021 15:42:07
oh ok - sorry there's so many constant prompts nowdays that i tend to miss those 🙂

##### Olivier Michel [Cyberbotics] 10/16/2021 15:42:25
No problem. Your contribution is welcome.

##### mironix 10/16/2021 15:46:03
[https://github.com/cyberbotics/webots/pull/3789](https://github.com/cyberbotics/webots/pull/3789)

3 changes: 3 additions & 0 deletions docs/discord/news.md
Expand Up @@ -4,6 +4,9 @@ This is an archive of the `news` channel of the [Webots Discord server](https://

## 2021

##### Olivier Michel [Cyberbotics] 10/20/2021 07:16:32
If you like Webots and ROS and would like to help us, please take 10 seconds and vote for me (Olivier Michel) at the ROS2 Technical Steering Committee election: [https://civs1.civs.us/cgi-bin/vote.pl?id=E\_ee3018e9881cbe49&akey=7c1cdeb3142060b4](https://civs1.civs.us/cgi-bin/vote.pl?id=E_ee3018e9881cbe49&akey=7c1cdeb3142060b4)

##### Stefania Pedrazzi [Cyberbotics] 10/12/2021 07:47:51
We just published the presentation held at the IROS2021 Workshop "Open Deep Learning Toolkit for Robotics: Towards Democratizing Artificial Intelligence" workshop!"

Expand Down
8 changes: 4 additions & 4 deletions docs/discord/technical-questions-2020.md
Expand Up @@ -47970,7 +47970,7 @@ This is my code now. It just can move forward or backwards but I can't understan
##### Justin Fisher [Moderator] 12/15/2020 13:23:59
`@Steven37` Within your loop you keep telling all your wheels to run the same speed, so of course it doesn't turn. If you want it to turn, you'll need to tell some to run at different speeds, like you do for a single timestep before entering this loop.

##### IAO 12/15/2020 13:29:25
##### Ismail\_ALI\_OMAR 12/15/2020 13:29:25
Hi I want to create a new Webot account to use Webots 8.0.2, please help me

##### Steven37 12/15/2020 13:31:57
Expand All @@ -47979,7 +47979,7 @@ I have time delay so I think it will turn first before entering the loop. Howeve
##### Olivier Michel [Cyberbotics] 12/15/2020 15:48:28
Webots 8.0.2 is not supported any more. This is not possible. You should use Webots R2021a instead.

##### IAO 12/15/2020 15:49:43
##### Ismail\_ALI\_OMAR 12/15/2020 15:49:43
Olivier Michel thanks

##### mayank.kishore 12/15/2020 20:13:05
Expand All @@ -47988,7 +47988,7 @@ Has anyone experimented with waypoint navigation? Need to develop a system that
##### MartinG 12/15/2020 20:26:54
I've been beating my head over path planning for the past week in order to make something like that.

##### IAO 12/15/2020 20:35:42
##### Ismail\_ALI\_OMAR 12/15/2020 20:35:42
So Would i be able to interface webots R2021 version with choregraphe(software to implement Nao)? please

##### mayank.kishore 12/15/2020 21:24:06
Expand Down Expand Up @@ -48016,7 +48016,7 @@ In that case, you have to develop a custom algorithm or to integrate an existing
##### Olivier Michel [Cyberbotics] 12/16/2020 07:32:02
Yes, but you have to compile the NAO interface from the source code at [https://github.com/cyberbotics/naoqisim](https://github.com/cyberbotics/naoqisim) (warning: this is unsupported software).

##### IAO 12/16/2020 07:34:05
##### Ismail\_ALI\_OMAR 12/16/2020 07:34:05
okay thank you so much

##### MartinG 12/16/2020 09:41:32
Expand Down

0 comments on commit a009f5a

Please sign in to comment.