Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
52f6ce2541
1005 changed files with 72 additions and 3 deletions
|
@ -14,9 +14,9 @@ ThreePlayerSplitscreenLayout=FavorTop
|
|||
FourPlayerSplitscreenLayout=Grid
|
||||
bOffsetPlayerGamepadIds=False
|
||||
GameInstanceClass=/Game/0_Project/Core/Engine/MyGameInstance.MyGameInstance_C
|
||||
GameDefaultMap=/Game/0_Project/Maps/MainMap.MainMap
|
||||
GameDefaultMap=/Game/0_Project/Maps/MainMenu.MainMenu
|
||||
ServerDefaultMap=/Engine/Maps/Entry.Entry
|
||||
GlobalDefaultGameMode=/Game/0_Project/Core/Engine/My_GameMode.My_GameMode_C
|
||||
GlobalDefaultGameMode=/Game/0_Project/Core/Engine/SPGameMode.SPGameMode_C
|
||||
GlobalDefaultServerGameMode=None
|
||||
|
||||
[/Script/Engine.Engine]
|
||||
|
@ -61,7 +61,7 @@ bTickWhilePaused=True
|
|||
bInitialBuildingLocked=False
|
||||
bSkipAgentHeightCheckWhenPickingNavData=False
|
||||
DataGatheringMode=Instant
|
||||
bGenerateNavigationOnlyAroundNavigationInvokers=False
|
||||
bGenerateNavigationOnlyAroundNavigationInvokers=True
|
||||
ActiveTilesUpdateInterval=1.000000
|
||||
+SupportedAgents=(Name="Default",Color=(B=255,G=251,R=181,A=164),DefaultQueryExtent=(X=50.000000,Y=50.000000,Z=250.000000),NavDataClass=/Script/NavigationSystem.RecastNavMesh,AgentRadius=10.000000,AgentHeight=12.000000,AgentStepHeight=-1.000000,NavWalkingSearchHeightScale=0.500000,PreferredNavData=None,bCanCrouch=False,bCanJump=False,bCanWalk=True,bCanSwim=False,bCanFly=False)
|
||||
SupportedAgentsMask=(bSupportsAgent0=True,bSupportsAgent1=True,bSupportsAgent2=True,bSupportsAgent3=True,bSupportsAgent4=True,bSupportsAgent5=True,bSupportsAgent6=True,bSupportsAgent7=True,bSupportsAgent8=True,bSupportsAgent9=True,bSupportsAgent10=True,bSupportsAgent11=True,bSupportsAgent12=True,bSupportsAgent13=True,bSupportsAgent14=True,bSupportsAgent15=True)
|
||||
|
|
Binary file not shown.
BIN
Content/0_Project/Characters/BaseInteract.uasset
Normal file
BIN
Content/0_Project/Characters/BaseInteract.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/BasePawn.uasset
Normal file
BIN
Content/0_Project/Characters/BasePawn.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/BasePlayer.uasset
Normal file
BIN
Content/0_Project/Characters/BasePlayer.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/NPC.uasset
Normal file
BIN
Content/0_Project/Characters/NPC.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/Great_Sword_Idle.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/Great_Sword_Idle.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/Great_Sword_Run.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/Great_Sword_Run.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/0_Project/Characters/Samourai/Perso_Jam.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/Perso_Jam.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/Perso_Jam_hat.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/Perso_Jam_hat.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/Perso_Jam_masque.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/Perso_Jam_masque.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/Perso_Jam_sword.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/Perso_Jam_sword.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/StaticMesh.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/StaticMesh.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/0_Project/Characters/Samourai/Test/IdleFrame.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/Test/IdleFrame.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/Test/IdleToRun.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/Test/IdleToRun.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/Test/RunToIdle.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/Test/RunToIdle.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/Test/SK_Samourai.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/Test/SK_Samourai.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.
Binary file not shown.
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/aiStandardSurface10.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/aiStandardSurface10.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/aiStandardSurface12.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/aiStandardSurface12.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/aiStandardSurface13.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/aiStandardSurface13.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Characters/Samourai/aiStandardSurface14.uasset
Normal file
BIN
Content/0_Project/Characters/Samourai/aiStandardSurface14.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/0_Project/Core/Engine/MenuPawn.uasset
Normal file
BIN
Content/0_Project/Core/Engine/MenuPawn.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/0_Project/Core/IA/Debug/BTService_DrawDestination.uasset
Normal file
BIN
Content/0_Project/Core/IA/Debug/BTService_DrawDestination.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/0_Project/Core/Tiles/BPTrigger.uasset
Normal file
BIN
Content/0_Project/Core/Tiles/BPTrigger.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Core/Tiles/BPWayPoint.uasset
Normal file
BIN
Content/0_Project/Core/Tiles/BPWayPoint.uasset
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/0_Project/Core/Tiles/Corner/Tile_Corner_A.uasset
Normal file
BIN
Content/0_Project/Core/Tiles/Corner/Tile_Corner_A.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/0_Project/Core/Tiles/NewBlueprint.uasset
Normal file
BIN
Content/0_Project/Core/Tiles/NewBlueprint.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Core/Tiles/Straight/Tile_Straight_A.uasset
Normal file
BIN
Content/0_Project/Core/Tiles/Straight/Tile_Straight_A.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/0_Project/Core/Tiles/Tile_city_A.uasset
Normal file
BIN
Content/0_Project/Core/Tiles/Tile_city_A.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/0_Project/Material/MI_RadialProgress.uasset
Normal file
BIN
Content/0_Project/Material/MI_RadialProgress.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Material/M_RadialProgress.uasset
Normal file
BIN
Content/0_Project/Material/M_RadialProgress.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Material/Water_shader/Mat_water.uasset
Normal file
BIN
Content/0_Project/Material/Water_shader/Mat_water.uasset
Normal file
Binary file not shown.
BIN
Content/0_Project/Material/Water_shader/Mat_water_Inst.uasset
Normal file
BIN
Content/0_Project/Material/Water_shader/Mat_water_Inst.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 a new issue