Compare commits

base: Retry:53442710d5160e4edc10b53ad4938c6cd6ab3150

Branches Tags

Retry:newMain

Retry:mainFix

Retry:oldmain

..

compare: Retry:44aadcc252bb176b00632f5ae737a39343015ff6

Branches Tags

Retry:newMain

Retry:mainFix

Retry:oldmain

2 Commits

53442710d5 ... 44aadcc252

Author	SHA1	Message	Date
VoxelCG	44aadcc252	Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain ... # Conflicts: # Japan_Raid/Content/MainMap.umap	2 years ago
VoxelCG	7a9a308737	Upload new meshes, fix bugs, refresh tex	2 years ago

92 changed files with 238 additions and 67 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Japan_Raid/Content/MainMap.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/01BaseSimple1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Foliage/m_bigleafmaple.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Props/MI_WeaponRack_v1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Props/MI_WeaponRack_v2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Props/M_Makivara_Rope.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Props/M_Makivara_Shkant.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Props/M_Makivara_Tatami.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Props/M_Makivara_Wood.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Props/M_Makivara_v2_2_Tatami.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Props/M_Makivara_v2_Srez.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Props/U_Makivara_v2_2_Srez.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Decals/Moss_sikqyan/MI_Moss_sikqyan_8K.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Decals/Moss_sikqyan/T_Moss_sikqyan_8K_D.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Decals/Moss_sikqyan/T_Moss_sikqyan_8K_DpRA.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Decals/Moss_sikqyan/T_Moss_sikqyan_8K_N.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Decals/Mud_Stain_wbhtba2v/MI_Mud_Stain_wbhtba2v_2K.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Decals/Mud_Stain_wbhtba2v/T_MudStain_wbhtba2v_2K_DpRA.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Decals/Mud_Stain_wbhtba2v/T_Mud_Stain_wbhtba2v_2K_D.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Surfaces/Tarp_vdbgeis/MI_Tarp_vdbgeis_2K.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Surfaces/Tarp_vdbgeis/T_Tarp_vdbgeis_2K_D.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Surfaces/Tarp_vdbgeis/T_Tarp_vdbgeis_2K_N.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/Surfaces/Tarp_vdbgeis/T_Tarp_vdbgeis_2K_ORDp.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Environment/SM_ArmoryStorage.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_BigLeafMaple_942C5481_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_BigLeafMaple_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_Moss_v4_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_Moss_v5_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_Moss_v6_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_Moss_v7_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_Moss_v8_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_Moss_v9_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/Stones/S_Mossy_Stones_Pack_tliiadmva_lod3_Var1_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/F_BigLeafMaple.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/F_BigLeafMaple_942C5481.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/SM_Bow.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/SM_Katana_v1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/SM_Katana_v2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/SM_Makivara_v1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/SM_Makivara_v2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/SM_Makivara_v2_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/SM_Naginata.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/SM_Sheath_v1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/SM_Sheath_v2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/BigLeafMapleBump.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/BigLeafMapletxtr.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Rope/U_Makivara_v1_Rope_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Rope/U_Makivara_v1_Rope_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Rope/U_Makivara_v1_Rope_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Shkant/U_Makivara_v1_Shkant_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Shkant/U_Makivara_v1_Shkant_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Shkant/U_Makivara_v1_Shkant_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Tatami/U_Makivara_v1_Tatami_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Tatami/U_Makivara_v1_Tatami_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Tatami/U_Makivara_v1_Tatami_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Wood/U_Makivara_v1_Wood_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Wood/U_Makivara_v1_Wood_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v1_Wood/U_Makivara_v1_Wood_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v2_2_Tatami/U_Makivara_v2_2_Tatami_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v2_2_Tatami/U_Makivara_v2_2_Tatami_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v2_2_Tatami/U_Makivara_v2_2_Tatami_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v2_Srez/U_Makivara_v2_Srez_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v2_Srez/U_Makivara_v2_Srez_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/M_Makivara_v2_Srez/U_Makivara_v2_Srez_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_Makivara_v2_2_Srez/U_Makivara_v2_2_Srez_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_Makivara_v2_2_Srez/U_Makivara_v2_2_Srez_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_Makivara_v2_2_Srez/U_Makivara_v2_2_Srez_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_Makivara_v2_Shkant_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_Makivara_v2_Shkant_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v1_AO.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v1_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v1_Metallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v1_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v1_Roughness.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v2_AO.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v2_AOl.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v2_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v2_Metallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v2_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_WeaponRack_v2_Roughness.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/_GENERATED/steam/BigLeafMaple_942C5481.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/_GENERATED/steam/S_Massive_Tundra_Rock_Formation_wd4icipcb_lod3_Var1_BFB3B943.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/_GENERATED/steam/S_Massive_Tundra_Rock_Formation_wd4icipcb_lod3_Var1_F4AA9E9A.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/_GENERATED/steam/S_Mossy_Embankment_tkhhdhefa_lod3_552B5046.uasset (Stored with Git LFS)

View File

Binary file not shown.

Write Preview

Loading…

Cancel

Save