Animations, Aiming and Crosshairs Finished (Sections 3 & 4)

This commit is contained in:
charnet3d 2022-05-31 07:00:37 +01:00
parent 23d91e3931
commit af4320eb6f
1779 changed files with 5820 additions and 25 deletions

2
.gitattributes vendored
View File

@ -3,5 +3,5 @@
*.blend filter=lfs diff=lfs merge=lfs -text *.blend filter=lfs diff=lfs merge=lfs -text
*.psd filter=lfs diff=lfs merge=lfs -text *.psd filter=lfs diff=lfs merge=lfs -text
*.fbx filter=lfs diff=lfs merge=lfs -text *.fbx filter=lfs diff=lfs merge=lfs -text
*.umap filter=lfs diff=lfs merge=lfs -text
*.uasset filter=lfs diff=lfs merge=lfs -text *.uasset filter=lfs diff=lfs merge=lfs -text
*.umap filter=lfs diff=lfs merge=lfs -text

View File

@ -1,8 +1,8 @@
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Game/_Game/Maps/DefaultMap.DefaultMap GameDefaultMap=/Game/_Game/Maps/Factory.Factory
EditorStartupMap=/Game/_Game/Maps/DefaultMap.DefaultMap EditorStartupMap=/Game/_Game/Maps/Factory.Factory
GlobalDefaultGameMode=/Game/_Game/GameMode/ShooterGameModeBaseBP.ShooterGameModeBaseBP_C GlobalDefaultGameMode=/Game/_Game/GameMode/ShooterGameModeBaseBP.ShooterGameModeBaseBP_C
[/Script/HardwareTargeting.HardwareTargetingSettings] [/Script/HardwareTargeting.HardwareTargetingSettings]
@ -42,3 +42,7 @@ ConnectionType=USBOnly
bUseManualIPAddress=False bUseManualIPAddress=False
ManualIPAddress= ManualIPAddress=
[CoreRedirects]
+PropertyRedirects=(OldName="/Script/Shooter.ShooterAnimInstance.CurrentMovementOffsetYaw",NewName="/Script/Shooter.ShooterAnimInstance.LastMovementOffsetYaw")

View File

@ -78,6 +78,8 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom) +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom)
+ActionMappings=(ActionName="FireButton",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) +ActionMappings=(ActionName="FireButton",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
+ActionMappings=(ActionName="FireButton",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger) +ActionMappings=(ActionName="FireButton",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger)
+ActionMappings=(ActionName="Aiming",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton)
+ActionMappings=(ActionName="Aiming",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger)
+AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W) +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W)
+AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S) +AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S)
+AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=Gamepad_LeftY) +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=Gamepad_LeftY)
@ -87,8 +89,8 @@ DoubleClickTime=0.200000
+AxisMappings=(AxisName="TurnRate",Scale=1.000000,Key=Right) +AxisMappings=(AxisName="TurnRate",Scale=1.000000,Key=Right)
+AxisMappings=(AxisName="TurnRate",Scale=-1.000000,Key=Left) +AxisMappings=(AxisName="TurnRate",Scale=-1.000000,Key=Left)
+AxisMappings=(AxisName="TurnRate",Scale=1.000000,Key=Gamepad_RightX) +AxisMappings=(AxisName="TurnRate",Scale=1.000000,Key=Gamepad_RightX)
+AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Up) +AxisMappings=(AxisName="LookUpRate",Scale=-1.000000,Key=Up)
+AxisMappings=(AxisName="LookUpRate",Scale=-1.000000,Key=Down) +AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Down)
+AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Gamepad_RightY) +AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Gamepad_RightY)
+AxisMappings=(AxisName="Turn",Scale=1.000000,Key=MouseX) +AxisMappings=(AxisName="Turn",Scale=1.000000,Key=MouseX)
+AxisMappings=(AxisName="LookUp",Scale=-1.000000,Key=MouseY) +AxisMappings=(AxisName="LookUp",Scale=-1.000000,Key=MouseY)

BIN
Content/Audio/Cue_AssemblyLine.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/Cue_CrashZone.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/Cue_Drone.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/Cue_MainAmbient.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/Cue_Office.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/Cue_Reservoir.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/Cue_Shower.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/Cue_Storage.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/Cue_Ventilation.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/S_AssemblyLine.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/S_Car_crash.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/S_CrashZone.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/S_Drone.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/S_MainAmbient.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/S_Motorized.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/S_Office.uasset (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fbfb3cf7ec1d0bded127a0ef031cf933eb1b677544301a022ad507006488d5f9
size 7698934

BIN
Content/Audio/S_Shower.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/S_Storage.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/S_Ventilation.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Audio/S_Welding.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Data/AC_TilleArray.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Data/BPI_GamePlay.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Data/BP_FunctionLibrary.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Data/GM_Factory.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Data/ML_AC_MacroLibrary.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Data/ML_A_MacroLibrary.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Data/ML_Ob_MacroLibrary.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Data/ST_MASComp.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Data/Virtual_AC_RunAction.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/AC_AttachParticleToSocket.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/AC_AttachToSocket.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/AC_CallAction.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/AC_DoorAction.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/AC_Elevator.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/AC_PlayAnimation.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/AC_RunTruck.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/AC_Shower.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/AC_SitInCar.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/AC_SitInDrone.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/BP_IndustrialRobot.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/BP_RobotHend.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/BP_SplineMovable.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Blueprints/GamePlay/BP_Train.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/N_Sparks_OFF.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/GamePlay/N_Sparks_ON.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Notify/N_On_Off_Particles.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Pawn/Cars/PW_ForkLift.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Pawn/Cars/V_ForkLift_Back.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Pawn/Cars/V_ForkLift_Front.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Pawn/PW_Crane.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Pawn/PW_Fly.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Pawn/ThirdPersonCharacter.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/RenderTarget/CRT_Mirror.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/RenderTarget/RT_Assembly.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/RenderTarget/RT_ControlRoom.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/RenderTarget/RT_CrashTest.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/RenderTarget/RT_DroneCamera.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/RenderTarget/RT_LockerRoom.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/RenderTarget/RT_Office.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/RenderTarget/RT_WC.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/UI/M_HItPoint.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/UI/W_ActionHotkey.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/UI/W_Crane.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/UI/W_Drone.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/UI/W_ForkCar.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/UI/W_HitPoint.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/UI/W_OutCar.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Crash.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Grow_Smoke.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Material/M_Debris.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Material/M_Outline_Only.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Material/M_Outline_Only_Inst.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Material/M_Sparks.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Material/M_Sparks1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Material/M_Sparks1_Inst.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Shower.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Smoke.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Smoke_Train.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/SparksV2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/SparksV2_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Steam_Shower.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Texture/DisplayMask.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Fx/Texture/Particles.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Maps/Demonstration.umap (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Maps/TechArt.umap (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Materials/MF/MF_Atlas.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Materials/MI_0406_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Materials/MI_ACSTD_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Materials/MI_ACSTD_02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Materials/MI_AirConditioner_Decal01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Materials/MI_AirConditioners01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Materials/MI_AirConditioningPipe_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Materials/MI_AirConditioning_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Materials/MI_ArmCover01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Materials/MI_AssemLine_Decals.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More