Browse code Merge branch 'main' into Sergio_Branch master
commit 61704c3bdbdfb4157a320e2d62957838a25cf3ab 2 parents ea5e3f2 + 28b3198 Genexuz authored on 6 Dec 2022

Showing 44 changed files

• Config/DefaultEngine.ini
• Content/Assets/NormieAsset/NormieTestStaticMesh.uasset
• Content/Assets/NormieAsset/Test_anim.uasset
• Content/Levels/MainMenu_Level.umap
• Content/Levels/Nuno_Level.umap
• Content/MSPresets/MSAssets.db
• Content/MSPresets/MS_DefaultMaterial/Functions/MF_DetailNormalTiling.uasset
• Content/MSPresets/MS_DefaultMaterial/Functions/MF_Displacement.uasset
• Content/MSPresets/MS_DefaultMaterial/Functions/MF_Emissive.uasset
• Content/MSPresets/MS_DefaultMaterial/Functions/MF_Fuzz.uasset
• Content/MSPresets/MS_DefaultMaterial/Functions/MF_MapAdjustments.uasset
• Content/MSPresets/MS_DefaultMaterial/Functions/MF_Tiling.uasset
• Content/MSPresets/MS_DefaultMaterial/Functions/MF_Transmission.uasset
• Content/MSPresets/MS_DefaultMaterial/MS_DefaultMaterial.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Albedo_2K_vfgjfag.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Fuzz_2K_vfgjfag.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Gigantic_Sandstone_Terrain_LOD0_vfgjfag.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Gigantic_Sandstone_Terrain_vfgjfag_inst.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Normal_2K_LOD0_vfgjfag.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Roughness_2K_vfgjfag.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Albedo_2K_wldhdhxva.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Fuzz_2K_wldhdhxva.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Gigantic_Sandstone_Terrain_LOD0_wldhdhxva.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Gigantic_Sandstone_Terrain_wldhdhxva_inst.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Normal_2K_LOD0_wldhdhxva.uasset
• Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Roughness_2K_wldhdhxva.uasset
• Content/Megascans/3D_Assets/Icelandic_Volcano_Terrain_tayv6/Albedo_2K_tayv6.uasset
• Content/Megascans/3D_Assets/Icelandic_Volcano_Terrain_tayv6/Icelandic_Volcano_Terrain_LOD0_tayv6.uasset
• Content/Megascans/3D_Assets/Icelandic_Volcano_Terrain_tayv6/Icelandic_Volcano_Terrain_tayv6_inst.uasset
• Content/Megascans/3D_Assets/Icelandic_Volcano_Terrain_tayv6/Normal_2K_LOD0_tayv6.uasset
• Content/Megascans/3D_Assets/Icelandic_Volcano_Terrain_tayv6/Roughness_2K_tayv6.uasset
• Content/NunoContent/Audio/Master.uasset
• Content/NunoContent/Audio/SFX.uasset
• Content/NunoContent/Audio/SFX/auto-machine-gun-84533.uasset
• Content/NunoContent/Audio/SFX/shooting.uasset
• Content/NunoContent/Audio/SFX/shooting_Cue.uasset
• Content/NunoContent/Audio/SFX/turbine-plane-sfx-26791.uasset
• Content/NunoContent/Audio/SoundMix.uasset
• Content/NunoContent/Menus/Widgets/MainMenu_Widget.uasset
• Content/NunoContent/Menus/Widgets/OptionsMenu_Widget.uasset
• Content/NunoContent/UI/InGame.uasset
• Content/PlaneTest/Projectile_BP.uasset
• Content/PlaneTest/ThirdPersonFlying.uasset
• Content/StarterContent/Audio/Explosion01.uasset

Ignore Space Show notes View Config/DefaultEngine.ini

Ignore Space Show notes View Content/Assets/NormieAsset/NormieTestStaticMesh.uasset
Not supported

Ignore Space Show notes View Content/Assets/NormieAsset/Test_anim.uasset
Not supported

Ignore Space Show notes View Content/Levels/MainMenu_Level.umap
Not supported

Ignore Space Show notes View Content/Levels/Nuno_Level.umap
Not supported

Ignore Space Show notes View Content/MSPresets/MSAssets.db
Not supported

Ignore Space Show notes View Content/MSPresets/MS_DefaultMaterial/Functions/MF_DetailNormalTiling.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/MSPresets/MS_DefaultMaterial/Functions/MF_Displacement.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/MSPresets/MS_DefaultMaterial/Functions/MF_Emissive.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/MSPresets/MS_DefaultMaterial/Functions/MF_Fuzz.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/MSPresets/MS_DefaultMaterial/Functions/MF_MapAdjustments.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/MSPresets/MS_DefaultMaterial/Functions/MF_Tiling.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/MSPresets/MS_DefaultMaterial/Functions/MF_Transmission.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/MSPresets/MS_DefaultMaterial/MS_DefaultMaterial.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Albedo_2K_vfgjfag.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Fuzz_2K_vfgjfag.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Gigantic_Sandstone_Terrain_LOD0_vfgjfag.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Gigantic_Sandstone_Terrain_vfgjfag_inst.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Normal_2K_LOD0_vfgjfag.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_vfgjfag/Roughness_2K_vfgjfag.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Albedo_2K_wldhdhxva.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Fuzz_2K_wldhdhxva.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Gigantic_Sandstone_Terrain_LOD0_wldhdhxva.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Gigantic_Sandstone_Terrain_wldhdhxva_inst.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Normal_2K_LOD0_wldhdhxva.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Gigantic_Sandstone_Terrain_wldhdhxva/Roughness_2K_wldhdhxva.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Icelandic_Volcano_Terrain_tayv6/Albedo_2K_tayv6.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Icelandic_Volcano_Terrain_tayv6/Icelandic_Volcano_Terrain_LOD0_tayv6.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Icelandic_Volcano_Terrain_tayv6/Icelandic_Volcano_Terrain_tayv6_inst.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Icelandic_Volcano_Terrain_tayv6/Normal_2K_LOD0_tayv6.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Megascans/3D_Assets/Icelandic_Volcano_Terrain_tayv6/Roughness_2K_tayv6.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/NunoContent/Audio/Master.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/NunoContent/Audio/SFX.uasset
Not supported

Ignore Space Show notes View Content/NunoContent/Audio/SFX/auto-machine-gun-84533.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/NunoContent/Audio/SFX/shooting.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/NunoContent/Audio/SFX/shooting_Cue.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/NunoContent/Audio/SFX/turbine-plane-sfx-26791.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/NunoContent/Audio/SoundMix.uasset
Not supported

Ignore Space Show notes View Content/NunoContent/Menus/Widgets/MainMenu_Widget.uasset
Not supported

Ignore Space Show notes View Content/NunoContent/Menus/Widgets/OptionsMenu_Widget.uasset
Not supported

Ignore Space Show notes View Content/NunoContent/UI/InGame.uasset
Not supported

Ignore Space Show notes View Content/PlaneTest/Projectile_BP.uasset
Not supported

Ignore Space Show notes View Content/PlaneTest/ThirdPersonFlying.uasset
Not supported

Ignore Space Show notes View Content/StarterContent/Audio/Explosion01.uasset
Not supported

Show line notes below