Skip to content

Commit cf35cc7

Browse files
omichelomichel
authored
Merge branch 'develop' into sync-master-3e6ea7760
2 parents 3e6ea77 + 9ccb174 commit cf35cc7

File tree

4,422 files changed

+4519
-4443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,422 files changed

+4519
-4443
lines changed

‎Contents/Info.plist‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<key>CFBundleExecutable</key>
3636
<string>webots</string>
3737
<key>CFBundleGetInfoString</key>
38-
<string>Webots R2025a, Copyright 1998-2024 Cyberbotics Ltd.</string>
38+
<string>Webots R2025b, Copyright 1998-2024 Cyberbotics Ltd.</string>
3939
<key>CFBundleIconFile</key>
4040
<string>webots_icon</string>
4141
<key>CFBundleIdentifier</key>
@@ -47,11 +47,11 @@
4747
<key>CFBundlePackageType</key>
4848
<string>APPL</string>
4949
<key>CFBundleShortVersionString</key>
50-
<string>R2025a</string>
50+
<string>R2025b</string>
5151
<key>CFBundleSignature</key>
5252
<string>wbt </string>
5353
<key>CFBundleVersion</key>
54-
<string>R2025a</string>
54+
<string>R2025b</string>
5555
<key>LSMinimumSystemVersion</key>
5656
<string>10.14</string>
5757
<key>CSResourcesFileMapped</key>

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1996-2024 Cyberbotics Ltd.
1+
# Copyright 1996-2025 Cyberbotics Ltd.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎dependencies/codesign.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22

3-
# Copyright 1996-2024 Cyberbotics Ltd.
3+
# Copyright 1996-2025 Cyberbotics Ltd.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎docs/automobile/generate_vehicles_doc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
# Copyright 1996-2024 Cyberbotics Ltd.
4+
# Copyright 1996-2025 Cyberbotics Ltd.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎docs/css/webots-doc.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ body {
601601
.ui-icon {
602602
display: inline-block;
603603
background-repeat: no-repeat;
604-
background-image: url('https://cyberbotics.com/wwi/R2025a/images/icons.svg');
604+
background-image: url('https://cyberbotics.com/wwi/R2025b/images/icons.svg');
605605
background-color: transparent;
606606
border: none;
607607
width: 34px;

‎docs/generate_thumbnails.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
# Copyright 1996-2024 Cyberbotics Ltd.
4+
# Copyright 1996-2025 Cyberbotics Ltd.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎docs/index.template.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h2 id="title-content">Documentation</h2>
4242
%{ JS }%
4343

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

4747
</body>
4848

‎docs/js/showdown-extensions.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ showdown.extension('wbVariables', function() {
3131
var vars = {
3232
webots: {
3333
version: {
34-
major: 'R2025a',
34+
major: 'R2025b',
3535
// full is equal to major for the first major version
3636
// and contains the revision number for subsequent versions
37-
full: 'R2025a',
38-
package: 'R2025a'
37+
full: 'R2025b',
38+
package: 'R2025b'
3939
}
4040
},
4141
date: {

‎docs/local_exporter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22

3-
# Copyright 1996-2024 Cyberbotics Ltd.
3+
# Copyright 1996-2025 Cyberbotics Ltd.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎docs/reference/changelog-r2025.md‎

Lines changed: 3 additions & 0 deletions

0 commit comments

Comments
 (0)