# Conflicts:
#	Japan_Raid/Content/Levels/Creatures.umap
#	Japan_Raid/Content/Levels/Foliage_Background.umap
#	Japan_Raid/Content/Levels/Foliage_Main.umap
#	Japan_Raid/Content/Levels/Geometry.umap
#	Japan_Raid/Content/Levels/LV_blocking_mesh.umap
#	Japan_Raid/Content/Levels/Landscape.umap
#	Japan_Raid/Content/Levels/Light_day.umap
#	Japan_Raid/Content/Levels/Light_day_HDRI.umap
#	Japan_Raid/Content/Levels/Light_night.umap
#	Japan_Raid/Content/Levels/ZOO_Level.umap
#	Japan_Raid/Content/MainMap.umap
#	Japan_Raid/Content/StarterContent/Architecture/Floor_400x400.uasset
oldmain
MORITA\imoro 11 months ago
commit f5aa057bc9

@ -2,7 +2,7 @@
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Game/MainMap.MainMap GameDefaultMap=/Game/MainMap.MainMap
EditorStartupMap=/Game/MainMap.MainMap EditorStartupMap=/Game/Levels/ZOO_Level.ZOO_Level
[/Script/WindowsTargetPlatform.WindowsTargetSettings] [/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 DefaultGraphicsRHI=DefaultGraphicsRHI_DX12

Binary file not shown.

BIN
Japan_Raid/Content/Levels/Cameras.umap (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Japan_Raid/Content/Levels/Fog.umap (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Japan_Raid/Content/Levels/Geometry.umap (Stored with Git LFS)

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
Japan_Raid/Content/MainMap.umap (Stored with Git LFS)

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.

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

Loading…
Cancel
Save