Compare commits

base: Nikko:fa59c38b6b28fd1d5849c0da8982d804caca076f

Branches Tags

Nikko:main

Nikko:UE5.6

Nikko:Hule-Animasjoner

Nikko:SimonMatFix

Nikko:fix-materials

..

compare: Nikko:b4567f0e60302c0bc57b9583bbecc0e650ba5aff

Branches Tags

Nikko:UE5.6

Nikko:Hule-Animasjoner

Nikko:SimonMatFix

Nikko:main

Nikko:fix-materials

No commits in common. "fa59c38b6b28fd1d5849c0da8982d804caca076f" and "b4567f0e60302c0bc57b9583bbecc0e650ba5aff" have entirely different histories.

fa59c38b6b ... b4567f0e60

109 changed files with 46 additions and 293 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/Blurprint/BP_UnderWater.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/Cargo/Master/Textures/T_T_KB3D_Default_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/Master/Textures/T_T_KB3D_Default_Base_Color.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/Master/Textures/T_T_KB3D_Default_Emissive.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/Master/Textures/T_T_KB3D_Default_Normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/Master/Textures/T_T_KB3D_Default_Opacity.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/Master/Textures/T_T_KB3D_Default_Refraction.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_americana/Materials/MI_KB3D_AMC_ConcreteOld.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_americana/Textures/T_KB3D_AMC_ConcreteOld_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_americana/Textures/T_KB3D_AMC_ConcreteOld_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_americana/Textures/T_KB3D_AMC_ConcreteOld_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_archvogue/Materials/MI_KB3D_ARV_ConcreteGray.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_archvogue/Textures/T_KB3D_ARV_ConcreteGray_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_archvogue/Textures/T_KB3D_ARV_ConcreteGray_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_archvogue/Textures/T_KB3D_ARV_ConcreteGray_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_dmz/Materials/MI_KB3D_DMZ_ConcreteD.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_dmz/Textures/T_KB3D_DMZ_ConcreteD_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_dmz/Textures/T_KB3D_DMZ_ConcreteD_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_dmz/Textures/T_KB3D_DMZ_ConcreteD_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_medievalsiege/Materials/MI_KB3D_MDV_PlasterGray.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_medievalsiege/Textures/T_KB3D_MDV_PlasterGray_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_medievalsiege/Textures/T_KB3D_MDV_PlasterGray_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_medievalsiege/Textures/T_KB3D_MDV_PlasterGray_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_neonyc/Materials/MI_KB3D_NNY_ConcreteGrayFlat.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_neonyc/Textures/T_KB3D_NNY_ConcreteGrayFlat_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_neonyc/Textures/T_KB3D_NNY_ConcreteGrayFlat_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_neonyc/Textures/T_KB3D_NNY_ConcreteGrayFlat_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_sovietblocks/Materials/MI_KB3D_SVB_Concrete.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_sovietblocks/Textures/T_KB3D_SVB_Concrete_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_sovietblocks/Textures/T_KB3D_SVB_Concrete_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_sovietblocks/Textures/T_KB3D_SVB_Concrete_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Blueprints/Props/BP_KB3D_SFR_Bike_A.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Levels/KB3D_SFR_Bike_A.umap (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Materials/MI_KB3D_SFR_GoldSilverTA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Materials/MI_KB3D_SFR_MetalPaintedBGT.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Materials/MI_KB3D_SFR_RubberBlack.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Materials/MI_KB3D_SFR_SteelPaintedBlackT.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Materials/MI_KB3D_SFR_SteelRoughBlackT.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Materials/MI_KB3D_SFR_SteelRoughGray.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/StaticMeshes/SM_KB3D_SFR_Bike_A_Main.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_GoldSilverTA_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_GoldSilverTA_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_GoldSilverTA_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_MetalPaintedBGT_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_MetalPaintedBGT_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_MetalPaintedBGT_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_RubberBlack_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_RubberBlack_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_RubberBlack_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_SteelPaintedBlackT_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_SteelPaintedBlackT_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_SteelPaintedBlackT_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_SteelRoughBlackT_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_SteelRoughBlackT_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_SteelRoughBlackT_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_SteelRoughGray_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_SteelRoughGray_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_storefronts/Textures/T_KB3D_SFR_SteelRoughGray_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_warfare/Materials/MI_KB3D_WAR_ConcreteA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_warfare/Textures/T_KB3D_WAR_ConcreteA_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_warfare/Textures/T_KB3D_WAR_ConcreteA_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Cargo/kb3d_warfare/Textures/T_KB3D_WAR_ConcreteA_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/HousePlants3/3Materials/MI_Concrete1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/HousePlants3/3Materials/M_0_Master.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_0772C042.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_2F691645.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_3D8877B6.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_3FC3101A.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_40F8B7F9.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_46B740D8.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_5B2BEB30.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_633ECEA4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_734370F4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_7DAF2472.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_A42E50C3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_AD290045.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_B8BACAE4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Maps/_GENERATED/trond/Disc_C6A9F402.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Modeller/Headlights.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Modeller/Headlights_Emissive.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/ANIMASJONER/01_DYKK_HULE.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/SEQUENCE/ANIMASJONER/01_DYKK_HULE2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/SEQUENCE/ANIMASJONER/02_HULE_NED.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/SEQUENCE/ANIMASJONER/03_HALL1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/SEQUENCE/ANIMASJONER/04_Dropp_Hall.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Hule/Content/SEQUENCE/ANIMASJONER/05_Snegle1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/SEQUENCE/ANIMASJONER/11_Nuna_Går.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/SEQUENCE/ANIMASJONER/14_Fly1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/SEQUENCE/ANIMASJONER/15_Rundthule_Fly.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/Vindmølle_structure3_Blueprint.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/blueprints/fanblade_windmill.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_atompunk/Materials/Master/M_KB3D_Master_Standard.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