diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index df5537f..6b98a03 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -276,4 +276,5 @@ AsyncSceneSmoothingFactor=0.990000 InitialAverageFrameRate=0.016667 PhysXTreeRebuildRate=10 - +[/Script/Engine.Engine] ++ActiveGameNameRedirects=(OldGameName="/Script/ProjectCH", NewGameName="/Script/StarFighter") \ No newline at end of file diff --git a/Source/ProjectCH.Target.cs b/Source/ProjectCH.Target.cs deleted file mode 100644 index cf9ac2d..0000000 --- a/Source/ProjectCH.Target.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Francis Ng 2017-2018 - -using UnrealBuildTool; -using System.Collections.Generic; - -public class ProjectCHTarget : TargetRules -{ - public ProjectCHTarget(TargetInfo Target) : base(Target) - { - Type = TargetType.Game; - - ExtraModuleNames.AddRange( new string[] { "ProjectCH" } ); - } -} diff --git a/Source/ProjectCH/ProjectCH.cpp b/Source/ProjectCH/ProjectCH.cpp deleted file mode 100644 index a6afaf8..0000000 --- a/Source/ProjectCH/ProjectCH.cpp +++ /dev/null @@ -1,6 +0,0 @@ -// Francis Ng 2017-2018 - -#include "ProjectCH.h" -#include "Modules/ModuleManager.h" - -IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, ProjectCH, "ProjectCH" ); diff --git a/Source/ProjectCHEditor.Target.cs b/Source/ProjectCHEditor.Target.cs deleted file mode 100644 index 361942b..0000000 --- a/Source/ProjectCHEditor.Target.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Francis Ng 2017-2018 - -using UnrealBuildTool; -using System.Collections.Generic; - -public class ProjectCHEditorTarget : TargetRules -{ - public ProjectCHEditorTarget(TargetInfo Target) : base(Target) - { - Type = TargetType.Editor; - - ExtraModuleNames.AddRange( new string[] { "ProjectCH" } ); - } -} diff --git a/Source/StarFighter.Target.cs b/Source/StarFighter.Target.cs new file mode 100644 index 0000000..b876d75 --- /dev/null +++ b/Source/StarFighter.Target.cs @@ -0,0 +1,14 @@ +// Francis Ng 2017-2018 + +using UnrealBuildTool; +using System.Collections.Generic; + +public class StarFighterTarget : TargetRules +{ + public StarFighterTarget(TargetInfo Target) : base(Target) + { + Type = TargetType.Game; + + ExtraModuleNames.AddRange( new string[] { "StarFighter" } ); + } +} diff --git a/Source/ProjectCH/ActionLevelScriptActor.cpp b/Source/StarFighter/ActionLevelScriptActor.cpp similarity index 100% rename from Source/ProjectCH/ActionLevelScriptActor.cpp rename to Source/StarFighter/ActionLevelScriptActor.cpp diff --git a/Source/ProjectCH/ActionLevelScriptActor.h b/Source/StarFighter/ActionLevelScriptActor.h similarity index 96% rename from Source/ProjectCH/ActionLevelScriptActor.h rename to Source/StarFighter/ActionLevelScriptActor.h index b132dc6..6183739 100644 --- a/Source/ProjectCH/ActionLevelScriptActor.h +++ b/Source/StarFighter/ActionLevelScriptActor.h @@ -40,7 +40,7 @@ static const FString ContextString(TEXT("GENERAL")); /// Gameplay level class UCLASS() -class PROJECTCH_API AActionLevelScriptActor : public ALevelScriptActor +class STARFIGHTER_API AActionLevelScriptActor : public ALevelScriptActor { GENERATED_UCLASS_BODY() diff --git a/Source/ProjectCH/BossAIController.cpp b/Source/StarFighter/BossAIController.cpp similarity index 100% rename from Source/ProjectCH/BossAIController.cpp rename to Source/StarFighter/BossAIController.cpp diff --git a/Source/ProjectCH/BossAIController.h b/Source/StarFighter/BossAIController.h similarity index 97% rename from Source/ProjectCH/BossAIController.h rename to Source/StarFighter/BossAIController.h index 61139aa..05c7511 100644 --- a/Source/ProjectCH/BossAIController.h +++ b/Source/StarFighter/BossAIController.h @@ -32,7 +32,7 @@ static const FString ContextString(TEXT("GENERAL")); /// AI Controller for boss UCLASS() -class PROJECTCH_API ABossAIController : public AAIController +class STARFIGHTER_API ABossAIController : public AAIController { GENERATED_UCLASS_BODY() diff --git a/Source/ProjectCH/EnergyBurstComponent.cpp b/Source/StarFighter/EnergyBurstComponent.cpp similarity index 100% rename from Source/ProjectCH/EnergyBurstComponent.cpp rename to Source/StarFighter/EnergyBurstComponent.cpp diff --git a/Source/ProjectCH/EnergyBurstComponent.h b/Source/StarFighter/EnergyBurstComponent.h similarity index 95% rename from Source/ProjectCH/EnergyBurstComponent.h rename to Source/StarFighter/EnergyBurstComponent.h index b1a029e..2512491 100644 --- a/Source/ProjectCH/EnergyBurstComponent.h +++ b/Source/StarFighter/EnergyBurstComponent.h @@ -11,7 +11,7 @@ /// Component for firing the energy burst UCLASS( Blueprintable, ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class PROJECTCH_API UEnergyBurstComponent : public UActorComponent +class STARFIGHTER_API UEnergyBurstComponent : public UActorComponent { GENERATED_BODY() diff --git a/Source/ProjectCH/HealthComponent.cpp b/Source/StarFighter/HealthComponent.cpp similarity index 100% rename from Source/ProjectCH/HealthComponent.cpp rename to Source/StarFighter/HealthComponent.cpp diff --git a/Source/ProjectCH/HealthComponent.h b/Source/StarFighter/HealthComponent.h similarity index 97% rename from Source/ProjectCH/HealthComponent.h rename to Source/StarFighter/HealthComponent.h index 1d5d22b..0c9de27 100644 --- a/Source/ProjectCH/HealthComponent.h +++ b/Source/StarFighter/HealthComponent.h @@ -20,7 +20,7 @@ enum class EDamageLevelEnum : uint8 { /// Health component class UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class PROJECTCH_API UHealthComponent : public UActorComponent +class STARFIGHTER_API UHealthComponent : public UActorComponent { GENERATED_BODY() diff --git a/Source/ProjectCH/HelperFunctionLibrary.cpp b/Source/StarFighter/HelperFunctionLibrary.cpp similarity index 100% rename from Source/ProjectCH/HelperFunctionLibrary.cpp rename to Source/StarFighter/HelperFunctionLibrary.cpp diff --git a/Source/ProjectCH/HelperFunctionLibrary.h b/Source/StarFighter/HelperFunctionLibrary.h similarity index 96% rename from Source/ProjectCH/HelperFunctionLibrary.h rename to Source/StarFighter/HelperFunctionLibrary.h index 931c699..f3e83a5 100644 --- a/Source/ProjectCH/HelperFunctionLibrary.h +++ b/Source/StarFighter/HelperFunctionLibrary.h @@ -30,7 +30,7 @@ struct FTimeComponents { /// Helper functions class UCLASS() -class PROJECTCH_API UHelperFunctionLibrary : public UBlueprintFunctionLibrary +class STARFIGHTER_API UHelperFunctionLibrary : public UBlueprintFunctionLibrary { GENERATED_BODY() diff --git a/Source/ProjectCH/HomingMissile.cpp b/Source/StarFighter/HomingMissile.cpp similarity index 100% rename from Source/ProjectCH/HomingMissile.cpp rename to Source/StarFighter/HomingMissile.cpp diff --git a/Source/ProjectCH/HomingMissile.h b/Source/StarFighter/HomingMissile.h similarity index 93% rename from Source/ProjectCH/HomingMissile.h rename to Source/StarFighter/HomingMissile.h index bc20fe7..fbc9d86 100644 --- a/Source/ProjectCH/HomingMissile.h +++ b/Source/StarFighter/HomingMissile.h @@ -13,7 +13,7 @@ /// Homing missile base class UCLASS() -class PROJECTCH_API AHomingMissile : public AMunition +class STARFIGHTER_API AHomingMissile : public AMunition { GENERATED_BODY() diff --git a/Source/ProjectCH/LinearProjectile.cpp b/Source/StarFighter/LinearProjectile.cpp similarity index 100% rename from Source/ProjectCH/LinearProjectile.cpp rename to Source/StarFighter/LinearProjectile.cpp diff --git a/Source/ProjectCH/LinearProjectile.h b/Source/StarFighter/LinearProjectile.h similarity index 89% rename from Source/ProjectCH/LinearProjectile.h rename to Source/StarFighter/LinearProjectile.h index 0830bf3..b3e10e7 100644 --- a/Source/ProjectCH/LinearProjectile.h +++ b/Source/StarFighter/LinearProjectile.h @@ -9,7 +9,7 @@ /// Fire and forget projectile base class UCLASS() -class PROJECTCH_API ALinearProjectile : public AMunition +class STARFIGHTER_API ALinearProjectile : public AMunition { GENERATED_BODY() diff --git a/Source/ProjectCH/Munition.cpp b/Source/StarFighter/Munition.cpp similarity index 100% rename from Source/ProjectCH/Munition.cpp rename to Source/StarFighter/Munition.cpp diff --git a/Source/ProjectCH/Munition.h b/Source/StarFighter/Munition.h similarity index 96% rename from Source/ProjectCH/Munition.h rename to Source/StarFighter/Munition.h index d827d50..5e592d4 100644 --- a/Source/ProjectCH/Munition.h +++ b/Source/StarFighter/Munition.h @@ -10,7 +10,7 @@ /// Ammunition base class UCLASS() -class PROJECTCH_API AMunition : public APawn +class STARFIGHTER_API AMunition : public APawn { GENERATED_BODY() diff --git a/Source/ProjectCH/PlayerShip.cpp b/Source/StarFighter/PlayerShip.cpp similarity index 100% rename from Source/ProjectCH/PlayerShip.cpp rename to Source/StarFighter/PlayerShip.cpp diff --git a/Source/ProjectCH/PlayerShip.h b/Source/StarFighter/PlayerShip.h similarity index 95% rename from Source/ProjectCH/PlayerShip.h rename to Source/StarFighter/PlayerShip.h index 8c2f99f..7bc0b28 100644 --- a/Source/ProjectCH/PlayerShip.h +++ b/Source/StarFighter/PlayerShip.h @@ -12,7 +12,7 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FMultiplierUpdateEvent, float, Multi /// Player ship base class UCLASS() -class PROJECTCH_API APlayerShip : public AShip +class STARFIGHTER_API APlayerShip : public AShip { GENERATED_BODY() diff --git a/Source/StarFighter/ProjectCH.cpp b/Source/StarFighter/ProjectCH.cpp new file mode 100644 index 0000000..5a68e45 --- /dev/null +++ b/Source/StarFighter/ProjectCH.cpp @@ -0,0 +1,6 @@ +// Francis Ng 2017-2018 + +#include "ProjectCH.h" +#include "Modules/ModuleManager.h" + +IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, StarFighter, "StarFighter" ); diff --git a/Source/ProjectCH/ProjectCH.h b/Source/StarFighter/ProjectCH.h similarity index 100% rename from Source/ProjectCH/ProjectCH.h rename to Source/StarFighter/ProjectCH.h diff --git a/Source/ProjectCH/ProjectCHGameModeBase.cpp b/Source/StarFighter/ProjectCHGameModeBase.cpp similarity index 100% rename from Source/ProjectCH/ProjectCHGameModeBase.cpp rename to Source/StarFighter/ProjectCHGameModeBase.cpp diff --git a/Source/ProjectCH/ProjectCHGameModeBase.h b/Source/StarFighter/ProjectCHGameModeBase.h similarity index 74% rename from Source/ProjectCH/ProjectCHGameModeBase.h rename to Source/StarFighter/ProjectCHGameModeBase.h index 1b4ffb8..e3e8c87 100644 --- a/Source/ProjectCH/ProjectCHGameModeBase.h +++ b/Source/StarFighter/ProjectCHGameModeBase.h @@ -10,7 +10,7 @@ * */ UCLASS() -class PROJECTCH_API AProjectCHGameModeBase : public AGameModeBase +class STARFIGHTER_API AProjectCHGameModeBase : public AGameModeBase { GENERATED_BODY() diff --git a/Source/ProjectCH/Shield.cpp b/Source/StarFighter/Shield.cpp similarity index 100% rename from Source/ProjectCH/Shield.cpp rename to Source/StarFighter/Shield.cpp diff --git a/Source/ProjectCH/Shield.h b/Source/StarFighter/Shield.h similarity index 93% rename from Source/ProjectCH/Shield.h rename to Source/StarFighter/Shield.h index 2408fea..e48269b 100644 --- a/Source/ProjectCH/Shield.h +++ b/Source/StarFighter/Shield.h @@ -11,7 +11,7 @@ /// Energy barrier base class UCLASS() -class PROJECTCH_API AShield : public AActor +class STARFIGHTER_API AShield : public AActor { GENERATED_BODY() diff --git a/Source/ProjectCH/ShieldComponent.cpp b/Source/StarFighter/ShieldComponent.cpp similarity index 100% rename from Source/ProjectCH/ShieldComponent.cpp rename to Source/StarFighter/ShieldComponent.cpp diff --git a/Source/ProjectCH/ShieldComponent.h b/Source/StarFighter/ShieldComponent.h similarity index 95% rename from Source/ProjectCH/ShieldComponent.h rename to Source/StarFighter/ShieldComponent.h index 884932a..8bd00c3 100644 --- a/Source/ProjectCH/ShieldComponent.h +++ b/Source/StarFighter/ShieldComponent.h @@ -11,7 +11,7 @@ /// Energy barrier base component UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class PROJECTCH_API UShieldComponent : public UActorComponent +class STARFIGHTER_API UShieldComponent : public UActorComponent { GENERATED_BODY() diff --git a/Source/ProjectCH/Ship.cpp b/Source/StarFighter/Ship.cpp similarity index 100% rename from Source/ProjectCH/Ship.cpp rename to Source/StarFighter/Ship.cpp diff --git a/Source/ProjectCH/Ship.h b/Source/StarFighter/Ship.h similarity index 98% rename from Source/ProjectCH/Ship.h rename to Source/StarFighter/Ship.h index d2056d2..80c2a05 100644 --- a/Source/ProjectCH/Ship.h +++ b/Source/StarFighter/Ship.h @@ -11,7 +11,7 @@ /// Ship base class UCLASS(Blueprintable) -class PROJECTCH_API AShip : public APawn +class STARFIGHTER_API AShip : public APawn { GENERATED_BODY() diff --git a/Source/ProjectCH/ShipAIController.cpp b/Source/StarFighter/ShipAIController.cpp similarity index 100% rename from Source/ProjectCH/ShipAIController.cpp rename to Source/StarFighter/ShipAIController.cpp diff --git a/Source/ProjectCH/ShipAIController.h b/Source/StarFighter/ShipAIController.h similarity index 90% rename from Source/ProjectCH/ShipAIController.h rename to Source/StarFighter/ShipAIController.h index ee8446d..9186187 100644 --- a/Source/ProjectCH/ShipAIController.h +++ b/Source/StarFighter/ShipAIController.h @@ -12,7 +12,7 @@ /// Ship AI controller base class UCLASS() -class PROJECTCH_API AShipAIController : public AAIController +class STARFIGHTER_API AShipAIController : public AAIController { GENERATED_BODY() diff --git a/Source/ProjectCH/ShipPlayerController.cpp b/Source/StarFighter/ShipPlayerController.cpp similarity index 100% rename from Source/ProjectCH/ShipPlayerController.cpp rename to Source/StarFighter/ShipPlayerController.cpp diff --git a/Source/ProjectCH/ShipPlayerController.h b/Source/StarFighter/ShipPlayerController.h similarity index 88% rename from Source/ProjectCH/ShipPlayerController.h rename to Source/StarFighter/ShipPlayerController.h index ff5df6c..87f73bc 100644 --- a/Source/ProjectCH/ShipPlayerController.h +++ b/Source/StarFighter/ShipPlayerController.h @@ -13,7 +13,7 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE(FPawnPossessedEvent); /// Ship player controller base class UCLASS() -class PROJECTCH_API AShipPlayerController : public APlayerController +class STARFIGHTER_API AShipPlayerController : public APlayerController { GENERATED_BODY() diff --git a/Source/ProjectCH/ProjectCH.Build.cs b/Source/StarFighter/StarFighter.Build.cs similarity index 86% rename from Source/ProjectCH/ProjectCH.Build.cs rename to Source/StarFighter/StarFighter.Build.cs index a035da1..495ff57 100644 --- a/Source/ProjectCH/ProjectCH.Build.cs +++ b/Source/StarFighter/StarFighter.Build.cs @@ -2,9 +2,9 @@ using UnrealBuildTool; -public class ProjectCH : ModuleRules +public class StarFighter : ModuleRules { - public ProjectCH(ReadOnlyTargetRules Target) : base(Target) + public StarFighter(ReadOnlyTargetRules Target) : base(Target) { PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; diff --git a/Source/ProjectCH/WeaponComponent.cpp b/Source/StarFighter/WeaponComponent.cpp similarity index 100% rename from Source/ProjectCH/WeaponComponent.cpp rename to Source/StarFighter/WeaponComponent.cpp diff --git a/Source/ProjectCH/WeaponComponent.h b/Source/StarFighter/WeaponComponent.h similarity index 96% rename from Source/ProjectCH/WeaponComponent.h rename to Source/StarFighter/WeaponComponent.h index cf33f42..8d89122 100644 --- a/Source/ProjectCH/WeaponComponent.h +++ b/Source/StarFighter/WeaponComponent.h @@ -11,7 +11,7 @@ /// Weapon component base class UCLASS( Blueprintable, ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class PROJECTCH_API UWeaponComponent : public UActorComponent +class STARFIGHTER_API UWeaponComponent : public UActorComponent { GENERATED_BODY() diff --git a/Source/ProjectCH/WeaponManagerComponent.cpp b/Source/StarFighter/WeaponManagerComponent.cpp similarity index 100% rename from Source/ProjectCH/WeaponManagerComponent.cpp rename to Source/StarFighter/WeaponManagerComponent.cpp diff --git a/Source/ProjectCH/WeaponManagerComponent.h b/Source/StarFighter/WeaponManagerComponent.h similarity index 95% rename from Source/ProjectCH/WeaponManagerComponent.h rename to Source/StarFighter/WeaponManagerComponent.h index 571b76f..9779f2f 100644 --- a/Source/ProjectCH/WeaponManagerComponent.h +++ b/Source/StarFighter/WeaponManagerComponent.h @@ -12,7 +12,7 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FWeaponChangedEvent, UTexture2D*, Te /// Weapon manager component base class (management of player weapons) UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class PROJECTCH_API UWeaponManagerComponent : public UActorComponent +class STARFIGHTER_API UWeaponManagerComponent : public UActorComponent { GENERATED_BODY() diff --git a/Source/StarFighterEditor.Target.cs b/Source/StarFighterEditor.Target.cs new file mode 100644 index 0000000..411637e --- /dev/null +++ b/Source/StarFighterEditor.Target.cs @@ -0,0 +1,14 @@ +// Francis Ng 2017-2018 + +using UnrealBuildTool; +using System.Collections.Generic; + +public class StarFighterEditorTarget : TargetRules +{ + public StarFighterEditorTarget(TargetInfo Target) : base(Target) + { + Type = TargetType.Editor; + + ExtraModuleNames.AddRange( new string[] { "StarFighter" } ); + } +} diff --git a/ProjectCH.uproject b/StarFighter.uproject similarity index 91% rename from ProjectCH.uproject rename to StarFighter.uproject index 97a5c65..f6035ab 100644 --- a/ProjectCH.uproject +++ b/StarFighter.uproject @@ -5,7 +5,7 @@ "Description": "", "Modules": [ { - "Name": "ProjectCH", + "Name": "StarFighter", "Type": "Runtime", "LoadingPhase": "Default", "AdditionalDependencies": [