Merge remote-tracking branch 'origin/Prototyp' into prototyp-v1/kamera-funktionalitaeten-implementieren
# Conflicts: # Content/Prototyp/Blueprints/BP_SplineMeshCharacterMover.uasset # Content/Prototyp/Graphic/Character/BP_Character.uasset # Content/Prototyp/Level/3D-Scene-Prototyp.umap
This commit is contained in:
commit
c553d03ce4
@ -6,3 +6,6 @@ bAllowClassAndBlueprintPinMatching=true
|
|||||||
bReplaceBlueprintWithClass= true
|
bReplaceBlueprintWithClass= true
|
||||||
bDontLoadBlueprintOutsideEditor= true
|
bDontLoadBlueprintOutsideEditor= true
|
||||||
bBlueprintIsNotBlueprintType= true
|
bBlueprintIsNotBlueprintType= true
|
||||||
|
|
||||||
|
[/Script/AdvancedPreviewScene.SharedProfiles]
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
+EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore)))
|
+EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore)))
|
||||||
|
|
||||||
[/Script/EngineSettings.GameMapsSettings]
|
[/Script/EngineSettings.GameMapsSettings]
|
||||||
EditorStartupMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap
|
EditorStartupMap=/Game/Prototyp/Level/Pixel-Scene_Prototyp.Pixel-Scene_Prototyp
|
||||||
LocalMapOptions=
|
LocalMapOptions=
|
||||||
TransitionMap=None
|
TransitionMap=None
|
||||||
bUseSplitscreen=False
|
bUseSplitscreen=False
|
||||||
@ -13,7 +13,7 @@ ThreePlayerSplitscreenLayout=FavorTop
|
|||||||
FourPlayerSplitscreenLayout=Grid
|
FourPlayerSplitscreenLayout=Grid
|
||||||
bOffsetPlayerGamepadIds=False
|
bOffsetPlayerGamepadIds=False
|
||||||
GameInstanceClass=/Script/Engine.GameInstance
|
GameInstanceClass=/Script/Engine.GameInstance
|
||||||
GameDefaultMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap
|
GameDefaultMap=/Game/Prototyp/Level/Pixel-Scene_Prototyp.Pixel-Scene_Prototyp
|
||||||
ServerDefaultMap=/Engine/Maps/Entry.Entry
|
ServerDefaultMap=/Engine/Maps/Entry.Entry
|
||||||
GlobalDefaultGameMode=/Game/FirstPerson/Blueprints/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C
|
GlobalDefaultGameMode=/Game/FirstPerson/Blueprints/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C
|
||||||
GlobalDefaultServerGameMode=None
|
GlobalDefaultServerGameMode=None
|
||||||
@ -219,3 +219,59 @@ ConnectionType=USBOnly
|
|||||||
bUseManualIPAddress=False
|
bUseManualIPAddress=False
|
||||||
ManualIPAddress=
|
ManualIPAddress=
|
||||||
|
|
||||||
|
[/Script/Engine.WorldPartitionSettings]
|
||||||
|
bNewMapsEnableWorldPartitionStreaming=True
|
||||||
|
|
||||||
|
[/Script/NavigationSystem.RecastNavMesh]
|
||||||
|
bDrawPolyEdges=False
|
||||||
|
bDistinctlyDrawTilesBeingBuilt=True
|
||||||
|
DrawOffset=10.000000
|
||||||
|
bFixedTilePoolSize=False
|
||||||
|
TilePoolSize=1024
|
||||||
|
TileSizeUU=4048.000000
|
||||||
|
CellSize=8.000000
|
||||||
|
CellHeight=8.000000
|
||||||
|
NavMeshResolutionParams[0]=(CellSize=8.000000,CellHeight=8.000000,AgentMaxStepHeight=10.000000)
|
||||||
|
NavMeshResolutionParams[1]=(CellSize=8.000000,CellHeight=8.000000,AgentMaxStepHeight=10.000000)
|
||||||
|
NavMeshResolutionParams[2]=(CellSize=8.000000,CellHeight=8.000000,AgentMaxStepHeight=10.000000)
|
||||||
|
AgentRadius=10.000000
|
||||||
|
AgentHeight=42.000000
|
||||||
|
AgentMaxSlope=46.000000
|
||||||
|
AgentMaxStepHeight=35.000000
|
||||||
|
MinRegionArea=0.000000
|
||||||
|
MergeRegionSize=400.000000
|
||||||
|
MaxVerticalMergeError=2147483647
|
||||||
|
MaxSimplificationError=2.000000
|
||||||
|
SimplificationElevationRatio=0.000000
|
||||||
|
MaxSimultaneousTileGenerationJobsCount=1024
|
||||||
|
TileNumberHardLimit=1048576
|
||||||
|
DefaultDrawDistance=5000.000000
|
||||||
|
DefaultMaxSearchNodes=2048.000000
|
||||||
|
DefaultMaxHierarchicalSearchNodes=2048.000000
|
||||||
|
LedgeSlopeFilterMode=Recast
|
||||||
|
RegionPartitioning=Watershed
|
||||||
|
LayerPartitioning=Watershed
|
||||||
|
RegionChunkSplits=2
|
||||||
|
LayerChunkSplits=2
|
||||||
|
bSortNavigationAreasByCost=True
|
||||||
|
bIsWorldPartitioned=False
|
||||||
|
bPerformVoxelFiltering=True
|
||||||
|
bMarkLowHeightAreas=False
|
||||||
|
bUseExtraTopCellWhenMarkingAreas=True
|
||||||
|
bFilterLowSpanSequences=False
|
||||||
|
bFilterLowSpanFromTileCache=False
|
||||||
|
bDoFullyAsyncNavDataGathering=False
|
||||||
|
bUseBetterOffsetsFromCorners=True
|
||||||
|
bStoreEmptyTileLayers=False
|
||||||
|
bUseVirtualFilters=True
|
||||||
|
bUseVirtualGeometryFilteringAndDirtying=False
|
||||||
|
bAllowNavLinkAsPathEnd=False
|
||||||
|
TimeSliceFilterLedgeSpansMaxYProcess=13
|
||||||
|
TimeSliceLongDurationDebug=0.002000
|
||||||
|
InvokerTilePriorityBumpDistanceThresholdInTileUnits=1
|
||||||
|
InvokerTilePriorityBumpIncrease=1
|
||||||
|
bUseVoxelCache=False
|
||||||
|
TileSetUpdateInterval=1.000000
|
||||||
|
HeuristicScale=0.999000
|
||||||
|
VerticalDeviationFromGroundCompensation=0.000000
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Character/Animation/AS_Character.uasset
Normal file
BIN
Content/Prototyp/Graphic/Character/Animation/AS_Character.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Character/BP_Character_Scale2x.uasset
Normal file
BIN
Content/Prototyp/Graphic/Character/BP_Character_Scale2x.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Emoji/BP_Emoji.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Emoji/BP_Emoji.uasset
Normal file
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Angry.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Angry.uasset
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Happy.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Happy.uasset
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Lovely.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Lovely.uasset
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Sad.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Sad.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Smile.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Smile.uasset
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Worry.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_Worry.uasset
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_evil.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_evil.uasset
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_funny.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Emoji/Emotion-Bubble_funny.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Map/BP_Map-Pin.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Map/BP_Map-Pin.uasset
Normal file
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Map/Icon64_Mappin.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Map/Icon64_Mappin.uasset
Normal file
Binary file not shown.
BIN
Content/Prototyp/Graphic/Icon/Map/Icon64_Pin.uasset
Normal file
BIN
Content/Prototyp/Graphic/Icon/Map/Icon64_Pin.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Texture/Pixel_Texture_Concrete.uasset
Normal file
BIN
Content/Prototyp/Graphic/Texture/Pixel_Texture_Concrete.uasset
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/Prototyp/Graphic/Texture/Pixel_Texture_Grass.uasset
Normal file
BIN
Content/Prototyp/Graphic/Texture/Pixel_Texture_Grass.uasset
Normal file
Binary file not shown.
BIN
Content/Prototyp/Graphic/Texture/Pixel_Texture_Mud.uasset
Normal file
BIN
Content/Prototyp/Graphic/Texture/Pixel_Texture_Mud.uasset
Normal file
Binary file not shown.
BIN
Content/Prototyp/Graphic/Texture/Pixel_Texture_Sand.uasset
Normal file
BIN
Content/Prototyp/Graphic/Texture/Pixel_Texture_Sand.uasset
Normal file
Binary file not shown.
BIN
Content/Prototyp/Graphic/Texture/Pixel_Texture_Stone.uasset
Normal file
BIN
Content/Prototyp/Graphic/Texture/Pixel_Texture_Stone.uasset
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user