Merge branch 'main' into Nuno_Branch

Nuno_Teixeira / SkyFrontier-Project-IADE-UE4-3D

Browse code Merge branch 'main' into Nuno_Branch master
commit 7acea8fedb5d02e9b0a13ce01440de08c0241694 2 parents a2d6d23 + 2ea9913 Rackday authored on 18 Jan 2023

Patch

Unified Split

Showing 13 changed files

Ignore Space Show notes View Content/Assets/NewTargetSystem/Targets_BP.uasset
Not supported

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

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

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

Ignore Space Show notes View Content/MSPresets/MS_DefaultMaterial_CP/MS_DefaultMaterial_CP.uasset
Not supported

Ignore Space Show notes View Content/MSPresets/MS_DefaultMaterial_Fuzzy/MS_DefaultMaterial_Fuzzy.uasset
Not supported

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

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

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

Ignore Space Show notes View Content/ScoreGameMode_BP.uasset
Not supported

Ignore Space Show notes View Source/SkyFrontier/Private/DamageSystem.cpp

Ignore Space Show notes View Source/SkyFrontier/Private/HealthSystem.cpp

Ignore Space Show notes View Source/SkyFrontier/Private/PointsComponent.cpp

Show line notes below