forked from cyberbotics/webots
-
Notifications
You must be signed in to change notification settings - Fork 0
Merge master into develop #52
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
Open
github-actions
wants to merge
16
commits into
develop
Choose a base branch
from
sync-master-f355c4d33
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or 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
* fix speaker_play_sound message * update changelog * changelog clarification
…6844) * fix reload button checking in WbBuildEditor popup * update changelog * fix pointer syntax * use const-pointers where applicable
…yberbotics#6857) * set mIsBeingDeleted before emitting isBeingDestroyed * update changelog * disable debug symbols in release builds (revert unnecessary changes) * fix casts
* fix race condition * run test on all platforms * fix test message to reference correct controller * use non-snap firefox * copy previous commit to main CI script * define UBUNTU_VERSION * add sudo to scripts * use correct formatting in apt preferences * specify apt repo in command instead of preferences * debugging * clarify logic * revert firefox changes * revert test-suite change * Revert "debugging" This reverts commit eb14586. * clarify variable initializations * disable robot_window_html test in CI * reenable test on non-linux platforms * cleanup
* test matlab functions against controller headers * fix MATLAB capitalization * fix typo * print stderr on subprocess failure
* build lib files with gcc * remove references to Visual Studio * remove unneeded def files * include lib files in distribution * update the changelog * fix test step names * missing change from previous commit
) * send C_SUPERVISOR_SIMULATION_RESET when simulation is reset * reset field->last_update on reset * add test * fix WbFieldRef type * correctly set translation in world * fix string comparison * set different robot name * search for correct message type * fix assertion messages * fix initial assertion * fix test * move message id * add comment * update changelog * use WbFieldRef instead of WbFieldStruct* * formatting * use code block * remove old C_SUPERVISOR_SIMULATION_RESET definition Co-authored-by: Olivier Michel <[email protected]> * update test world header --------- Co-authored-by: Olivier Michel <[email protected]>
* add missing MATLAB functions * update changelog * remove test exclusions for the new functions
* unify existing export code * add simplified normal use case helper * cleanup existing export methods * prevent duplicate exports * add export support for resources that don't already have it * remove old url resolution code * revert extraneous WbURL changes * restore comment * use WbNode helpers in WbBackground * fix WbTrackWheel if-condition * run clang-format * update the changelog * use const reference in WbNode::exportResource * fix bad merge
* Fix PositionSensor.getMotor() Was calling the wrong function to get the associated motor. * Update changelog-r2025.md * Add PR link --------- Co-authored-by: CoolSpy3 <[email protected]> Co-authored-by: Olivier Michel <[email protected]>
* check for process failure in python version check * unify windows and linux python checks * add mac python advice to translation strings * remove unnecessary QProcess includes * import sys in 64-bit python check * fix indentation * fix crash on invalid command * Revert "remove unnecessary QProcess includes" (moved to another pr) This reverts commit 31f04ea. * try removing unusedPrivateFunction cppcheck suppression * undo if/ifdef reorder * add else comment * Revert "fix crash on invalid command" I forgot that this only becomes necessary when some other changes are added (which will come in another PR) This reverts commit 15982ce. * formatting * remove newline * update changelog * wording
* Update linux_compilation_dependencies.sh * Update linux_runtime_dependencies.sh * Update scripts/install/linux_compilation_dependencies.sh Co-authored-by: CoolSpy3 <[email protected]> * add fedora warning and port additional install scripts * remove dependence on lsb-release * fix os version check * fix libfreetype includes * fix Ubuntu 22.04 check * use non-free ffmpeg * fix Makefile UBUNTU_VERSION --------- Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: CoolSpy3 <[email protected]> Co-authored-by: CoolSpy3 <[email protected]>
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.
Synchronizes changes of master branch into develop branch.