p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update content link and Windows fixes (#1698) 

* Updated Content link
* Fixes windows compilation
* Prepend static keyword for friction trigger in bp library
This commit is contained in:
manishthani 2019-06-03 15:26:43 +01:00 committed by Néstor Subirón
parent 35fdaec670
commit 0f96b05715
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp
View File

@ -521,7 +521,7 @@ void UActorBlueprintFunctionLibrary::MakeTriggerDefinition(
bool &Success, bool &Success,
FActorDefinition &Definition) FActorDefinition &Definition)
{ {
FillIdAndTags(Definition, TEXT("trigger"), Id); FillIdAndTags(Definition, TEXT("static"), TEXT("trigger"), Id);
AddVariationsForTrigger(Definition); AddVariationsForTrigger(Definition);
Success = CheckActorDefinition(Definition); Success = CheckActorDefinition(Definition);
check(Success); check(Success);

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
View File

@ -54,7 +54,9 @@ public class Carla : ModuleRules
"Json", "Json",
"JsonUtilities", "JsonUtilities",
"Landscape", "Landscape",
"PhysX",
"PhysXVehicles", "PhysXVehicles",
"PhysXVehicleLib",
"Slate", "Slate",
"SlateCore" "SlateCore"
// ... add private dependencies that you statically link with here ... // ... add private dependencies that you statically link with here ...

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp
View File

@ -316,7 +316,7 @@ void ACarlaWheeledVehicle::ApplyVehiclePhysicsControl(const FVehiclePhysicsContr
return; return;
} }
for (auto i = 0u; i < PhysicsWheelsNum; ++i) for (int32 i = 0; i < PhysicsWheelsNum; ++i)
{ {
PxVehicleWheelData PWheelData = Vehicle4W->PVehicle->mWheelsSimData.getWheelData(i); PxVehicleWheelData PWheelData = Vehicle4W->PVehicle->mWheelsSimData.getWheelData(i);

2
Util/ContentVersions.txt
View File

@ -28,4 +28,4 @@
# http://carla-assets-internal.s3.amazonaws.com/Content/PUT_FILE_ID_HERE.tar.gz # http://carla-assets-internal.s3.amazonaws.com/Content/PUT_FILE_ID_HERE.tar.gz
0.9.5: 20190404_c7b464a 0.9.5: 20190404_c7b464a
Latest: 20190523_93bb78b Latest: 20190529_26b47ad