Compare commits

...

4 commits

Author SHA1 Message Date
b4dcf21324 qol 2024-09-19 22:18:01 +02:00
b1f689872b Merge branch 'master' into main2
# Conflicts:
#	.gitmodules
#	SkyEngine.uproject
2024-09-19 21:01:55 +02:00
Lucas Peter
dc3b19d840
Update engine 2024-09-19 18:06:56 +02:00
Lucas Peter
db0174e9c2
Default test env 2024-09-19 14:04:26 +02:00
11 changed files with 45 additions and 34 deletions

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "Plugins/SkyPortal"] [submodule "Plugins/SkyPortal"]
path = Plugins/SkyPortal path = Plugins/SkyPortal
url = git@185.216.25.221:lucastucious/SkyPortal-plugin.git url = git@codeberg.org:LUCASTUCIOUS/SkyEngine-skyportal-module.git

View file

@ -1,7 +1,19 @@
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Engine/Maps/Templates/OpenWorld EditorStartupMap=/Game/Maps/TestMap.TestMap
LocalMapOptions=
TransitionMap=None
bUseSplitscreen=True
TwoPlayerSplitscreenLayout=Horizontal
ThreePlayerSplitscreenLayout=FavorTop
FourPlayerSplitscreenLayout=Grid
bOffsetPlayerGamepadIds=False
GameInstanceClass=/Game/Core/SkyGameInstance.SkyGameInstance_C
GameDefaultMap=/Game/Maps/Menu.Menu
ServerDefaultMap=/Engine/Maps/Entry.Entry
GlobalDefaultGameMode=/Game/Core/SkyGameMode.SkyGameMode_C
GlobalDefaultServerGameMode=None
[/Script/WindowsTargetPlatform.WindowsTargetSettings] [/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_Vulkan DefaultGraphicsRHI=DefaultGraphicsRHI_Vulkan
@ -77,6 +89,7 @@ FontDPI=72
[/Script/Engine.Engine] [/Script/Engine.Engine]
+ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/SkyEngine") +ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/SkyEngine")
+ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/SkyEngine") +ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/SkyEngine")
GameViewportClientClassName=/Script/CommonUI.CommonGameViewportClient
[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] [/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
bEnablePlugin=True bEnablePlugin=True
@ -123,4 +136,5 @@ r.ShaderCompiler.JobCacheDDC=1
[/Script/UnrealEd.CookerSettings] [/Script/UnrealEd.CookerSettings]
bEnableBuildDDCInBackground=True bEnableBuildDDCInBackground=True
bCookOnTheFlyForLaunchOn=True

View file

@ -111,3 +111,10 @@ bShouldAcquireMissingChunksOnLoad=False
bShouldWarnAboutInvalidAssets=True bShouldWarnAboutInvalidAssets=True
MetaDataTagsForAssetRegistry=() MetaDataTagsForAssetRegistry=()
[CommonInputPlatformSettings_Windows CommonInputPlatformSettings]
DefaultInputType=Gamepad
[/Script/CommonInput.CommonInputSettings]
bEnableEnhancedInputSupport=True
bEnableDefaultInputConfig=False

View file

@ -29,3 +29,7 @@ DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.Defaul
[/Script/RawInput.RawInputSettings] [/Script/RawInput.RawInputSettings]
bRegisterDefaultDevice=False bRegisterDefaultDevice=False
[/Script/GameInputBase.GameInputDeveloperSettings]
+DeviceConfigurations=(DeviceIdentifier=(VendorId=5168,ProductId=336),Description="Skylander Portal",bOverrideHardwareDeviceIdString=False,OverriddenHardwareDeviceId="",bProcessControllerButtons=True,bProcessControllerSwitchState=True,bProcessControllerAxis=True,ControllerButtonMappingData=(),ControllerAxisMappingData=(),bProcessRawReportData=True,RawReportReadingId=0,RawReportMappingData=())
bDoNotProcessDuplicateCapabilitiesForSingleUser=True

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -1 +1 @@
Subproject commit 652d62ed9692729adde0ce6c7dbec05b6acdfa86 Subproject commit ea75a1d07e1bcc37b37649e38dfa46bbcad5699b

View file

@ -513,10 +513,6 @@
"Name": "AppleImageUtils", "Name": "AppleImageUtils",
"Enabled": false "Enabled": false
}, },
{
"Name": "EngineAssetDefinitions",
"Enabled": false
},
{ {
"Name": "BlueprintFileUtils", "Name": "BlueprintFileUtils",
"Enabled": true "Enabled": true
@ -525,20 +521,6 @@
"Name": "AdvancedRenamer", "Name": "AdvancedRenamer",
"Enabled": true "Enabled": true
}, },
{
"Name": "GameInputWindows",
"Enabled": true,
"SupportedTargetPlatforms": [
"Win64"
]
},
{
"Name": "GameInput",
"Enabled": true,
"SupportedTargetPlatforms": [
"Win64"
]
},
{ {
"Name": "RawInput", "Name": "RawInput",
"Enabled": true "Enabled": true
@ -596,6 +578,10 @@
"Enabled": true "Enabled": true
}, },
{ {
"Name": "JsonBlueprintUtilities",
"Enabled": true
},
{
"Name": "VisualStudioTools", "Name": "VisualStudioTools",
"Enabled": true, "Enabled": true,
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/362651520df94e4fa65492dbcba44ae2", "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/362651520df94e4fa65492dbcba44ae2",

View file

@ -4,20 +4,20 @@ using UnrealBuildTool;
public class SkyEngine : ModuleRules public class SkyEngine : ModuleRules
{ {
public SkyEngine(ReadOnlyTargetRules Target) : base(Target) public SkyEngine(ReadOnlyTargetRules Target) : base(Target)
{ {
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "EnhancedInput" });
PrivateDependencyModuleNames.AddRange(new string[] { }); PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "EnhancedInput" });
// Uncomment if you are using Slate UI PrivateDependencyModuleNames.AddRange(new string[] { });
// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
// Uncomment if you are using online features
// PrivateDependencyModuleNames.Add("OnlineSubsystem");
// To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true // Uncomment if you are using Slate UI
} // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
// Uncomment if you are using online features
// PrivateDependencyModuleNames.Add("OnlineSubsystem");
// To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true
}
} }