Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AirLib/include/common/AirSimSettings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ namespace airlib

Settings& settings_json = Settings::singleton();
//write some settings_json in new file otherwise the string "null" is written if all settings_json are empty
settings_json.setString("SeeDocsAt", "https://cosys-lab.github.io/settings/");
settings_json.setString("SeeDocsAt", "https://cosys-lab.github.io/Cosys-AirSim/settings/");
settings_json.setDouble("SettingsVersion", 2.0);

std::string settings_filename = Settings::getUserDirectoryFullPath("settings.json");
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* Fixed annotation names not always containing the static mesh name if available.
* Fixed `getGpsData` not working in Matlab API Client.
* Fixed `setKinematics` not working in Matlab API Client.
* Fixed build scripts on Linux and some deprecation warnings [#81 by edowson](https://github.com/Cosys-Lab/Cosys-AirSim/pull/81).
* Fixed some Python API test scripts as they were failing due to deprecated functions. [#73 by bsamadi](https://github.com/Cosys-Lab/Cosys-AirSim/pull/73).

### November/December 2024 (version 3.2)
Expand Down
2 changes: 1 addition & 1 deletion Examples/DataCollection/DataCollectorSGM_settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"SeeDocsAt": "https://cosys-lab.github.io/settings/",
"SeeDocsAt": "https://cosys-lab.github.io/Cosys-AirSim/settings/",
"SettingsVersion": 1.2,
"SimMode": "ComputerVision",
"CameraDefaults": {
Expand Down
2 changes: 1 addition & 1 deletion Examples/DepthNav/DepthNav_settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"SeeDocsAt": "https://cosys-lab.github.io/settings/",
"SeeDocsAt": "https://cosys-lab.github.io/Cosys-AirSim/settings/",
"SettingsVersion": 1.2,
"SimMode": "ComputerVision",
"CameraDefaults": {
Expand Down
Binary file modified Matlab/Cosys-AirSim Matlab API Client.mltbx
Binary file not shown.
3 changes: 1 addition & 2 deletions Matlab/Cosys-AirSim Matlab API Client.prj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<deployment-project plugin="plugin.toolbox" plugin-version="1.0">
<configuration build-checksum="3085333039" file="D:\BigProjects\Cosys-AirSim-Public\Matlab\Cosys-AirSim Matlab API Client.prj" location="D:\BigProjects\Cosys-AirSim-Public\Matlab" name="Cosys-AirSim Matlab API Client" target="target.toolbox" target-name="Package Toolbox">
<configuration build-checksum="1964184424" file="D:\BigProjects\Cosys-AirSim-Public\Matlab\Cosys-AirSim Matlab API Client.prj" location="D:\BigProjects\Cosys-AirSim-Public\Matlab" name="Cosys-AirSim Matlab API Client" target="target.toolbox" target-name="Package Toolbox">
<param.appname>Cosys-AirSim Matlab API Client</param.appname>
<param.authnamewatermark>Wouter Jansen</param.authnamewatermark>
<param.email>wouter.jansen@uantwerpen.be</param.email>
Expand Down Expand Up @@ -112,7 +112,6 @@ Do note that at this point not all functions have been tested and most function
<file>${PROJECT_ROOT}\demos.xml</file>
<file>${PROJECT_ROOT}\doc</file>
<file>${PROJECT_ROOT}\example.m</file>
<file>${PROJECT_ROOT}\example_lights.m</file>
<file>${PROJECT_ROOT}\example_twodrones.m</file>
<file>${PROJECT_ROOT}\help</file>
<file>${PROJECT_ROOT}\html</file>
Expand Down
2 changes: 1 addition & 1 deletion Matlab/example_twodrones.m
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
% This works well with the settings below:
%
% {
% "SeeDocsAt": "https://cosys-lab.github.io/settings/",
% "SeeDocsAt": "https://cosys-lab.github.io/Cosys-AirSim/settings/",
% "SettingsVersion": 2,
% "ClockSpeed": 1,
% "LocalHostIp": "127.0.0.1",
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/multirotor/multi_agent_drone.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Use below in settings.json with Blocks environment
"""
{
"SeeDocsAt": "https://cosys-lab.github.io/settings/",
"SeeDocsAt": "https://cosys-lab.github.io/Cosys-AirSim/settings/",
"SettingsVersion": 1.2,
"SimMode": "Multirotor",
"ClockSpeed": 1,
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/multirotor/sensorframe_lidar_pointcloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Sample settings.json used for this script:
'''
{
"SeeDocsAt": "https://cosys-lab.github.io/settings/",
"SeeDocsAt": "https://cosys-lab.github.io/Cosys-AirSim/settings/",
"SettingsVersion": 2.0,

"SimMode": "Multirotor",
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/multirotor/vehicleframe_lidar_pointcloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Sample settings.json used for this script:
'''
{
"SeeDocsAt": "https://cosys-lab.github.io/settings/",
"SeeDocsAt": "https://cosys-lab.github.io/Cosys-AirSim/settings/",
"SettingsVersion": 20,

"SimMode": "Multirotor",
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ requires-python = ">=3.7"

[project.urls]
Repository = "https://github.com/Cosys-Lab/Cosys-AirSim"
Documentation = "https://cosys-lab.github.io/"
Documentation = "https://cosys-lab.github.io/Cosys-AirSim/"

[tool.setuptools]
package-dir = {"" = "."}
Expand Down
2 changes: 1 addition & 1 deletion Unreal/Environments/Blocks/Config/DefaultGame.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ProjectID=367FFC384956CDC4377673B3217F380D
ProjectName="Blocks"
CompanyName=Cosys-Lab
Homepage="https://github.com/Cosys-Lab/Cosys-AirSim"
SupportContact="https://cosys-lab.github.io/"
SupportContact="https://cosys-lab.github.io/Cosys-AirSim/"
LicensingTerms=MIT Licence
ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "8F8B6B2A472F9FDFB69E2B8CFAE8C4E0", "Blocks Environment for Cosys-AirSim")
ProjectDebugTitleInfo=NSLOCTEXT("[/Script/EngineSettings]", "F31D7C524A9E9BC66DD2AA922D309408", "Blocks Environment for Cosys-AirSim")
Expand Down
4 changes: 2 additions & 2 deletions Unreal/Plugins/AirSim/AirSim.uplugin
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"Category" : "Science",
"CreatedBy": "Shital Shah",
"CreatedByURL": "http://cosys-lab.uantwerpen.be/",
"DocsURL" : "https://cosys-lab.github.io/",
"DocsURL" : "https://cosys-lab.github.io/Cosys-AirSim/",
"MarketplaceURL" : "",
"SupportURL" : "https://cosys-lab.github.io/",
"SupportURL" : "https://cosys-lab.github.io/Cosys-AirSim/",
"EnabledByDefault" : true,
"CanContainContent": true,
"IsBetaVersion" : true,
Expand Down
2 changes: 1 addition & 1 deletion Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "common/AirSimSettings.hpp"
#include "AssetRegistry/AssetData.h"
#include "common/ClockFactory.hpp"
#include "engine/Light.h"
#include "Engine/Light.h"
#include "api/ApiServerBase.hpp"
#include "api/ApiProvider.hpp"
#include "PawnSimApi.h"
Expand Down
Loading