Merge branch 'TutorialBounty' into dev

# Conflicts:
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
This commit is contained in:
Rafal Swierczek 2023-10-23 11:16:06 +01:00
commit fd41495cc7
168 changed files with 802 additions and 119 deletions

View File

@ -4,7 +4,7 @@
+EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore)))
[/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/LevelPrototyping/Scenes/TutorialHit.TutorialHit
EditorStartupMap=/Game/Levels/TrainingFacility.TrainingFacility
LocalMapOptions=
TransitionMap=None
bUseSplitscreen=True
@ -13,7 +13,7 @@ ThreePlayerSplitscreenLayout=FavorTop
FourPlayerSplitscreenLayout=Grid
bOffsetPlayerGamepadIds=False
GameInstanceClass=/Script/Engine.GameInstance
GameDefaultMap=/Game/LevelPrototyping/Scenes/TutorialHit.TutorialHit
GameDefaultMap=/Game/Levels/TrainingFacility.TrainingFacility
ServerDefaultMap=/Engine/Maps/Entry.Entry
GlobalDefaultGameMode=/Game/FirstPerson/GunMechanicWorld.GunMechanicWorld_C
GlobalDefaultServerGameMode=None
@ -27,6 +27,8 @@ r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=true
r.Shadow.Virtual.Enable=1
r.DefaultFeature.AutoExposure=False
r.DefaultFeature.AutoExposure.Method=1
r.DefaultFeature.AutoExposure.Bias=1.000000
[/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12

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.

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c7d0ce998338688348954e6ad13f7bdc380875a7bea05aebddae30c4eb54144
size 144405

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e288ec30f3b26b7bb4874519eca7cf2192fb9d2c09a84cb2dec4bcdff1044d1
size 54626

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:311f0f503d0da57fc6fbc985d867b9228f21a408771a2fc99529721c8e12c3a0
size 13004

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34ede5014ff062f3380f92b939c6b4367cab00507155900653e87091ea9cfb90
size 54658

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:abb704094c43932bacf948aa6451819dd13a7b8a461381076432ac89d08be01e
size 54660

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d0078b843c7d067953620918f93d3f3834389e94368a10ff5cf64c072fc3a4d
size 54606

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:94bfbbff8021abe73e75d71827e07c5baa766e501cabefaeae63ca1f588a7396
size 54570

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d7bcf8d56e53185921c8a741fe0c75ba93c984c3bf5b8739973156a68297b9c
size 54821

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a6053e080c36fbe43295469fb7ae72edf2aeb7c01f3f551d60e37275543b23a
size 54630

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.

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