From 0f96b0571526f7c48a6265a53000a49d52107577 Mon Sep 17 00:00:00 2001 From: manishthani Date: Mon, 3 Jun 2019 15:26:43 +0100 Subject: [PATCH] Update content link and Windows fixes (#1698) * Updated Content link * Fixes windows compilation * Prepend static keyword for friction trigger in bp library --- .../Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp | 2 +- Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs | 2 ++ .../Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp | 2 +- Util/ContentVersions.txt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp index a30a777cf..0b9c23e9c 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp @@ -521,7 +521,7 @@ void UActorBlueprintFunctionLibrary::MakeTriggerDefinition( bool &Success, FActorDefinition &Definition) { - FillIdAndTags(Definition, TEXT("trigger"), Id); + FillIdAndTags(Definition, TEXT("static"), TEXT("trigger"), Id); AddVariationsForTrigger(Definition); Success = CheckActorDefinition(Definition); check(Success); diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs index 00aa4d332..f69c66210 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs @@ -54,7 +54,9 @@ public class Carla : ModuleRules "Json", "JsonUtilities", "Landscape", + "PhysX", "PhysXVehicles", + "PhysXVehicleLib", "Slate", "SlateCore" // ... add private dependencies that you statically link with here ... diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp index d86274421..546bb3b08 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp @@ -316,7 +316,7 @@ void ACarlaWheeledVehicle::ApplyVehiclePhysicsControl(const FVehiclePhysicsContr return; } - for (auto i = 0u; i < PhysicsWheelsNum; ++i) + for (int32 i = 0; i < PhysicsWheelsNum; ++i) { PxVehicleWheelData PWheelData = Vehicle4W->PVehicle->mWheelsSimData.getWheelData(i); diff --git a/Util/ContentVersions.txt b/Util/ContentVersions.txt index 63737a48b..95b614a28 100644 --- a/Util/ContentVersions.txt +++ b/Util/ContentVersions.txt @@ -28,4 +28,4 @@ # http://carla-assets-internal.s3.amazonaws.com/Content/PUT_FILE_ID_HERE.tar.gz 0.9.5: 20190404_c7b464a -Latest: 20190523_93bb78b +Latest: 20190529_26b47ad