Skip to content

Commit

Permalink
Merge branch 'develop' into sync-master-5fdf1edf0
Browse files Browse the repository at this point in the history
  • Loading branch information
omichel authored Feb 20, 2025
2 parents 5fdf1ed + 666aed0 commit a0824a2
Show file tree
Hide file tree
Showing 4,418 changed files with 4,436 additions and 4,436 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<key>CFBundleExecutable</key>
<string>webots</string>
<key>CFBundleGetInfoString</key>
<string>Webots R2025a, Copyright 1998-2024 Cyberbotics Ltd.</string>
<string>Webots R2025b, Copyright 1998-2024 Cyberbotics Ltd.</string>
<key>CFBundleIconFile</key>
<string>webots_icon</string>
<key>CFBundleIdentifier</key>
Expand All @@ -47,11 +47,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>R2025a</string>
<string>R2025b</string>
<key>CFBundleSignature</key>
<string>wbt </string>
<key>CFBundleVersion</key>
<string>R2025a</string>
<string>R2025b</string>
<key>LSMinimumSystemVersion</key>
<string>10.14</string>
<key>CSResourcesFileMapped</key>
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1996-2024 Cyberbotics Ltd.
# Copyright 1996-2025 Cyberbotics Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion dependencies/codesign.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python

# Copyright 1996-2024 Cyberbotics Ltd.
# Copyright 1996-2025 Cyberbotics Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/automobile/generate_vehicles_doc.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

# Copyright 1996-2024 Cyberbotics Ltd.
# Copyright 1996-2025 Cyberbotics Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/css/webots-doc.css
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ body {
.ui-icon {
display: inline-block;
background-repeat: no-repeat;
background-image: url('https://cyberbotics.com/wwi/R2025a/images/icons.svg');
background-image: url('https://cyberbotics.com/wwi/R2025b/images/icons.svg');
background-color: transparent;
border: none;
width: 34px;
Expand Down
2 changes: 1 addition & 1 deletion docs/generate_thumbnails.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

# Copyright 1996-2024 Cyberbotics Ltd.
# Copyright 1996-2025 Cyberbotics Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/index.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ <h2 id="title-content">Documentation</h2>
%{ JS }%

<script src="js/showdown-extensions.js"></script>
<script src="https://cyberbotics.com/wwi/R2025a/viewer.js" type="module"></script>
<script src="https://cyberbotics.com/wwi/R2025b/viewer.js" type="module"></script>

</body>

Expand Down
6 changes: 3 additions & 3 deletions docs/js/showdown-extensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ showdown.extension('wbVariables', function() {
var vars = {
webots: {
version: {
major: 'R2025a',
major: 'R2025b',
// full is equal to major for the first major version
// and contains the revision number for subsequent versions
full: 'R2025a',
package: 'R2025a'
full: 'R2025b',
package: 'R2025b'
}
},
date: {
Expand Down
2 changes: 1 addition & 1 deletion docs/local_exporter.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python

# Copyright 1996-2024 Cyberbotics Ltd.
# Copyright 1996-2025 Cyberbotics Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1996-2024 Cyberbotics Ltd.
# Copyright 1996-2025 Cyberbotics Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/dia/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1996-2024 Cyberbotics Ltd.
# Copyright 1996-2025 Cyberbotics Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/math/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1996-2024 Cyberbotics Ltd.
# Copyright 1996-2025 Cyberbotics Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/svg/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1996-2024 Cyberbotics Ltd.
# Copyright 1996-2025 Cyberbotics Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/tests/suite.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python

# Copyright 1996-2024 Cyberbotics Ltd.
# Copyright 1996-2025 Cyberbotics Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/accelerometer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/altimeter.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/brake.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/camera.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/camera_recognition_object.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/compass.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/connector.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/console.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/contact_point.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/device.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/display.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/distance_sensor.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/emitter.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/gps.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/gyro.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/inertial_unit.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/joystick.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/keyboard.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/led.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/lidar.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/lidar_point.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/light_sensor.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/microphone.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/motor.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/mouse.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/mouse_state.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/nodes.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/pen.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/plugins/robot_window/default.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/position_sensor.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/radar.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/radar_target.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/radio.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/range_finder.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/controller/c/webots/receiver.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1996-2024 Cyberbotics Ltd.
* Copyright 1996-2025 Cyberbotics Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit a0824a2

Please sign in to comment.