Synchronize master and develop #152
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Merge `master` into `develop` (cyberbotics#129) * Add controllers directory to CMakeLists (cyberbotics#122) * Feature worlds using extern proto (cyberbotics#117) * adding EXTERNPROTOs to the webots_ros worlds * resolving merge conflicts * resolving merge conflicts * resolving merge conflicts * adding the EXTERNPROTOS in the webots_ros worlds * adding the EXTERNPROTOS in the webots_ros worlds * comment * Update worlds/tiago.wbt Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> * Create update_urls.py (cyberbotics#123) * Fix hard code urls (cyberbotics#124) * Hard coded URLs * Delete update_urls.py * Fixed ROS service (cyberbotics#126) * Fix import node test (cyberbotics#127) * Fixed ROS service * Removed import node from complete_test Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> Co-authored-by: carikaser <100944291+carikaser@users.noreply.github.com> Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Merge master into develop (cyberbotics#132) * Add controllers directory to CMakeLists (cyberbotics#122) * Feature worlds using extern proto (cyberbotics#117) * adding EXTERNPROTOs to the webots_ros worlds * resolving merge conflicts * resolving merge conflicts * resolving merge conflicts * adding the EXTERNPROTOS in the webots_ros worlds * adding the EXTERNPROTOS in the webots_ros worlds * comment * Update worlds/tiago.wbt Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> * Create update_urls.py (cyberbotics#123) * Fix hard code urls (cyberbotics#124) * Hard coded URLs * Delete update_urls.py * Fixed ROS service (cyberbotics#126) * Fix import node test (cyberbotics#127) * Fixed ROS service * Removed import node from complete_test * Add missing declarations (cyberbotics#130) Co-authored-by: carikaser <100944291+carikaser@users.noreply.github.com> Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com> * Update node_disable_contact_points_tracking.srv (cyberbotics#138) (cyberbotics#139) * Merge master into develop (cyberbotics#141) * Update node_disable_contact_points_tracking.srv (cyberbotics#138) * Update complete_test.cpp (cyberbotics#140) * Feature VacuumGripper device (cyberbotics#144) * Test VacuumCup API * Rename device * Fix test * Fix srv type * Update src/complete_test.cpp --------- Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update TIAGo PROTO name (cyberbotics#143) --------- Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com> Co-authored-by: carikaser <100944291+carikaser@users.noreply.github.com> Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
* Merge `master` into `develop` (cyberbotics#129) * Add controllers directory to CMakeLists (cyberbotics#122) * Feature worlds using extern proto (cyberbotics#117) * adding EXTERNPROTOs to the webots_ros worlds * resolving merge conflicts * resolving merge conflicts * resolving merge conflicts * adding the EXTERNPROTOS in the webots_ros worlds * adding the EXTERNPROTOS in the webots_ros worlds * comment * Update worlds/tiago.wbt Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> * Create update_urls.py (cyberbotics#123) * Fix hard code urls (cyberbotics#124) * Hard coded URLs * Delete update_urls.py * Fixed ROS service (cyberbotics#126) * Fix import node test (cyberbotics#127) * Fixed ROS service * Removed import node from complete_test Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> Co-authored-by: carikaser <100944291+carikaser@users.noreply.github.com> Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Merge master into develop (cyberbotics#132) * Add controllers directory to CMakeLists (cyberbotics#122) * Feature worlds using extern proto (cyberbotics#117) * adding EXTERNPROTOs to the webots_ros worlds * resolving merge conflicts * resolving merge conflicts * resolving merge conflicts * adding the EXTERNPROTOS in the webots_ros worlds * adding the EXTERNPROTOS in the webots_ros worlds * comment * Update worlds/tiago.wbt Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> * Create update_urls.py (cyberbotics#123) * Fix hard code urls (cyberbotics#124) * Hard coded URLs * Delete update_urls.py * Fixed ROS service (cyberbotics#126) * Fix import node test (cyberbotics#127) * Fixed ROS service * Removed import node from complete_test * Add missing declarations (cyberbotics#130) Co-authored-by: carikaser <100944291+carikaser@users.noreply.github.com> Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com> * Update node_disable_contact_points_tracking.srv (cyberbotics#138) (cyberbotics#139) * Merge master into develop (cyberbotics#141) * Update node_disable_contact_points_tracking.srv (cyberbotics#138) * Update complete_test.cpp (cyberbotics#140) * Update world file version * Update project files * Update robot window * Fix world --------- Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com> Co-authored-by: carikaser <100944291+carikaser@users.noreply.github.com> Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
…nto sync-master-develop
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.