diff --git a/Config/DefaultEditor.ini b/Config/DefaultEditor.ini index 8b13789..1beb666 100644 --- a/Config/DefaultEditor.ini +++ b/Config/DefaultEditor.ini @@ -1 +1,5 @@ + +[/Script/UnrealEd.BlueprintEditorProjectSettings] +bEnableChildActorExpansionInTreeView=False + diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 56b5252..3effc7c 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -80,14 +80,24 @@ +ActionMappings=(ActionName="ThrottleUp",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton) +ActionMappings=(ActionName="ThrottleDown",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar) +ActionMappings=(ActionName="Shooting",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) +<<<<<<< HEAD +ActionMappings=(ActionName="Focus",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=R) +ActionMappings=(ActionName="Ability",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftShift) +======= ++ActionMappings=(ActionName="ThrottleUp",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger) ++ActionMappings=(ActionName="ThrottleDown",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger) ++ActionMappings=(ActionName="Shooting",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Left) +>>>>>>> main +AxisMappings=(AxisName="Roll",Scale=1.000000,Key=Q) +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W) +AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=D) +AxisMappings=(AxisName="Roll",Scale=-1.000000,Key=E) +AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S) +AxisMappings=(AxisName="MoveRight",Scale=-1.000000,Key=A) ++AxisMappings=(AxisName="Roll",Scale=-1.000000,Key=Gamepad_LeftX) ++AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=Gamepad_LeftY) ++AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=Gamepad_RightShoulder) ++AxisMappings=(AxisName="MoveRight",Scale=-1.000000,Key=Gamepad_LeftShoulder) DefaultPlayerInputClass=/Script/Engine.PlayerInput DefaultInputComponentClass=/Script/Engine.InputComponent DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks @@ -457,3 +467,7 @@ AutoCompleteCVarColor=(B=86,G=158,R=86,A=255) AutoCompleteFadedColor=(B=100,G=100,R=100,A=255) +[/Script/RawInput.RawInputSettings] ++DeviceConfigurations=(VendorID="0x054C",ProductID="0x",AxisProperties=((Key=GenericUSBController_Axis1,bInverted=True,Offset=0.500000),(Key=GenericUSBController_Axis2,bInverted=True,Offset=0.500000),(Key=GenericUSBController_Axis3),(Key=GenericUSBController_Axis4),(Key=GenericUSBController_Axis5),(Key=GenericUSBController_Axis6),(Key=GenericUSBController_Axis7),(Key=GenericUSBController_Axis8)),ButtonProperties=((Key=GenericUSBController_Button1),(Key=GenericUSBController_Button2),(Key=GenericUSBController_Button3),(Key=GenericUSBController_Button4),(Key=GenericUSBController_Button5),(Key=GenericUSBController_Button6),(Key=GenericUSBController_Button7),(Key=GenericUSBController_Button8),(Key=GenericUSBController_Button9),(Key=GenericUSBController_Button10),(Key=GenericUSBController_Button11),(Key=GenericUSBController_Button12),(Key=GenericUSBController_Button13),(Key=GenericUSBController_Button14),(Key=GenericUSBController_Button15),(Key=GenericUSBController_Button16),(Key=GenericUSBController_Button17),(Key=GenericUSBController_Button18),(Key=GenericUSBController_Button19),(Key=GenericUSBController_Button20))) +bRegisterDefaultDevice=True + diff --git a/Content/Assets/NormieAsset/AnimationNormie.uasset b/Content/Assets/NormieAsset/AnimationNormie.uasset new file mode 100644 index 0000000..eae8750 --- /dev/null +++ b/Content/Assets/NormieAsset/AnimationNormie.uasset Binary files differ diff --git a/Content/Assets/NormieAsset/NormiePawn_BP.uasset b/Content/Assets/NormieAsset/NormiePawn_BP.uasset new file mode 100644 index 0000000..91f5d19 --- /dev/null +++ b/Content/Assets/NormieAsset/NormiePawn_BP.uasset Binary files differ diff --git a/Content/Assets/NormieAsset/NormieTestStaticMesh.uasset b/Content/Assets/NormieAsset/NormieTestStaticMesh.uasset new file mode 100644 index 0000000..06b54f6 --- /dev/null +++ b/Content/Assets/NormieAsset/NormieTestStaticMesh.uasset Binary files differ diff --git a/Content/Assets/NormieAsset/SmoothRudder.uasset b/Content/Assets/NormieAsset/SmoothRudder.uasset new file mode 100644 index 0000000..cb4435d --- /dev/null +++ b/Content/Assets/NormieAsset/SmoothRudder.uasset Binary files differ diff --git a/Content/Assets/NormieAsset/Test_anim.uasset b/Content/Assets/NormieAsset/Test_anim.uasset index 846f341..fbbf080 100644 --- a/Content/Assets/NormieAsset/Test_anim.uasset +++ b/Content/Assets/NormieAsset/Test_anim.uasset Binary files differ diff --git a/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset index 032cef5..1816cdf 100644 --- a/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset +++ b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset Binary files differ diff --git a/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon.umap b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon.umap new file mode 100644 index 0000000..0dd6ee6 --- /dev/null +++ b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon.umap Binary files differ diff --git a/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon_LTG.umap b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon_LTG.umap new file mode 100644 index 0000000..2f66948 --- /dev/null +++ b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon_LTG.umap Binary files differ diff --git a/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon_Vehicle.umap b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon_Vehicle.umap new file mode 100644 index 0000000..1ec94f4 --- /dev/null +++ b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/Level/West_Fighter_Typhoon_Vehicle.umap Binary files differ diff --git a/Content/Levels/Joao_Level.umap b/Content/Levels/Joao_Level.umap deleted file mode 100644 index fabb223..0000000 --- a/Content/Levels/Joao_Level.umap +++ /dev/null Binary files differ diff --git a/Content/Levels/test_idk.umap b/Content/Levels/test_idk.umap new file mode 100644 index 0000000..d9573c9 --- /dev/null +++ b/Content/Levels/test_idk.umap Binary files differ diff --git a/Content/PlaneTest/BiPlane/Biplane.uasset b/Content/PlaneTest/BiPlane/Biplane.uasset index 63bb111..aab098b 100644 --- a/Content/PlaneTest/BiPlane/Biplane.uasset +++ b/Content/PlaneTest/BiPlane/Biplane.uasset Binary files differ diff --git a/Content/PlaneTest/BiPlane/biplane_staticmesh.uasset b/Content/PlaneTest/BiPlane/biplane_staticmesh.uasset new file mode 100644 index 0000000..a5564bf --- /dev/null +++ b/Content/PlaneTest/BiPlane/biplane_staticmesh.uasset Binary files differ