Compare commits

base: Nikko:8f93bc9da87a484235963054c89e160b1e36ee37

Branches Tags

Nikko:main

Nikko:UE5.6

Nikko:Hule-Animasjoner

Nikko:SimonMatFix

Nikko:fix-materials

..

compare: Nikko:ac904fb65457fef6cd5da205721aa1d5cd9f7610

Branches Tags

Nikko:UE5.6

Nikko:Hule-Animasjoner

Nikko:SimonMatFix

Nikko:main

Nikko:fix-materials

No commits in common. "8f93bc9da87a484235963054c89e160b1e36ee37" and "ac904fb65457fef6cd5da205721aa1d5cd9f7610" have entirely different histories.

8f93bc9da8 ... ac904fb654

272 changed files with 14 additions and 809 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/ANIMASJON_MARKUS/Nuna_ratt/ABP_Nuna.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Brille.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Bryn_og_vipper.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Dirt.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/EYE.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Hode.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Hode_interiør.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Hud.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Jakke.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Negler.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Nuna_CUSTOM_RIG.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Nuna_CUSTOM_RIG_Anim_Hode_faceit_shape_action.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Nuna_CUSTOM_RIG_Anim_Human_IK_Armature_drive_idle.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Nuna_CUSTOM_RIG_Anim_Human_IK_Armature_swim.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Nuna_CUSTOM_RIG_PhysicsAsset.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Nuna_CUSTOM_RIG_Skeleton.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Stein_mat.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/Visor_Glow.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/ankel_stropp.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/backpack_glass.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/bukse.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/dark_blue_001.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/emissive.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/hasper.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/hår.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/hår_001.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/hårstrikk.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/kork.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/leather.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/metal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/plant_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/plante_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/sandals.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/skjell_mat.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/stropper_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/ANIMASJON_MARKUS/Nuna_ratt/sømmer.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Beach_Boulder_wenobdn/High/wenobdn_tier_1/Materials/MI_wenobdn.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Beach_Boulder_wenobdn/High/wenobdn_tier_1/Textures/T_wenobdn_4K_B.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Beach_Boulder_wenobdn/High/wenobdn_tier_1/Textures/T_wenobdn_4K_H.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Beach_Boulder_wenobdn/High/wenobdn_tier_1/Textures/T_wenobdn_4K_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Beach_Boulder_wenobdn/High/wenobdn_tier_1/Textures/T_wenobdn_4K_ORM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Boulder_vcyqebjfa/High/vcyqebjfa_tier_1/Materials/MI_vcyqebjfa.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Boulder_vcyqebjfa/High/vcyqebjfa_tier_1/Textures/T_vcyqebjfa_4K_B.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Boulder_vcyqebjfa/High/vcyqebjfa_tier_1/Textures/T_vcyqebjfa_4K_H.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Boulder_vcyqebjfa/High/vcyqebjfa_tier_1/Textures/T_vcyqebjfa_4K_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Boulder_vcyqebjfa/High/vcyqebjfa_tier_1/Textures/T_vcyqebjfa_4K_ORM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_uk3lcj2ga/High/uk3lcj2ga_tier_1/Materials/MI_uk3lcj2ga.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_uk3lcj2ga/High/uk3lcj2ga_tier_1/Textures/T_uk3lcj2ga_4K_B.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_uk3lcj2ga/High/uk3lcj2ga_tier_1/Textures/T_uk3lcj2ga_4K_H.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_uk3lcj2ga/High/uk3lcj2ga_tier_1/Textures/T_uk3lcj2ga_4K_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_uk3lcj2ga/High/uk3lcj2ga_tier_1/Textures/T_uk3lcj2ga_4K_ORM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_ukxkffifa/High/ukxkffifa_tier_1/Materials/MI_ukxkffifa.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_ukxkffifa/High/ukxkffifa_tier_1/Textures/T_ukxkffifa_4K_B.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_ukxkffifa/High/ukxkffifa_tier_1/Textures/T_ukxkffifa_4K_F.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_ukxkffifa/High/ukxkffifa_tier_1/Textures/T_ukxkffifa_4K_H.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_ukxkffifa/High/ukxkffifa_tier_1/Textures/T_ukxkffifa_4K_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Fab/Megascans/3D/Nordic_Beach_Rock_ukxkffifa/High/ukxkffifa_tier_1/Textures/T_ukxkffifa_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/Materials/Stol_test.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/Nuna/Bryn_og_vipper.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Nuna/Visor_Glow.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Nuna/backpack_glass.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/Nuna/hår_001.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/kb3d_americana/Blueprints/Props/BP_KB3D_AMC_PropBarrel_A.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_americana/Levels/KB3D_AMC_PropBarrel_A.umap (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/kb3d_americana/StaticMeshes/SM_KB3D_AMC_PropBarrel_A_Main.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/kb3d_apartmentinteriors/Materials/MI_KB3D_API_FabricThrowBlanketB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Hule/Content/kb3d_apartmentinteriors/Textures/Default/T_T_KB3D_Default_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_apartmentinteriors/Textures/Default/T_T_KB3D_Default_Base_Color.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_apartmentinteriors/Textures/Default/T_T_KB3D_Default_Emissive.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_apartmentinteriors/Textures/Default/T_T_KB3D_Default_Normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_apartmentinteriors/Textures/Default/T_T_KB3D_Default_Opacity.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_apartmentinteriors/Textures/Default/T_T_KB3D_Default_Refraction.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_apartmentinteriors/Textures/T_KB3D_API_FabricThrowBlanketB_ARM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_apartmentinteriors/Textures/T_KB3D_API_FabricThrowBlanketB_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_apartmentinteriors/Textures/T_KB3D_API_FabricThrowBlanketB_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_citystreets/Blueprints/Buildings/BP_KB3D_CTS_BldgSM_R.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_citystreets/Blueprints/Props/BP_KB3D_CTS_ShoppingCart_A.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_citystreets/Levels/KB3D_CTS_BldgSM_R.umap (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_citystreets/Levels/KB3D_CTS_ShoppingCart_A.umap (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_citystreets/Materials/MI_KB3D_CTS_Cardboard.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_citystreets/Materials/MI_KB3D_CTS_ConcreteRoad.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_citystreets/Materials/MI_KB3D_CTS_PlasticBGR.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Hule/Content/kb3d_citystreets/Materials/MI_KB3D_CTS_PlasticBWY.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