Compare commits

..

9 Commits

Author SHA1 Message Date
c553d03ce4 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
2024-12-05 18:49:06 +01:00
2884fda83c Added AnimaBP + new Assets
+ AnimBP for Template-Character (Idle, Walk)
+ added map icon
+ added Icon-Bubbles "Emotion"
2024-12-05 18:01:43 +01:00
f6a6d4c9b2 Merge branch 'prototyp-v1/kamera-funktionalitaeten-implementieren' into Prototyp 2024-11-08 21:17:09 +01:00
17776ed9b7 Squashed commit of the following:
commit c9a879aac5
Author: Jamil Raai <jamilraai@gmail.com>
Date:   Sun Nov 3 16:01:09 2024 +0100

    added daily routine and action concept

commit 30c306cb0c
Author: Jamil Raai <jamilraai@gmail.com>
Date:   Thu Oct 24 20:19:07 2024 +0200

    update current mobile orth camera settings

commit 59e2da7135
Author: Jamil Raai <jamilraai@gmail.com>
Date:   Thu Oct 17 19:51:46 2024 +0200

    updated Sprite Offset

commit f2913db0df
Author: Jamil Raai <jamilraai@gmail.com>
Date:   Thu Oct 17 18:51:26 2024 +0200

    updated current test scene

commit 9039f6a63f
Author: Jamil Raai <jamilraai@gmail.com>
Date:   Wed Oct 16 20:37:54 2024 +0200

    added spline mesh movement feature, add Flipbook objects to for the Sprite meshes

commit 4548e6f2e5
Author: Jamil Raai <jamilraai@gmail.com>
Date:   Wed Oct 16 18:07:26 2024 +0200

    removed old house

commit 7ff2ec83ad
Merge: d086be9 15ad759
Author: Jamil Raai <jamilraai@gmail.com>
Date:   Sun Oct 13 20:42:37 2024 +0200

    Merge remote-tracking branch 'origin/Prototyp' into prototyp-v1/kamera-funktionalitaeten-implementieren

    # Conflicts:
    #	Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
2024-11-06 20:29:18 +01:00
64d99e342b New Assets + Level
+ 3D-Low-Poly-Modells Stone und Grass
+ New Level (with adjusted NavMeshNavigation)
2024-11-03 20:52:46 +01:00
80c76a614b Quick Merge spline function 2024-10-19 19:46:27 +02:00
9fd59dbf3b New Material Instances 2024-10-19 19:45:41 +02:00
3b682219ed new Material Instances
new Material Instances for environment
2024-10-19 19:38:54 +02:00
ae6fb78684 Merge remote-tracking branch 'origin/prototyp-v1/kamera-funktionalitaeten-implementieren' into Prototyp 2024-10-19 19:00:17 +02:00
540 changed files with 62 additions and 3 deletions

View File

@ -6,3 +6,6 @@ bAllowClassAndBlueprintPinMatching=true
bReplaceBlueprintWithClass= true
bDontLoadBlueprintOutsideEditor= true
bBlueprintIsNotBlueprintType= true
[/Script/AdvancedPreviewScene.SharedProfiles]

View File

@ -4,7 +4,7 @@
+EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore)))
[/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap
EditorStartupMap=/Game/Prototyp/Level/Pixel-Scene_Prototyp.Pixel-Scene_Prototyp
LocalMapOptions=
TransitionMap=None
bUseSplitscreen=False
@ -13,7 +13,7 @@ ThreePlayerSplitscreenLayout=FavorTop
FourPlayerSplitscreenLayout=Grid
bOffsetPlayerGamepadIds=False
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
GlobalDefaultGameMode=/Game/FirstPerson/Blueprints/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C
GlobalDefaultServerGameMode=None
@ -219,3 +219,59 @@ ConnectionType=USBOnly
bUseManualIPAddress=False
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.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More