Skip to content

Commit 15fef14

Browse files
MINOR - U39P4
1 parent 7350092 commit 15fef14

File tree

96 files changed

+3044
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3044
-329
lines changed

Binaries/Win64/FSDEditor.target

+2,199-51
Large diffs are not rendered by default.
-1 Bytes
Binary file not shown.

Binaries/Win64/UE4Editor-FSD.dll

51.5 KB
Binary file not shown.
512 Bytes
Binary file not shown.

Config/DefaultEngine.ini

+126-109
Large diffs are not rendered by default.

Config/DefaultGame.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ CompanyName=Ghost Ship Games
115115
CompanyDistinguishedName=CN=Coffee Stain Publishing
116116
Homepage=www.ghostship.dk
117117
ProjectName=Deep Rock Galactic
118-
ProjectVersion=1.38.88240.0
118+
ProjectVersion=1.39.102179.0
119119
ProjectDisplayedTitle=NSLOCTEXT("", "9E5DD4E242761E0B1389EE91FCB44936", "Deep Rock Galactic")
120120
ProjectDebugTitleInfo=
121121
bShouldWindowPreserveAspectRatio=False

Config/DefaultGameplayTags.ini

+6-1
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@ NetIndexFirstBitSegment=16
2020
+GameplayTagList=(Tag="AI.Drone.Response.AttackOnOrder",DevComment="")
2121
+GameplayTagList=(Tag="AI.Drone.Response.AttackOnSight",DevComment="")
2222
+GameplayTagList=(Tag="AI.Drone.Response.Defend",DevComment="")
23+
+GameplayTagList=(Tag="AI.Drone.Response.NoEngage",DevComment="")
2324
+GameplayTagList=(Tag="AI.Drone.Response.Use",DevComment="")
2425
+GameplayTagList=(Tag="Attitude",DevComment="")
2526
+GameplayTagList=(Tag="Attitude.Friendly",DevComment="")
2627
+GameplayTagList=(Tag="Attitude.Hostile",DevComment="")
2728
+GameplayTagList=(Tag="Attitude.Neutral",DevComment="")
2829
+GameplayTagList=(Tag="Creatures",DevComment="")
30+
+GameplayTagList=(Tag="Creatures.CoreSpawn.Crawler",DevComment="")
2931
+GameplayTagList=(Tag="Creatures.Glyphids",DevComment="")
3032
+GameplayTagList=(Tag="Creatures.Glyphids.Buffer",DevComment="")
33+
+GameplayTagList=(Tag="Creatures.Glyphids.Exploder",DevComment="")
3134
+GameplayTagList=(Tag="Creatures.Glyphids.Grunt",DevComment="")
3235
+GameplayTagList=(Tag="Creatures.Glyphids.Swarmer",DevComment="")
3336
+GameplayTagList=(Tag="Creatures.Glyphids.Tank",DevComment="")
@@ -43,6 +46,7 @@ NetIndexFirstBitSegment=16
4346
+GameplayTagList=(Tag="Creatures.Plants.CaveUrchin",DevComment="")
4447
+GameplayTagList=(Tag="Creatures.Plants.Weed.Core",DevComment="")
4548
+GameplayTagList=(Tag="Drone.Attack",DevComment="")
49+
+GameplayTagList=(Tag="Drone.Melee",DevComment="")
4650
+GameplayTagList=(Tag="Drone.Vacuum",DevComment="")
4751
+GameplayTagList=(Tag="Enemy.Type.Critical",DevComment="")
4852
+GameplayTagList=(Tag="Enemy.Type.Critter",DevComment="")
@@ -72,8 +76,9 @@ NetIndexFirstBitSegment=16
7276
+GameplayTagList=(Tag="Rooms.Linear.TraversalChallenge",DevComment="")
7377
+GameplayTagList=(Tag="Rooms.Linear.Vertical",DevComment="")
7478
+GameplayTagList=(Tag="Rooms.MotherLode",DevComment="")
79+
+GameplayTagList=(Tag="SurfaceProperties.MovingPlatform",DevComment="")
7580
+GameplayTagList=(Tag="SurfaceProperties.PlatformsFizzle",DevComment="")
76-
+GameplayTagList=(Tag="SurfaceProperties.SentryGunNotPlaceable",DevComment="For marking actors that the sentry guns should not be placed on")
81+
+GameplayTagList=(Tag="SurfaceProperties.SentryGunPlaceable",DevComment="Any non terrain surface where sentries can be placed")
7782
+GameplayTagList=(Tag="SurfaceProperties.ZiplineNotPlaceable",DevComment="")
7883
+GameplayTagList=(Tag="TargetProperties.BasicMeleeOnly",DevComment="Can be targeted only by enemies like grunts and praetorians")
7984
+GameplayTagList=(Tag="TargetProperties.FlyingRangedOnly",DevComment="Can be targeted by flying or ranged enemies like macteras or jelly swarmers")

Config/DefaultInput.ini

+1
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.Defaul
237237
+ConsoleKeys=Tilde
238238
+ConsoleKeys
239239
+ConsoleKeys
240+
+ConsoleKeys=`
240241

241242
[/Script/FSDRawInput.RawInputSettings]
242243
#PS5 Controller
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-70.5 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Plugins/SimpleUGC/Source/SimpleUGC/Private/UGCSettings.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
#include "UGCSettings.h"
22

33
UUGCSettings::UUGCSettings() {
4-
this->slot1.AddDefaulted(3);
54
this->slot1Icon = 0;
6-
this->slot2Icon = 0;
5+
this->slot2Icon = 9;
76
this->slot3Icon = 0;
8-
this->slot4.AddDefaulted(4);
97
this->slot4Icon = 0;
10-
this->SelectedSlot = 1;
8+
this->SelectedSlot = 3;
119
}
1210

1311
bool UUGCSettings::WriteToPlainText(const FString& Filename, const FString& TextContent, FText& OutError, bool Append) {

Source/FSD/FSD.Build.cs

+3-12
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,24 @@ public FSD(ReadOnlyTargetRules Target) : base(Target) {
99
PublicDependencyModuleNames.AddRange(new string[] {
1010
"AIModule",
1111
"AnimGraphRuntime",
12-
"AnimationCore",
1312
"AnimationSharing",
14-
"AudioMixer",
15-
"Chaos",
13+
"AudioMixer",
1614
"Core",
1715
"CoreUObject",
1816
"DLSSBlueprint",
1917
"DSTelemetry",
2018
"DeveloperSettings",
2119
"Engine",
2220
"FSDEngine",
21+
"GameplayTasks",
2322
"GameplayTags",
24-
"GameplayTasks",
2523
"InputCore",
2624
"LevelSequence",
2725
"MediaAssets",
28-
"MediaUtils",
29-
"MovieScene",
30-
"MovieSceneTracks",
31-
"NavigationSystem",
26+
"OnlineSubsystem",
3227
"Niagara",
33-
"NiagaraCore",
34-
"NiagaraShader",
35-
"OnlineSubsystem",
3628
"OnlineSubsystemUtils",
3729
"PhysicsCore",
38-
"PropertyPath",
3930
"Slate",
4031
"SlateCore",
4132
"UMG",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include "BTService_CheckIsFloating.h"
2+
3+
UBTService_CheckIsFloating::UBTService_CheckIsFloating() {
4+
this->MinDistanceToTerrain = 0.00f;
5+
}
6+
7+

Source/FSD/Private/Bomber.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ ABomber::ABomber(const FObjectInitializer& ObjectInitializer) : Super(ObjectInit
2828
this->IsLeftDestroyed = false;
2929
this->dropAcid = false;
3030
this->NoDeathSpiral = false;
31+
this->AcidEmitterRight->SetupAttachment(Mesh);
3132
this->GooSoundComponent->SetupAttachment(Mesh);
3233
this->AcidEmitterLeft->SetupAttachment(Mesh);
33-
this->AcidEmitterRight->SetupAttachment(Mesh);
3434
}
3535

3636
void ABomber::StopSpinAndDie() {
+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#include "ButtonUserWidget.h"
2+
3+
UButtonUserWidget::UButtonUserWidget() : UUserWidget(FObjectInitializer::Get()) {
4+
}
5+
6+
void UButtonUserWidget::InnerButtonUnhovered() {
7+
}
8+
9+
void UButtonUserWidget::InnerButtonHovered() {
10+
}
11+
12+
UWidget* UButtonUserWidget::InnerButtonGetToolTip() {
13+
return NULL;
14+
}
15+
16+
void UButtonUserWidget::InnerButtonClicked() {
17+
}
18+
19+
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#include "ClusterbombSpawner.h"
2+
3+
UClusterbombSpawner::UClusterbombSpawner(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) {
4+
this->ClusterbombClass = NULL;
5+
this->GrenadeFragments = 0;
6+
this->VelocityInheritance = 0.00f;
7+
}
8+
9+
void UClusterbombSpawner::ReleaseCluster() {
10+
}
11+
12+

Source/FSD/Private/ConsoleOptionsInSaveGame.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ FConsoleOptionsInSaveGame::FConsoleOptionsInSaveGame() {
1717
this->bShowSubtitles = false;
1818
this->InvertMouse = false;
1919
this->PhotosensitiveMode = false;
20+
this->TinnitusProtection = false;
2021
this->OverlayIntensityScale = 0.00f;
2122
this->bHoldToSprint = false;
2223
this->bToggleLaserPointer = false;
@@ -45,6 +46,8 @@ FConsoleOptionsInSaveGame::FConsoleOptionsInSaveGame() {
4546
this->AmdFsrSharpness = 0.00f;
4647
this->AmdFsr2Sharpness = 0.00f;
4748
this->NvidiaDlssSharpness = 0.00f;
49+
this->RagdollQuality = 0;
50+
this->PreventLatejoinCharacterDuplication = false;
4851
this->FrameGenerationMode = UFSDStreamlineDLSSGMode::Off;
4952
}
5053

-15
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
#include "CrossbowElectroBeam.h"
2-
#include "Net/UnrealNetwork.h"
32

43
ACrossbowElectroBeam::ACrossbowElectroBeam(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) {
5-
this->MaxRange = 0.00f;
6-
this->Arrow0 = NULL;
7-
this->Arrow1 = NULL;
8-
}
9-
10-
void ACrossbowElectroBeam::RecalculateMovingBeam() {
11-
}
12-
13-
void ACrossbowElectroBeam::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const {
14-
Super::GetLifetimeReplicatedProps(OutLifetimeProps);
15-
16-
DOREPLIFETIME(ACrossbowElectroBeam, MaxRange);
17-
DOREPLIFETIME(ACrossbowElectroBeam, Arrow0);
18-
DOREPLIFETIME(ACrossbowElectroBeam, Arrow1);
194
}
205

216

Source/FSD/Private/DeepScanObjectiveBase.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ UDeepScanObjectiveBase::UDeepScanObjectiveBase(const FObjectInitializer& ObjectI
99
void UDeepScanObjectiveBase::OnPlayerRegistered(APlayerCharacter* Player) {
1010
}
1111

12-
void UDeepScanObjectiveBase::All_TryAddPingUIComponent_Implementation(APlayerCharacter* Player) {
13-
}
14-
1512
void UDeepScanObjectiveBase::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const {
1613
Super::GetLifetimeReplicatedProps(OutLifetimeProps);
1714

Source/FSD/Private/Drillevator.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ADrillevator::ADrillevator(const FObjectInitializer& ObjectInitializer) : Super(
99
this->State = EDrillevatorState::Deactivated;
1010
this->MovementEnabled = false;
1111
this->TargetDepth = 0.00f;
12+
this->NotifyDistFromTargetDepth = 0.00f;
1213
this->MovementSpeed = 0.00f;
1314
this->ServerDepth = 0.00f;
1415
this->HeatMaterialSlot = TEXT("HeatMaterial");
@@ -42,6 +43,7 @@ void ADrillevator::OnRep_MovementEnabled(bool OldMovementEnabled) {
4243

4344

4445

46+
4547
bool ADrillevator::IsAtTargetDepth() const {
4648
return false;
4749
}
+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#include "DrillevatorEngine.h"
2+
#include "Components/SceneComponent.h"
3+
#include "Components/SkeletalMeshComponent.h"
4+
#include "Net/UnrealNetwork.h"
5+
#include "SingleUsableComponent.h"
6+
7+
ADrillevatorEngine::ADrillevatorEngine(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) {
8+
this->RootComponent = CreateDefaultSubobject<USceneComponent>(TEXT("RootComponent"));
9+
this->State = EDrillevatorEngineState::Off;
10+
this->Health = 0.00f;
11+
this->MaxHealth = 50.00f;
12+
this->DrainRate = 2.00f;
13+
this->HealthPercent_Green = 0.60f;
14+
this->HealthPercent_Yellow = 0.25f;
15+
this->DamageLevel = -2;
16+
this->LastRepairProgress = 0.00f;
17+
this->MaintainerUsableComponent = CreateDefaultSubobject<USingleUsableComponent>(TEXT("UsableComponent"));
18+
this->EngineMeshComponent = CreateDefaultSubobject<USkeletalMeshComponent>(TEXT("EngineMeshComponent"));
19+
this->EngineMaterial = NULL;
20+
this->EngineMeshComponent->SetupAttachment(RootComponent);
21+
}
22+
23+
void ADrillevatorEngine::SetState(EDrillevatorEngineState NewState) {
24+
}
25+
26+
void ADrillevatorEngine::SetLastRepairProgress(float InProgress) {
27+
}
28+
29+
void ADrillevatorEngine::SetHealth(float InHealth) {
30+
}
31+
32+
33+
void ADrillevatorEngine::OnRep_LastRepairProgress() {
34+
}
35+
36+
void ADrillevatorEngine::OnRep_Health() {
37+
}
38+
39+
40+
void ADrillevatorEngine::EvaluateDamageLevel() {
41+
}
42+
43+
void ADrillevatorEngine::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const {
44+
Super::GetLifetimeReplicatedProps(OutLifetimeProps);
45+
46+
DOREPLIFETIME(ADrillevatorEngine, State);
47+
DOREPLIFETIME(ADrillevatorEngine, Health);
48+
DOREPLIFETIME(ADrillevatorEngine, DamageLevel);
49+
DOREPLIFETIME(ADrillevatorEngine, LastRepairProgress);
50+
}
51+
52+

Source/FSD/Private/DualAnimatedItem.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ ADualAnimatedItem::ADualAnimatedItem(const FObjectInitializer& ObjectInitializer
1515
this->TP_EquipAnimation = NULL;
1616
this->EquipDuration = 0.25f;
1717
this->CharacterAnimationSet = NULL;
18+
this->TPLMesh->SetupAttachment(RootComponent);
1819
this->FPRMesh->SetupAttachment(RootComponent);
1920
this->FPLMesh->SetupAttachment(RootComponent);
2021
this->TPRMesh->SetupAttachment(RootComponent);
21-
this->TPLMesh->SetupAttachment(RootComponent);
2222
}
2323

2424
USkeletalMeshComponent* ADualAnimatedItem::GetRItemMesh() const {

Source/FSD/Private/ElectroBeam.cpp

+8-12
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
AElectroBeam::AElectroBeam(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) {
88
this->RootComponent = CreateDefaultSubobject<UCapsuleComponent>(TEXT("collider"));
99
this->collider = (UCapsuleComponent*)RootComponent;
10+
this->SourceComponent = NULL;
11+
this->TargetComponent = NULL;
1012
this->DelaySource = NULL;
1113
this->DelayTarget = NULL;
1214
this->BeamEffect = CreateDefaultSubobject<UParticleSystemComponent>(TEXT("BeamEffect"));
@@ -21,10 +23,10 @@ AElectroBeam::AElectroBeam(const FObjectInitializer& ObjectInitializer) : Super(
2123
this->ZappSound->SetupAttachment(RootComponent);
2224
}
2325

24-
void AElectroBeam::SetTarget(USceneComponent* TargetPoint) {
26+
void AElectroBeam::SetTargetComponent(USceneComponent* TargetPoint) {
2527
}
2628

27-
void AElectroBeam::SetSource(USceneComponent* SourcePoint) {
29+
void AElectroBeam::SetSourceComponent(USceneComponent* SourcePoint) {
2830
}
2931

3032
void AElectroBeam::SetParents(AActor* firstParent, AActor* secondParent) {
@@ -33,10 +35,10 @@ void AElectroBeam::SetParents(AActor* firstParent, AActor* secondParent) {
3335
void AElectroBeam::RecalculateBeam() {
3436
}
3537

36-
void AElectroBeam::OnRep_TargetLocation() {
38+
void AElectroBeam::OnRep_TargetComponent() {
3739
}
3840

39-
void AElectroBeam::OnRep_SourceLocation() {
41+
void AElectroBeam::OnRep_SourceComponent() {
4042
}
4143

4244
void AElectroBeam::OnRep_Flag() {
@@ -57,20 +59,14 @@ UAudioComponent* AElectroBeam::GetAudio() {
5759
return NULL;
5860
}
5961

60-
void AElectroBeam::DelayedSetTarget(USceneComponent* TargetPoint) {
61-
}
62-
63-
void AElectroBeam::DelayedSetSource(USceneComponent* SourcePoint) {
64-
}
65-
6662
void AElectroBeam::DeactivateCollisionAndEffect() {
6763
}
6864

6965
void AElectroBeam::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const {
7066
Super::GetLifetimeReplicatedProps(OutLifetimeProps);
7167

72-
DOREPLIFETIME(AElectroBeam, SourceLocation);
73-
DOREPLIFETIME(AElectroBeam, TargetLocation);
68+
DOREPLIFETIME(AElectroBeam, SourceComponent);
69+
DOREPLIFETIME(AElectroBeam, TargetComponent);
7470
DOREPLIFETIME(AElectroBeam, IsLit);
7571
}
7672

Source/FSD/Private/FSDCheatManager.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ void UFSDCheatManager::Cheat_Schematic_ResetAll(UObject* WorldContextObject) {
183183
void UFSDCheatManager::Cheat_Schematic_GiveRandom(UObject* WorldContextObject) {
184184
}
185185

186+
void UFSDCheatManager::Cheat_Schematic_ForgeAll_Owned(UObject* WorldContextObject) {
187+
}
188+
186189
void UFSDCheatManager::Cheat_Schematic_ForgeAll(UObject* WorldContextObject) {
187190
}
188191

@@ -462,6 +465,9 @@ void UFSDCheatManager::C_Schematics_UnlockAll() {
462465
void UFSDCheatManager::C_Schematics_ResetAll() {
463466
}
464467

468+
void UFSDCheatManager::C_Schematics_ForgeAll_Owned() {
469+
}
470+
465471
void UFSDCheatManager::C_Schematics_ForgeAll() {
466472
}
467473

@@ -534,6 +540,12 @@ void UFSDCheatManager::C_RemovePlayerRanks(int32 Number) {
534540
void UFSDCheatManager::C_RemoveAllWidgets() {
535541
}
536542

543+
void UFSDCheatManager::C_Remove_WeaponSkinsFromCrate_Framwork() {
544+
}
545+
546+
void UFSDCheatManager::C_Remove_VictoryPose() {
547+
}
548+
537549
void UFSDCheatManager::C_RefreshDailyDeal(int32 Seed) {
538550
}
539551

0 commit comments

Comments
 (0)