Skip to content

Commit

Permalink
Merge pull request #212 from Panakotta00/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
Panakotta00 authored Apr 30, 2022
2 parents 872f392 + b172c96 commit 83f7c27
Show file tree
Hide file tree
Showing 25 changed files with 463 additions and 8 deletions.
Binary file modified Content/Components/MicroControlPanels/FM_EmissiveText2.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Content/Components/ModularPanel/MM_PureParametricMat.uasset
Binary file not shown.
Binary file modified Content/Schematics/MicroControlPanel.uasset
Binary file not shown.
2 changes: 1 addition & 1 deletion FicsItNetworks.uplugin
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"FileVersion": 3,
"Version": 0,
"VersionName": "0.3",
"SemVersion": "0.3.6",
"SemVersion": "0.3.7",
"FriendlyName": "FicsIt-Networks",
"Description": "Adds a computer network and programmable computers to the Game.",
"Category": "Modding",
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pipeline {
checkout scm: [
$class: 'GitSCM',
branches: [[
name: "sml-dev"
name: "auto-header-update"
]],
extensions: [[
$class: 'RelativeTargetDirectory',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ BeginProp(RBool, isSelfDriving, "Is Self Driving", "True if the vehicle is curre
Return self->IsSelfDriving();
} PropSet() {
FReflectionHelper::SetPropertyValue<UBoolProperty>(self, TEXT("mIsSelfDriving"), Val);
} EndProp()
} EndProp()
EndClass()

BeginClass(AFGWheeledVehicle, "WheeledVehicle", "Wheeled Vehicle", "The base class for all vehicles that used wheels for movement.")
Expand All @@ -1234,7 +1234,7 @@ BeginFunc(getCurrentTarget, "Get Current Target", "Returns the index of the targ
OutVal(0, RInt, index, "Index", "The index of the current target.")
Body()
AFGDrivingTargetList* List = self->GetTargetList();
index = (int64)List->FindTargetIndex(self->GetCurrentTarget());
index = (int64)List->FindTargetIndex(List->mCurrentTarget);
} EndFunc()
BeginFunc(nextTarget, "Next Target", "Sets the current target to the next target in the list.") {
Body()
Expand All @@ -1246,7 +1246,7 @@ BeginFunc(setCurrentTarget, "Set Current Target", "Sets the target with the give
AFGDrivingTargetList* List = self->GetTargetList();
AFGTargetPoint* Target = List->FindTargetByIndex(index);
if (!Target) throw FFINException("index out of range");
self->SetCurrentTarget(Target);
List->mCurrentTarget = Target;
} EndFunc()
BeginFunc(getTargetList, "Get Target List", "Returns the list of targets/path waypoints.") {
OutVal(0, RTrace<AFGDrivingTargetList>, targetList, "Target List", "The list of targets/path-waypoints.")
Expand Down
Loading

0 comments on commit 83f7c27

Please sign in to comment.