Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
[/Script/CryptoKeys.CryptoKeysSettings]
|
||||
EncryptionKey=
|
||||
bEncryptPakIniFiles=False
|
||||
bEncryptPakIndex=False
|
||||
bEncryptUAssetFiles=False
|
||||
bEncryptAllAssetFiles=False
|
||||
SigningPublicExponent=
|
||||
SigningModulus=
|
||||
SigningPrivateExponent=
|
||||
bEnablePakSigning=False
|
||||
|
||||
@@ -187,3 +187,6 @@ bRequiresSystemKeyboard=False
|
||||
HandTrackingSupport=ControllersOnly
|
||||
bPhaseSync=False
|
||||
|
||||
[/Script/Engine.NetworkSettings]
|
||||
MaxRepArraySize=2048
|
||||
|
||||
|
||||
Binary file not shown.
@@ -21,4 +21,30 @@ void AResComPlayerController::SetFloorManager(AResComFloorManager* manager)
|
||||
AResComFloorManager* AResComPlayerController::GetFloorManager() const
|
||||
{
|
||||
return floorManager;
|
||||
}
|
||||
|
||||
void AResComPoint::BeginPlay()
|
||||
{
|
||||
Super::BeginPlay();
|
||||
|
||||
// spectrator window
|
||||
/*SlateWin = SNew(SWindow)
|
||||
.AutoCenter(EAutoCenter::None)
|
||||
.Title(FText::FromString(TEXT("Control Window")))
|
||||
.IsInitiallyMaximized(false)
|
||||
.ScreenPosition(FVector2D(0, 0))
|
||||
.ClientSize(FVector2D(500, 800))
|
||||
.CreateTitleBar(true)
|
||||
.SizingRule(ESizingRule::UserSized)
|
||||
.SupportsMaximize(false)
|
||||
.SupportsMinimize(true)
|
||||
.HasCloseButton(true);
|
||||
|
||||
TSharedRef<SWindow> SlateWinRef = SlateWin.ToSharedRef();
|
||||
|
||||
FSlateApplication& SlateApp = FSlateApplication::Get();
|
||||
|
||||
SlateApp.AddWindow(SlateWinRef, true);
|
||||
|
||||
SlateWinRef->SetContent(SNew(SControlWidget));*/
|
||||
}
|
||||
@@ -24,6 +24,8 @@ protected:
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "FloorManager")
|
||||
void SetFloorManager(AResComFloorManager* manager);
|
||||
|
||||
virtual void BeginPlay() override;
|
||||
public:
|
||||
UFUNCTION(BlueprintCallable, Category = "PlayerManager")
|
||||
AResComPlayerStateManager* GetPlayerStateManager() const;
|
||||
|
||||
Reference in New Issue
Block a user