Skip to content

Commit

Permalink
Update to 4.16
Browse files Browse the repository at this point in the history
  • Loading branch information
kamrann committed Jun 13, 2017
1 parent bafe152 commit b35dd33
Show file tree
Hide file tree
Showing 17 changed files with 77 additions and 42 deletions.
41 changes: 41 additions & 0 deletions Config/DefaultEngine.ini
Expand Up @@ -12,3 +12,44 @@ GameDefaultMap=/Game/Articles/A1_GatherSubclasses/A1_Map.A1_Map

[/Script/Engine.Engine]
+ActiveClassRedirects=(OldClassName="Article1_GatherSubclasses",NewClassName="/Script/A1_GatherSubclasses.A1_GatherSubclasses")

[/Script/Engine.PhysicsSettings]
DefaultGravityZ=-980.000000
DefaultTerminalVelocity=4000.000000
DefaultFluidFriction=0.300000
SimulateScratchMemorySize=262144
RagdollAggregateThreshold=4
TriangleMeshTriangleMinAreaThreshold=5.000000
bEnableAsyncScene=False
bEnableShapeSharing=False
bEnablePCM=True
bEnableStabilization=False
bWarnMissingLocks=True
bEnable2DPhysics=False
LockedAxis=Invalid
DefaultDegreesOfFreedom=Full3D
BounceThresholdVelocity=200.000000
FrictionCombineMode=Average
RestitutionCombineMode=Average
MaxAngularVelocity=3600.000000
MaxDepenetrationVelocity=0.000000
ContactOffsetMultiplier=0.010000
MinContactOffset=0.000100
MaxContactOffset=1.000000
bSimulateSkeletalMeshOnDedicatedServer=True
DefaultShapeComplexity=CTF_UseSimpleAndComplex
bDefaultHasComplexCollision=True
bSuppressFaceRemapTable=False
bSupportUVFromHitResults=False
bDisableActiveActors=False
bDisableCCD=False
MaxPhysicsDeltaTime=0.033333
bSubstepping=False
bSubsteppingAsync=False
MaxSubstepDeltaTime=0.016667
MaxSubsteps=6
SyncSceneSmoothingFactor=0.000000
AsyncSceneSmoothingFactor=0.990000
InitialAverageFrameRate=0.016667


Binary file modified Content/Articles/A1_GatherSubclasses/BP_A1_GatherSubclasses.uasset
Binary file not shown.
2 changes: 1 addition & 1 deletion KantanCodeExamples.uproject
@@ -1,6 +1,6 @@
{
"FileVersion": 3,
"EngineAssociation": "4.14",
"EngineAssociation": "4.16",
"Category": "",
"Description": "",
"Modules": [
Expand Down
Expand Up @@ -4,8 +4,11 @@

public class A1_GatherSubclasses : ModuleRules
{
public A1_GatherSubclasses(TargetInfo Target)
public A1_GatherSubclasses(ReadOnlyTargetRules Target) : base(Target)
{
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
bEnforceIWYU = false;

PublicDependencyModuleNames.AddRange(new string[] {
"Core",
"CoreUObject",
Expand Down
4 changes: 3 additions & 1 deletion Source/A1_GatherSubclasses/Runtime/A1_GatherSubclasses.cpp
@@ -1,8 +1,10 @@
// Copyright 2016 Cameron Angus

#include "A1_GatherSubclassesPCH.h"
#include "A1_GatherSubclasses.h"
#include "KantanCodeExamplesCommon.h"

#include "AssetRegistryModule.h"
#include "ARFilter.h"

#if WITH_EDITOR
#include "KismetEditorUtilities.h"
Expand Down
3 changes: 2 additions & 1 deletion Source/A1_GatherSubclasses/Runtime/A1_GatherSubclasses.h
Expand Up @@ -2,7 +2,8 @@

#pragma once

#include "CoreUObject.h"
#include "Object.h"
#include "ScriptMacros.h"
#include "A1_GatherSubclasses.generated.h"


Expand Down
@@ -1,6 +1,7 @@
// Copyright 2016 Cameron Angus

#include "A1_GatherSubclassesPCH.h"
#include "ModuleManager.h"


IMPLEMENT_MODULE(FDefaultGameModuleImpl, A1_GatherSubclasses);

Expand Up @@ -4,8 +4,11 @@

public class A2_DetailsCustomizationEditor : ModuleRules
{
public A2_DetailsCustomizationEditor(TargetInfo Target)
public A2_DetailsCustomizationEditor(ReadOnlyTargetRules Target) : base(Target)
{
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
bEnforceIWYU = false;

PublicDependencyModuleNames.AddRange(new string[] {
"Core",
"CoreUObject",
Expand Down
@@ -1,6 +1,6 @@
// Copyright 2016 Cameron Angus

#include "A2_DetailsCustomizationEditorPCH.h"
#include "ModuleManager.h"
#include "PropertyEditorModule.h"
#include "A2_MyClassCustomization.h"

Expand Down
@@ -1,6 +1,5 @@
// Copyright 2016 Cameron Angus

#include "A2_DetailsCustomizationEditorPCH.h"
#include "A2_MyClassCustomization.h"
#include "A2_MyClass.h"
#include "PropertyEditing.h"
Expand Down
Expand Up @@ -4,8 +4,11 @@

public class A2_DetailsCustomization : ModuleRules
{
public A2_DetailsCustomization(TargetInfo Target)
public A2_DetailsCustomization(ReadOnlyTargetRules Target) : base(Target)
{
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
bEnforceIWYU = false;

PublicDependencyModuleNames.AddRange(new string[] {
"Core",
"CoreUObject",
Expand Down
@@ -1,6 +1,7 @@
// Copyright 2016 Cameron Angus

#include "A2_DetailsCustomizationPCH.h"
#include "ModuleManager.h"


IMPLEMENT_MODULE(FDefaultGameModuleImpl, A2_DetailsCustomization);

1 change: 1 addition & 0 deletions Source/A2_DetailsCustomization/Runtime/A2_MyClass.h
Expand Up @@ -3,6 +3,7 @@
#pragma once

#include "Object.h"
#include "ScriptMacros.h"
#include "A2_MyClass.generated.h"


Expand Down
5 changes: 4 additions & 1 deletion Source/Common/Runtime/KantanCodeExamplesCommon.Build.cs
Expand Up @@ -4,8 +4,11 @@

public class KantanCodeExamplesCommon : ModuleRules
{
public KantanCodeExamplesCommon(TargetInfo Target)
public KantanCodeExamplesCommon(ReadOnlyTargetRules Target): base(Target)
{
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
bEnforceIWYU = false;

PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" });
}
}
3 changes: 2 additions & 1 deletion Source/Common/Runtime/KantanCodeExamplesModule.cpp
@@ -1,6 +1,7 @@
// Copyright 2016 Cameron Angus

#include "KantanCodeExamplesCommonPCH.h"
#include "KantanCodeExamplesCommon.h"


IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, KantanCodeExamplesCommon, "KantanCodeExamplesCommon" );

Expand Down
18 changes: 3 additions & 15 deletions Source/KantanCodeExamples.Target.cs
Expand Up @@ -5,28 +5,16 @@

public class KantanCodeExamplesTarget : TargetRules
{
public KantanCodeExamplesTarget(TargetInfo Target)
public KantanCodeExamplesTarget(TargetInfo Target): base(Target)
{
Type = TargetType.Game;
}

//
// TargetRules interface.
//

public override void SetupBinaries(
TargetInfo Target,
ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,
ref List<string> OutExtraModuleNames
)
{
OutExtraModuleNames.AddRange( new string[] {
ExtraModuleNames.AddRange( new string[] {
"KantanCodeExamplesCommon",

"A1_GatherSubclasses",

"A2_DetailsCustomization",
}
);
});
}
}
18 changes: 3 additions & 15 deletions Source/KantanCodeExamplesEditor.Target.cs
Expand Up @@ -5,29 +5,17 @@

public class KantanCodeExamplesEditorTarget : TargetRules
{
public KantanCodeExamplesEditorTarget(TargetInfo Target)
public KantanCodeExamplesEditorTarget(TargetInfo Target): base(Target)
{
Type = TargetType.Editor;
}

//
// TargetRules interface.
//

public override void SetupBinaries(
TargetInfo Target,
ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,
ref List<string> OutExtraModuleNames
)
{
OutExtraModuleNames.AddRange( new string[] {
ExtraModuleNames.AddRange( new string[] {
"KantanCodeExamplesCommon",

"A1_GatherSubclasses",

"A2_DetailsCustomization",
"A2_DetailsCustomizationEditor",
}
);
});
}
}

0 comments on commit b35dd33

Please sign in to comment.