Merge pull request 'martin' (#20) from martin into main
Reviewed-on: #20
This commit is contained in:
commit
2d38b5c7cc
@ -320,6 +320,7 @@ RuntimeGeneration=Dynamic
|
|||||||
MaxAgentRadius=100.000000
|
MaxAgentRadius=100.000000
|
||||||
|
|
||||||
[/Script/Engine.Engine]
|
[/Script/Engine.Engine]
|
||||||
+ActiveGameNameRedirects=(OldGameName="TP_VehicleAdv",NewGameName="/Script/Luckyrobots")
|
+ActiveGameNameRedirects=(OldGameName="TP_VehicleAdv",NewGameName="/Script/LuckyWorldV2")
|
||||||
+ActiveGameNameRedirects=(OldGameName="/Script/TP_VehicleAdv",NewGameName="/Script/Luckyrobots")
|
+ActiveGameNameRedirects=(OldGameName="/Script/TP_VehicleAdv",NewGameName="/Script/LuckyWorldV2")
|
||||||
|
+ActiveGameNameRedirects=(OldGameName="Luckyrobots",NewGameName="/Script/LuckyWorldV2")
|
||||||
|
+ActiveGameNameRedirects=(OldGameName="/Script/Luckyrobots",NewGameName="/Script/LuckyWorldV2")
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
"Description": "",
|
"Description": "",
|
||||||
"Modules": [
|
"Modules": [
|
||||||
{
|
{
|
||||||
"Name": "Luckyrobots",
|
"Name": "LuckyWorldV2",
|
||||||
"Type": "Runtime",
|
"Type": "Runtime",
|
||||||
"LoadingPhase": "Default",
|
"LoadingPhase": "Default",
|
||||||
"AdditionalDependencies": [
|
"AdditionalDependencies": [
|
@ -3,14 +3,14 @@
|
|||||||
using UnrealBuildTool;
|
using UnrealBuildTool;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
public class LuckyrobotsTarget : TargetRules
|
public class LuckyWorldV2Target : TargetRules
|
||||||
{
|
{
|
||||||
public LuckyrobotsTarget(TargetInfo Target) : base(Target)
|
public LuckyWorldV2Target(TargetInfo Target) : base(Target)
|
||||||
{
|
{
|
||||||
Type = TargetType.Game;
|
Type = TargetType.Game;
|
||||||
DefaultBuildSettings = BuildSettingsVersion.V5;
|
DefaultBuildSettings = BuildSettingsVersion.V5;
|
||||||
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_5;
|
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_5;
|
||||||
ExtraModuleNames.Add("Luckyrobots");
|
ExtraModuleNames.Add("LuckyWorldV2");
|
||||||
|
|
||||||
if (Target.Configuration == UnrealTargetConfiguration.Test)
|
if (Target.Configuration == UnrealTargetConfiguration.Test)
|
||||||
{
|
{
|
@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
using UnrealBuildTool;
|
using UnrealBuildTool;
|
||||||
|
|
||||||
public class Luckyrobots : ModuleRules
|
public class LuckyWorldV2 : ModuleRules
|
||||||
{
|
{
|
||||||
public Luckyrobots(ReadOnlyTargetRules Target) : base(Target)
|
public LuckyWorldV2(ReadOnlyTargetRules Target) : base(Target)
|
||||||
{
|
{
|
||||||
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
|
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
|
||||||
|
|
7
Source/LuckyWorldV2/LuckyWorldV2.cpp
Normal file
7
Source/LuckyWorldV2/LuckyWorldV2.cpp
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
// Copyright Epic Games, Inc. All Rights Reserved.
|
||||||
|
|
||||||
|
#include "LuckyWorldV2.h"
|
||||||
|
#include "Modules/ModuleManager.h"
|
||||||
|
|
||||||
|
IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, LuckyWorldV2, "LuckyWorldV2" );
|
||||||
|
|
@ -10,7 +10,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API ALuckyRobotsPlayerController : public APlayerController
|
class LUCKYWORLDV2_API ALuckyRobotsPlayerController : public APlayerController
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -16,7 +16,7 @@ class UGameUserWidget;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API ULuckyRobotsGameInstance : public UGameInstance
|
class LUCKYWORLDV2_API ULuckyRobotsGameInstance : public UGameInstance
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -13,7 +13,7 @@ class USG_CaptureSetting;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API ULuckyRobotsFunctionLibrary : public UBlueprintFunctionLibrary
|
class LUCKYWORLDV2_API ULuckyRobotsFunctionLibrary : public UBlueprintFunctionLibrary
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
public:
|
public:
|
@ -10,7 +10,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API ALuckyRobotsGameMode : public AGameModeBase
|
class LUCKYWORLDV2_API ALuckyRobotsGameMode : public AGameModeBase
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -12,7 +12,7 @@ class USIOJsonValue;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API ALuckyRobotsGameState : public AGameStateBase
|
class LUCKYWORLDV2_API ALuckyRobotsGameState : public AGameStateBase
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
protected:
|
protected:
|
@ -7,7 +7,7 @@
|
|||||||
#include "TargetSelector.generated.h"
|
#include "TargetSelector.generated.h"
|
||||||
|
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API ATargetSelector : public AActor
|
class LUCKYWORLDV2_API ATargetSelector : public AActor
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -10,7 +10,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API ALobbyGameMode : public AGameModeBase
|
class LUCKYWORLDV2_API ALobbyGameMode : public AGameModeBase
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -10,7 +10,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API ALobbyPlayerController : public APlayerController
|
class LUCKYWORLDV2_API ALobbyPlayerController : public APlayerController
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -6,7 +6,7 @@
|
|||||||
#include "MainScreenUserWidget.generated.h"
|
#include "MainScreenUserWidget.generated.h"
|
||||||
|
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API UMainScreenUserWidget : public UUserWidget
|
class LUCKYWORLDV2_API UMainScreenUserWidget : public UUserWidget
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
protected:
|
protected:
|
@ -11,7 +11,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API USG_CaptureSetting : public USaveGame
|
class LUCKYWORLDV2_API USG_CaptureSetting : public USaveGame
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -11,7 +11,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API UGameUserWidget : public UUserWidget
|
class LUCKYWORLDV2_API UGameUserWidget : public UUserWidget
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -13,7 +13,7 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnOpenMenuStateChanged, bool, Open)
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API UCaptureSettingsUserWidget : public UUserWidget
|
class LUCKYWORLDV2_API UCaptureSettingsUserWidget : public UUserWidget
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
protected:
|
protected:
|
@ -10,7 +10,7 @@
|
|||||||
* Offroad car wheeled vehicle implementation
|
* Offroad car wheeled vehicle implementation
|
||||||
*/
|
*/
|
||||||
UCLASS(abstract)
|
UCLASS(abstract)
|
||||||
class LUCKYROBOTS_API ATP_VehicleAdvOffroadCar : public ATP_VehicleAdvPawn
|
class LUCKYWORLDV2_API ATP_VehicleAdvOffroadCar : public ATP_VehicleAdvPawn
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -10,7 +10,7 @@
|
|||||||
* Front wheel definition for Offroad Car.
|
* Front wheel definition for Offroad Car.
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API UTP_VehicleAdvOffroadWheelFront : public UTP_VehicleAdvWheelFront
|
class LUCKYWORLDV2_API UTP_VehicleAdvOffroadWheelFront : public UTP_VehicleAdvWheelFront
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -10,7 +10,7 @@
|
|||||||
* Rear wheel definition for Offroad Car.
|
* Rear wheel definition for Offroad Car.
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API UTP_VehicleAdvOffroadWheelRear : public UTP_VehicleAdvWheelRear
|
class LUCKYWORLDV2_API UTP_VehicleAdvOffroadWheelRear : public UTP_VehicleAdvWheelRear
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -15,7 +15,7 @@ class UTP_VehicleAdvUI;
|
|||||||
* Handles input mapping and user interface
|
* Handles input mapping and user interface
|
||||||
*/
|
*/
|
||||||
UCLASS(abstract)
|
UCLASS(abstract)
|
||||||
class LUCKYROBOTS_API ATP_VehicleAdvPlayerController : public APlayerController
|
class LUCKYWORLDV2_API ATP_VehicleAdvPlayerController : public APlayerController
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -10,7 +10,7 @@
|
|||||||
* Sports car wheeled vehicle implementation
|
* Sports car wheeled vehicle implementation
|
||||||
*/
|
*/
|
||||||
UCLASS(abstract)
|
UCLASS(abstract)
|
||||||
class LUCKYROBOTS_API ATP_VehicleAdvSportsCar : public ATP_VehicleAdvPawn
|
class LUCKYWORLDV2_API ATP_VehicleAdvSportsCar : public ATP_VehicleAdvPawn
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -10,7 +10,7 @@
|
|||||||
* Front wheel definition for Sports Car.
|
* Front wheel definition for Sports Car.
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API UTP_VehicleAdvSportsWheelFront : public UTP_VehicleAdvWheelFront
|
class LUCKYWORLDV2_API UTP_VehicleAdvSportsWheelFront : public UTP_VehicleAdvWheelFront
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -10,7 +10,7 @@
|
|||||||
* Rear wheel definition for Sports Car.
|
* Rear wheel definition for Sports Car.
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class LUCKYROBOTS_API UTP_VehicleAdvSportsWheelRear : public UTP_VehicleAdvWheelRear
|
class LUCKYWORLDV2_API UTP_VehicleAdvSportsWheelRear : public UTP_VehicleAdvWheelRear
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -12,7 +12,7 @@
|
|||||||
* Widget setup is handled in a Blueprint subclass.
|
* Widget setup is handled in a Blueprint subclass.
|
||||||
*/
|
*/
|
||||||
UCLASS(abstract)
|
UCLASS(abstract)
|
||||||
class LUCKYROBOTS_API UTP_VehicleAdvUI : public UUserWidget
|
class LUCKYWORLDV2_API UTP_VehicleAdvUI : public UUserWidget
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -3,13 +3,13 @@
|
|||||||
using UnrealBuildTool;
|
using UnrealBuildTool;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
public class LuckyrobotsEditorTarget : TargetRules
|
public class LuckyWorldV2EditorTarget : TargetRules
|
||||||
{
|
{
|
||||||
public LuckyrobotsEditorTarget( TargetInfo Target) : base(Target)
|
public LuckyWorldV2EditorTarget( TargetInfo Target) : base(Target)
|
||||||
{
|
{
|
||||||
Type = TargetType.Editor;
|
Type = TargetType.Editor;
|
||||||
DefaultBuildSettings = BuildSettingsVersion.V5;
|
DefaultBuildSettings = BuildSettingsVersion.V5;
|
||||||
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_5;
|
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_5;
|
||||||
ExtraModuleNames.Add("Luckyrobots");
|
ExtraModuleNames.Add("LuckyWorldV2");
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,7 +0,0 @@
|
|||||||
// Copyright Epic Games, Inc. All Rights Reserved.
|
|
||||||
|
|
||||||
#include "Luckyrobots.h"
|
|
||||||
#include "Modules/ModuleManager.h"
|
|
||||||
|
|
||||||
IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, Luckyrobots, "Luckyrobots" );
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user