diff --git a/AirLib/include/common/AirSimSettings.hpp b/AirLib/include/common/AirSimSettings.hpp index 7aaec8ac3..a588aaf89 100644 --- a/AirLib/include/common/AirSimSettings.hpp +++ b/AirLib/include/common/AirSimSettings.hpp @@ -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"); diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fd64940e..bee313dc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/Examples/DataCollection/DataCollectorSGM_settings.json b/Examples/DataCollection/DataCollectorSGM_settings.json index 4fe9baece..83256832d 100644 --- a/Examples/DataCollection/DataCollectorSGM_settings.json +++ b/Examples/DataCollection/DataCollectorSGM_settings.json @@ -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": { diff --git a/Examples/DepthNav/DepthNav_settings.json b/Examples/DepthNav/DepthNav_settings.json index 1d4eaa2cf..16ace23af 100644 --- a/Examples/DepthNav/DepthNav_settings.json +++ b/Examples/DepthNav/DepthNav_settings.json @@ -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": { diff --git a/Matlab/Cosys-AirSim Matlab API Client.mltbx b/Matlab/Cosys-AirSim Matlab API Client.mltbx index ece90ddaa..6d69cf091 100644 Binary files a/Matlab/Cosys-AirSim Matlab API Client.mltbx and b/Matlab/Cosys-AirSim Matlab API Client.mltbx differ diff --git a/Matlab/Cosys-AirSim Matlab API Client.prj b/Matlab/Cosys-AirSim Matlab API Client.prj index fa8034e38..ceb292153 100644 --- a/Matlab/Cosys-AirSim Matlab API Client.prj +++ b/Matlab/Cosys-AirSim Matlab API Client.prj @@ -1,5 +1,5 @@ - + Cosys-AirSim Matlab API Client Wouter Jansen wouter.jansen@uantwerpen.be @@ -112,7 +112,6 @@ Do note that at this point not all functions have been tested and most function ${PROJECT_ROOT}\demos.xml ${PROJECT_ROOT}\doc ${PROJECT_ROOT}\example.m - ${PROJECT_ROOT}\example_lights.m ${PROJECT_ROOT}\example_twodrones.m ${PROJECT_ROOT}\help ${PROJECT_ROOT}\html diff --git a/Matlab/example_twodrones.m b/Matlab/example_twodrones.m index 04d9e5171..9c4d10fbf 100644 --- a/Matlab/example_twodrones.m +++ b/Matlab/example_twodrones.m @@ -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", diff --git a/PythonClient/multirotor/multi_agent_drone.py b/PythonClient/multirotor/multi_agent_drone.py index 9e61646b4..7805b209a 100644 --- a/PythonClient/multirotor/multi_agent_drone.py +++ b/PythonClient/multirotor/multi_agent_drone.py @@ -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, diff --git a/PythonClient/multirotor/sensorframe_lidar_pointcloud.py b/PythonClient/multirotor/sensorframe_lidar_pointcloud.py index 87145772f..761d0ea69 100644 --- a/PythonClient/multirotor/sensorframe_lidar_pointcloud.py +++ b/PythonClient/multirotor/sensorframe_lidar_pointcloud.py @@ -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", diff --git a/PythonClient/multirotor/vehicleframe_lidar_pointcloud.py b/PythonClient/multirotor/vehicleframe_lidar_pointcloud.py index b36bab56f..f27ba4822 100644 --- a/PythonClient/multirotor/vehicleframe_lidar_pointcloud.py +++ b/PythonClient/multirotor/vehicleframe_lidar_pointcloud.py @@ -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", diff --git a/PythonClient/pyproject.toml b/PythonClient/pyproject.toml index ee0975d6c..b2f1b61de 100644 --- a/PythonClient/pyproject.toml +++ b/PythonClient/pyproject.toml @@ -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 = {"" = "."} diff --git a/Unreal/Environments/Blocks/Config/DefaultGame.ini b/Unreal/Environments/Blocks/Config/DefaultGame.ini index 869c60aa8..d8db6b467 100644 --- a/Unreal/Environments/Blocks/Config/DefaultGame.ini +++ b/Unreal/Environments/Blocks/Config/DefaultGame.ini @@ -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") diff --git a/Unreal/Plugins/AirSim/AirSim.uplugin b/Unreal/Plugins/AirSim/AirSim.uplugin index 4eb3344cc..ae5bf2c5a 100644 --- a/Unreal/Plugins/AirSim/AirSim.uplugin +++ b/Unreal/Plugins/AirSim/AirSim.uplugin @@ -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, diff --git a/Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h b/Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h index 5c23ee5e4..a9645c35a 100644 --- a/Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h +++ b/Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h @@ -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"