Merge branch 'Joao_Branch'

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

Browse code Merge branch 'Joao_Branch' master
commit b3932b93b5dae0ec758352745b45a4a18ab13c36 2 parents 45c3780 + 6a4a0e3 Hoomanbeans authored on 16 Nov 2022

Patch

Unified Split

Showing 13 changed files

Ignore Space Show notes View Config/DefaultEditor.ini

Ignore Space Show notes View Config/DefaultInput.ini

Ignore Space Show notes View Content/Assets/NormieAsset/AnimationNormie.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/NormieAsset/NormiePawn_BP.uasset 0 → 100644
Not supported

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

Ignore Space Show notes View Content/Assets/NormieAsset/SmoothRudder.uasset 0 → 100644
Not supported

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

Ignore Space Show notes View Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon.umap 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon_LTG.umap 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon_Vehicle.umap 0 → 100644
Not supported

Show notes View Content/Levels/Joao_Level.umap 100644 → 0
Not supported

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

Ignore Space Show notes View Content/PlaneTest/BiPlane/biplane_staticmesh.uasset 0 → 100644
Not supported

Show line notes below