Compare commits

base: Nikko:8afd3e704ca059cb069010358cad207cbe8d1e1c

Branches Tags

Nikko:main

Nikko:UE5.6

Nikko:Hule-Animasjoner

Nikko:SimonMatFix

Nikko:fix-materials

..

compare: Nikko:1e8f3cacd1293c13040574e3e1ca2fa1af68f363

Branches Tags

Nikko:UE5.6

Nikko:Hule-Animasjoner

Nikko:SimonMatFix

Nikko:main

Nikko:fix-materials

No commits in common. "8afd3e704ca059cb069010358cad207cbe8d1e1c" and "1e8f3cacd1293c13040574e3e1ca2fa1af68f363" have entirely different histories.

8afd3e704c ... 1e8f3cacd1

309 changed files with 9 additions and 921 deletions

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

Show Stats Expand all files Collapse all files

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmhdcfa/High/vmhdcfa_tier_1/Materials/MI_vmhdcfa.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmhdcfa/High/vmhdcfa_tier_1/StaticMeshes/vmhdcfa_tier_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmhdcfa/High/vmhdcfa_tier_1/Textures/T_vmhdcfa_4K_B.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmhdcfa/High/vmhdcfa_tier_1/Textures/T_vmhdcfa_4K_H.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmhdcfa/High/vmhdcfa_tier_1/Textures/T_vmhdcfa_4K_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmhdcfa/High/vmhdcfa_tier_1/Textures/T_vmhdcfa_4K_ORM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmheac2/High/vmheac2_tier_1/Materials/MI_vmheac2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmheac2/High/vmheac2_tier_1/StaticMeshes/vmheac2_tier_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmheac2/High/vmheac2_tier_1/Textures/T_vmheac2_4K_B.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmheac2/High/vmheac2_tier_1/Textures/T_vmheac2_4K_H.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmheac2/High/vmheac2_tier_1/Textures/T_vmheac2_4K_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmheac2/High/vmheac2_tier_1/Textures/T_vmheac2_4K_ORM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmjefjf/High/vmjefjf_tier_1/Materials/MI_vmjefjf.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmjefjf/High/vmjefjf_tier_1/StaticMeshes/vmjefjf_tier_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmjefjf/High/vmjefjf_tier_1/Textures/T_vmjefjf_4K_B.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmjefjf/High/vmjefjf_tier_1/Textures/T_vmjefjf_4K_H.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmjefjf/High/vmjefjf_tier_1/Textures/T_vmjefjf_4K_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Sandstone_Rocky_Ground_vmjefjf/High/vmjefjf_tier_1/Textures/T_vmjefjf_4K_ORM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/HOVEDMAP8_Spline.umap (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/MediterraneanIsland/Cinematics/MRQ_Config.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Romskip/Romskip.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/SEQUENCE/Animasjon_Undervan/Hule1_Spline.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Hule/Content/SEQUENCE/Undervann2/Nedfart1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/SEQUENCE/Undervann3/Hule1_Spline.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Blueprints/Buildings/BP_KB3D_ATL_BldgSmLibrary_A.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Blueprints/Props/BP_KB3D_ATL_PropBench_B.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Blueprints/Props/BP_KB3D_ATL_PropFireBowl_A.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Blueprints/Props/BP_KB3D_ATL_PropScroolShelf_A.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Blueprints/Props/BP_KB3D_ATL_PropStool_B.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Blueprints/Props/BP_KB3D_ATL_PropTable_E.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Levels/KB3D_ATL_BldgSmLibrary_A.umap (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Levels/KB3D_ATL_PropBench_B.umap (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Levels/KB3D_ATL_PropFireBowl_A.umap (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Levels/KB3D_ATL_PropScroolShelf_A.umap (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Levels/KB3D_ATL_PropStool_B.umap (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Levels/KB3D_ATL_PropTable_E.umap (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_AtlasDecalOrnamets.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_AtlasTreeA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_BrickStoneCleanA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_BrickStoneCleanB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_BrickStoneCleanBlueA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_BrickStoneCleanRedB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_BrickStoneCleanTrimA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_BrickStoneCleanTrimB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_BrickStoneDamagedA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_BrickStoneDamagedC.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_CobblestoneStoneFloorA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_CobblestoneStoneFloorB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_FabricTentBlueA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_GoldWornA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_Iron.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_LeatherBrownOldA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_MarbleWhiteA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_MetalForgedA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_PropsBenchB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_PropsSpear.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_RopesTrimA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_SandStonePaintedBlueA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_ScrollPaperTrim.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneCleanPillarsA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneCleanTrimA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneCleanTrimB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneCleanTrimC.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneCleanTrimD.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneFloorMosaicTrimA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneFloorPolishedB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneFloorPolishedC.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneFloorPolishedTrimA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_StoneTilePatternA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_TerracottaTileB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_WoodBrownTrimA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_WoodOldA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/MI_KB3D_ATL_WoodOldVarnished.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/Master/M_KB3D_Master_Masked.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/Master/M_KB3D_Master_Standard.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/Materials/Master/M_KB3D_Master_Translucent.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_ArchesA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_ArchesB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_ArchesC.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_ArchesD.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_ArchesE.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_ArchesF.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerC.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerD.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerE.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerF.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerG.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerH.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerI.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerJ.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerL.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerN.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerO.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_BannerP.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_atlantis/StaticMeshes/SM_KB3D_ATL_BldgSmLibrary_A_Base.uasset (Stored with Git LFS)

Binary file not shown.

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