From e928b223c8542f76c5c52b9820a7b0e4f47cfab1 Mon Sep 17 00:00:00 2001 From: Marcel Hara Date: Mon, 24 Oct 2022 00:52:12 +0100 Subject: [PATCH 01/77] Added Thirdperson Starter Content Added the third person starter content in the game so I can start making the 3rd person to 1st person switch mechanic. --- .ignore | 1 - Config/DefaultEditor.ini | 0 Config/DefaultEngine.ini | 53 +++---- Config/DefaultGame.ini | 9 -- Config/DefaultInput.ini | 94 +++++++++++++ Config/HoloLens/HoloLensEngine.ini | 31 ----- .../TP_ThirdPerson/TP_ThirdPerson.h | 5 + .../TP_ThirdPersonCharacter.cpp | 129 ++++++++++++++++++ .../TP_ThirdPerson/TP_ThirdPersonCharacter.h | 65 +++++++++ .../TP_ThirdPerson/TP_ThirdPersonGameMode.cpp | 15 ++ .../TP_ThirdPerson/TP_ThirdPersonGameMode.h | 19 +++ the_twilight_abyss.code-workspace | 7 +- 12 files changed, 349 insertions(+), 79 deletions(-) delete mode 100644 Config/DefaultEditor.ini delete mode 100644 Config/DefaultGame.ini create mode 100644 Config/DefaultInput.ini delete mode 100644 Config/HoloLens/HoloLensEngine.ini create mode 100644 Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPerson.h create mode 100644 Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.cpp create mode 100644 Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.h create mode 100644 Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.cpp create mode 100644 Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.h diff --git a/.ignore b/.ignore index b14364c..c85ee45 100644 --- a/.ignore +++ b/.ignore @@ -4,4 +4,3 @@ Content DerivedDataCache Intermediate Saved -Script diff --git a/Config/DefaultEditor.ini b/Config/DefaultEditor.ini deleted file mode 100644 index e69de29..0000000 diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index c6d8c66..b51b9b5 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -1,39 +1,7 @@ - - -[/Script/EngineSettings.GameMapsSettings] -GameDefaultMap=/Game/Levels/Main.Main - - -EditorStartupMap=/Game/Levels/Main.Main -GlobalDefaultGameMode=/Script/the_twilight_abyss.the_twilight_abyssGameModeBase - -[/Script/HardwareTargeting.HardwareTargetingSettings] -TargetedHardwareClass=Desktop -AppliedTargetedHardwareClass=Desktop -DefaultGraphicsPerformance=Maximum -AppliedDefaultGraphicsPerformance=Maximum - -[/Script/WindowsTargetPlatform.WindowsTargetSettings] -DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 - -[/Script/Engine.RendererSettings] -r.GenerateMeshDistanceFields=True -r.DynamicGlobalIlluminationMethod=1 -r.ReflectionMethod=1 -r.Shadow.Virtual.Enable=1 - -[/Script/WorldPartitionEditor.WorldPartitionEditorSettings] -CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' - -[/Script/Engine.Engine] -+ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/the_twilight_abyss") -+ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/the_twilight_abyss") -+ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="the_twilight_abyssGameModeBase") - [/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] bEnablePlugin=True bAllowNetworkConnection=True -SecurityToken=DB2C79604D560F95FCE2F0AB4CCF2F08 +SecurityToken=C35635AB4464641248F9498D0F62F177 bIncludeInShipping=False bAllowExternalStartInShipping=False bCompileAFSProject=False @@ -44,3 +12,22 @@ ConnectionType=USBOnly bUseManualIPAddress=False ManualIPAddress= +[/Script/Engine.Engine] ++ActiveGameNameRedirects=(OldGameName="/Script/TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") ++ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") + +[/Script/EngineSettings.GameMapsSettings] +EditorStartupMap=/Engine/Maps/Templates/OpenWorld.OpenWorld +LocalMapOptions= +TransitionMap=None +bUseSplitscreen=True +TwoPlayerSplitscreenLayout=Horizontal +ThreePlayerSplitscreenLayout=FavorTop +FourPlayerSplitscreenLayout=Grid +bOffsetPlayerGamepadIds=False +GameInstanceClass=/Script/Engine.GameInstance +GameDefaultMap=/Engine/Maps/Templates/OpenWorld.OpenWorld +ServerDefaultMap=/Engine/Maps/Entry.Entry +GlobalDefaultGameMode=/Game/BP_the_twilight_abyssGameModeBase.BP_the_twilight_abyssGameModeBase_C +GlobalDefaultServerGameMode=None + diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini deleted file mode 100644 index 1f5b083..0000000 --- a/Config/DefaultGame.ini +++ /dev/null @@ -1,9 +0,0 @@ - -[/Script/EngineSettings.GeneralProjectSettings] -ProjectID=FCCEDCD4410CCAFCCB4EF4BD279589AB -ProjectName=The Twilight Abyss - -[StartupActions] -bAddPacks=True -InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent") - diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini new file mode 100644 index 0000000..d3357e7 --- /dev/null +++ b/Config/DefaultInput.ini @@ -0,0 +1,94 @@ +[/Script/Engine.InputSettings] +-AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) +-AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) +-AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) +-AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) +-AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) +-AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) +-AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) ++AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MouseWheelAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_LeftTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_RightTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Touch",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +bAltEnterTogglesFullscreen=True +bF11TogglesFullscreen=True +bUseMouseForTouch=False +bEnableMouseSmoothing=True +bEnableFOVScaling=True +bCaptureMouseOnLaunch=True +bEnableLegacyInputScales=True +bAlwaysShowTouchInterface=False +bShowConsoleOnFourFingerTap=True +bEnableGestureRecognizer=False +bUseAutocorrect=False +DefaultViewportMouseCaptureMode=CapturePermanently_IncludingInitialMouseDown +DefaultViewportMouseLockMode=LockOnCapture +FOVScale=0.011110 +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=SpaceBar) ++AxisMappings=(AxisName="Look Up / Down Gamepad",Scale=1.000000,Key=Gamepad_RightY) ++AxisMappings=(AxisName="Look Up / Down Mouse",Scale=-1.000000,Key=MouseY) ++AxisMappings=(AxisName="Move Forward / Backward",Scale=1.000000,Key=Gamepad_LeftY) ++AxisMappings=(AxisName="Move Forward / Backward",Scale=-1.000000,Key=S) ++AxisMappings=(AxisName="Move Forward / Backward",Scale=1.000000,Key=W) ++AxisMappings=(AxisName="Move Right / Left",Scale=-1.000000,Key=A) ++AxisMappings=(AxisName="Move Right / Left",Scale=1.000000,Key=D) ++AxisMappings=(AxisName="Move Right / Left",Scale=1.000000,Key=Gamepad_LeftX) ++AxisMappings=(AxisName="Turn Right / Left Gamepad",Scale=1.000000,Key=Gamepad_RightX) ++AxisMappings=(AxisName="Turn Right / Left Mouse",Scale=1.000000,Key=MouseX) +DefaultPlayerInputClass=/Script/Engine.PlayerInput +DefaultInputComponentClass=/Script/Engine.InputComponent +DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks +-ConsoleKeys=Tilde ++ConsoleKeys=Tilde + diff --git a/Config/HoloLens/HoloLensEngine.ini b/Config/HoloLens/HoloLensEngine.ini deleted file mode 100644 index b87360b..0000000 --- a/Config/HoloLens/HoloLensEngine.ini +++ /dev/null @@ -1,31 +0,0 @@ - - -[/Script/HoloLensPlatformEditor.HoloLensTargetSettings] -bBuildForEmulation=False -bBuildForDevice=True -bUseNameForLogo=True -bBuildForRetailWindowsStore=False -bAutoIncrementVersion=False -bShouldCreateAppInstaller=False -AppInstallerInstallationURL= -HoursBetweenUpdateChecks=0 -bEnablePIXProfiling=False -TileBackgroundColor=(B=64,G=0,R=0,A=255) -SplashScreenBackgroundColor=(B=64,G=0,R=0,A=255) -+PerCultureResources=(CultureId="",Strings=(PackageDisplayName="",PublisherDisplayName="",PackageDescription="",ApplicationDisplayName="",ApplicationDescription=""),Images=()) -TargetDeviceFamily=Windows.Holographic -MinimumPlatformVersion= -MaximumPlatformVersionTested=10.0.22000.0 -MaxTrianglesPerCubicMeter=500.000000 -SpatialMeshingVolumeSize=20.000000 -CompilerVersion=Default -Windows10SDKVersion=10.0.18362.0 -+CapabilityList=internetClientServer -+CapabilityList=privateNetworkClientServer -+Uap2CapabilityList=spatialPerception -bSetDefaultCapabilities=False -SpatializationPlugin= -ReverbPlugin= -OcclusionPlugin= -SoundCueCookQualityIndex=-1 - diff --git a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPerson.h b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPerson.h new file mode 100644 index 0000000..ddbf2e2 --- /dev/null +++ b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPerson.h @@ -0,0 +1,5 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + +#pragma once + +#include "CoreMinimal.h" diff --git a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.cpp b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.cpp new file mode 100644 index 0000000..9a21f9b --- /dev/null +++ b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.cpp @@ -0,0 +1,129 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + +#include "TP_ThirdPersonCharacter.h" +#include "Camera/CameraComponent.h" +#include "Components/CapsuleComponent.h" +#include "Components/InputComponent.h" +#include "GameFramework/CharacterMovementComponent.h" +#include "GameFramework/Controller.h" +#include "GameFramework/SpringArmComponent.h" + +////////////////////////////////////////////////////////////////////////// +// ATP_ThirdPersonCharacter + +ATP_ThirdPersonCharacter::ATP_ThirdPersonCharacter() +{ + // Set size for collision capsule + GetCapsuleComponent()->InitCapsuleSize(42.f, 96.0f); + + // set our turn rate for input + TurnRateGamepad = 50.f; + + // Don't rotate when the controller rotates. Let that just affect the camera. + bUseControllerRotationPitch = false; + bUseControllerRotationYaw = false; + bUseControllerRotationRoll = false; + + // Configure character movement + GetCharacterMovement()->bOrientRotationToMovement = true; // Character moves in the direction of input... + GetCharacterMovement()->RotationRate = FRotator(0.0f, 500.0f, 0.0f); // ...at this rotation rate + + // Note: For faster iteration times these variables, and many more, can be tweaked in the Character Blueprint + // instead of recompiling to adjust them + GetCharacterMovement()->JumpZVelocity = 700.f; + GetCharacterMovement()->AirControl = 0.35f; + GetCharacterMovement()->MaxWalkSpeed = 500.f; + GetCharacterMovement()->MinAnalogWalkSpeed = 20.f; + GetCharacterMovement()->BrakingDecelerationWalking = 2000.f; + + // Create a camera boom (pulls in towards the player if there is a collision) + CameraBoom = CreateDefaultSubobject(TEXT("CameraBoom")); + CameraBoom->SetupAttachment(RootComponent); + CameraBoom->TargetArmLength = 400.0f; // The camera follows at this distance behind the character + CameraBoom->bUsePawnControlRotation = true; // Rotate the arm based on the controller + + // Create a follow camera + FollowCamera = CreateDefaultSubobject(TEXT("FollowCamera")); + FollowCamera->SetupAttachment(CameraBoom, USpringArmComponent::SocketName); // Attach the camera to the end of the boom and let the boom adjust to match the controller orientation + FollowCamera->bUsePawnControlRotation = false; // Camera does not rotate relative to arm + + // Note: The skeletal mesh and anim blueprint references on the Mesh component (inherited from Character) + // are set in the derived blueprint asset named ThirdPersonCharacter (to avoid direct content references in C++) +} + +////////////////////////////////////////////////////////////////////////// +// Input + +void ATP_ThirdPersonCharacter::SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) +{ + // Set up gameplay key bindings + check(PlayerInputComponent); + PlayerInputComponent->BindAction("Jump", IE_Pressed, this, &ACharacter::Jump); + PlayerInputComponent->BindAction("Jump", IE_Released, this, &ACharacter::StopJumping); + + PlayerInputComponent->BindAxis("Move Forward / Backward", this, &ATP_ThirdPersonCharacter::MoveForward); + PlayerInputComponent->BindAxis("Move Right / Left", this, &ATP_ThirdPersonCharacter::MoveRight); + + // We have 2 versions of the rotation bindings to handle different kinds of devices differently + // "turn" handles devices that provide an absolute delta, such as a mouse. + // "turnrate" is for devices that we choose to treat as a rate of change, such as an analog joystick + PlayerInputComponent->BindAxis("Turn Right / Left Mouse", this, &APawn::AddControllerYawInput); + PlayerInputComponent->BindAxis("Turn Right / Left Gamepad", this, &ATP_ThirdPersonCharacter::TurnAtRate); + PlayerInputComponent->BindAxis("Look Up / Down Mouse", this, &APawn::AddControllerPitchInput); + PlayerInputComponent->BindAxis("Look Up / Down Gamepad", this, &ATP_ThirdPersonCharacter::LookUpAtRate); + + // handle touch devices + PlayerInputComponent->BindTouch(IE_Pressed, this, &ATP_ThirdPersonCharacter::TouchStarted); + PlayerInputComponent->BindTouch(IE_Released, this, &ATP_ThirdPersonCharacter::TouchStopped); +} + +void ATP_ThirdPersonCharacter::TouchStarted(ETouchIndex::Type FingerIndex, FVector Location) +{ + Jump(); +} + +void ATP_ThirdPersonCharacter::TouchStopped(ETouchIndex::Type FingerIndex, FVector Location) +{ + StopJumping(); +} + +void ATP_ThirdPersonCharacter::TurnAtRate(float Rate) +{ + // calculate delta for this frame from the rate information + AddControllerYawInput(Rate * TurnRateGamepad * GetWorld()->GetDeltaSeconds()); +} + +void ATP_ThirdPersonCharacter::LookUpAtRate(float Rate) +{ + // calculate delta for this frame from the rate information + AddControllerPitchInput(Rate * TurnRateGamepad * GetWorld()->GetDeltaSeconds()); +} + +void ATP_ThirdPersonCharacter::MoveForward(float Value) +{ + if ((Controller != nullptr) && (Value != 0.0f)) + { + // find out which way is forward + const FRotator Rotation = Controller->GetControlRotation(); + const FRotator YawRotation(0, Rotation.Yaw, 0); + + // get forward vector + const FVector Direction = FRotationMatrix(YawRotation).GetUnitAxis(EAxis::X); + AddMovementInput(Direction, Value); + } +} + +void ATP_ThirdPersonCharacter::MoveRight(float Value) +{ + if ( (Controller != nullptr) && (Value != 0.0f) ) + { + // find out which way is right + const FRotator Rotation = Controller->GetControlRotation(); + const FRotator YawRotation(0, Rotation.Yaw, 0); + + // get right vector + const FVector Direction = FRotationMatrix(YawRotation).GetUnitAxis(EAxis::Y); + // add movement in that direction + AddMovementInput(Direction, Value); + } +} diff --git a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.h b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.h new file mode 100644 index 0000000..6be7f4e --- /dev/null +++ b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.h @@ -0,0 +1,65 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Character.h" +#include "TP_ThirdPersonCharacter.generated.h" + +UCLASS(config=Game) +class ATP_ThirdPersonCharacter : public ACharacter +{ + GENERATED_BODY() + + /** Camera boom positioning the camera behind the character */ + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true")) + class USpringArmComponent* CameraBoom; + + /** Follow camera */ + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true")) + class UCameraComponent* FollowCamera; +public: + ATP_ThirdPersonCharacter(); + + /** Base turn rate, in deg/sec. Other scaling may affect final turn rate. */ + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Input) + float TurnRateGamepad; + +protected: + + /** Called for forwards/backward input */ + void MoveForward(float Value); + + /** Called for side to side input */ + void MoveRight(float Value); + + /** + * Called via input to turn at a given rate. + * @param Rate This is a normalized rate, i.e. 1.0 means 100% of desired turn rate + */ + void TurnAtRate(float Rate); + + /** + * Called via input to turn look up/down at a given rate. + * @param Rate This is a normalized rate, i.e. 1.0 means 100% of desired turn rate + */ + void LookUpAtRate(float Rate); + + /** Handler for when a touch input begins. */ + void TouchStarted(ETouchIndex::Type FingerIndex, FVector Location); + + /** Handler for when a touch input stops. */ + void TouchStopped(ETouchIndex::Type FingerIndex, FVector Location); + +protected: + // APawn interface + virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + // End of APawn interface + +public: + /** Returns CameraBoom subobject **/ + FORCEINLINE class USpringArmComponent* GetCameraBoom() const { return CameraBoom; } + /** Returns FollowCamera subobject **/ + FORCEINLINE class UCameraComponent* GetFollowCamera() const { return FollowCamera; } +}; + diff --git a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.cpp b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.cpp new file mode 100644 index 0000000..aa7ce00 --- /dev/null +++ b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.cpp @@ -0,0 +1,15 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + +#include "TP_ThirdPersonGameMode.h" +#include "TP_ThirdPersonCharacter.h" +#include "UObject/ConstructorHelpers.h" + +ATP_ThirdPersonGameMode::ATP_ThirdPersonGameMode() +{ + // set default pawn class to our Blueprinted character + static ConstructorHelpers::FClassFinder PlayerPawnBPClass(TEXT("/Game/ThirdPerson/Blueprints/BP_ThirdPersonCharacter")); + if (PlayerPawnBPClass.Class != NULL) + { + DefaultPawnClass = PlayerPawnBPClass.Class; + } +} diff --git a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.h b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.h new file mode 100644 index 0000000..bf3f690 --- /dev/null +++ b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.h @@ -0,0 +1,19 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/GameModeBase.h" +#include "TP_ThirdPersonGameMode.generated.h" + +UCLASS(minimalapi) +class ATP_ThirdPersonGameMode : public AGameModeBase +{ + GENERATED_BODY() + +public: + ATP_ThirdPersonGameMode(); +}; + + + diff --git a/the_twilight_abyss.code-workspace b/the_twilight_abyss.code-workspace index 658d8a4..dfb1376 100644 --- a/the_twilight_abyss.code-workspace +++ b/the_twilight_abyss.code-workspace @@ -6,14 +6,11 @@ }, { "name": "UE5", - "path": "C:\\Program Files\\UE_5.0" + "path": "A:\\UnrealEngine\\UE_5.0" } ], "settings": { - "typescript.tsc.autoDetect": "off", - "cSpell.ignoreWords": [ - "Athe" - ] + "typescript.tsc.autoDetect": "off" }, "extensions": { "recommendations": [ From bc96dc45563e0fd6087afd5b020d47635438dbd2 Mon Sep 17 00:00:00 2001 From: Marcel Hara Date: Mon, 24 Oct 2022 00:54:12 +0100 Subject: [PATCH 02/77] Added a plane to the main level added a plane to stop the character just falling into the void --- Content/Levels/Main.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/Main.umap b/Content/Levels/Main.umap index 8adb0e4..c75d96c 100644 --- a/Content/Levels/Main.umap +++ b/Content/Levels/Main.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cf7ea41af235ff01deb71c81195e0b15eed1f06e95f417adcd8443a05485e1e -size 54088 +oid sha256:b8a6e8cd9e22fc9f475a6133f4a7e0514d394f6963452bfb6b6560b81cd06051 +size 56018 From 8a30db0118bec980604af69df2489382216d6d1e Mon Sep 17 00:00:00 2001 From: Marcel Hara Date: Mon, 24 Oct 2022 00:55:18 +0100 Subject: [PATCH 03/77] Got rid of old gamemode and added new working one --- .../the_twilight_abyssGameModeBase.cpp | 5 ----- .../the_twilight_abyssGameModeBase.h | 17 ----------------- 2 files changed, 22 deletions(-) delete mode 100644 Source/the_twilight_abyss/the_twilight_abyssGameModeBase.cpp delete mode 100644 Source/the_twilight_abyss/the_twilight_abyssGameModeBase.h diff --git a/Source/the_twilight_abyss/the_twilight_abyssGameModeBase.cpp b/Source/the_twilight_abyss/the_twilight_abyssGameModeBase.cpp deleted file mode 100644 index 217a48d..0000000 --- a/Source/the_twilight_abyss/the_twilight_abyssGameModeBase.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - - -#include "the_twilight_abyssGameModeBase.h" - diff --git a/Source/the_twilight_abyss/the_twilight_abyssGameModeBase.h b/Source/the_twilight_abyss/the_twilight_abyssGameModeBase.h deleted file mode 100644 index 34cce53..0000000 --- a/Source/the_twilight_abyss/the_twilight_abyssGameModeBase.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/GameModeBase.h" -#include "the_twilight_abyssGameModeBase.generated.h" - -/** - * - */ -UCLASS() -class THE_TWILIGHT_ABYSS_API Athe_twilight_abyssGameModeBase : public AGameModeBase -{ - GENERATED_BODY() - -}; From 4fa8f85a17a80ba960fe87e1be598619f82773fa Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 7 Nov 2022 00:56:51 +0000 Subject: [PATCH 04/77] Fixed some personal engine issues Had a problem where things were not appearing. --- Config/DefaultEngine.ini | 2 +- Content/Levels/Main.umap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index b51b9b5..c04c7eb 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -28,6 +28,6 @@ bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance GameDefaultMap=/Engine/Maps/Templates/OpenWorld.OpenWorld ServerDefaultMap=/Engine/Maps/Entry.Entry -GlobalDefaultGameMode=/Game/BP_the_twilight_abyssGameModeBase.BP_the_twilight_abyssGameModeBase_C +GlobalDefaultGameMode=/Game/GameMode/MainGameMode.MainGameMode_C GlobalDefaultServerGameMode=None diff --git a/Content/Levels/Main.umap b/Content/Levels/Main.umap index c75d96c..bf2a5a7 100644 --- a/Content/Levels/Main.umap +++ b/Content/Levels/Main.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8a6e8cd9e22fc9f475a6133f4a7e0514d394f6963452bfb6b6560b81cd06051 +oid sha256:adfd7b641c416a5f0050d277f7e2bf55e5df788d889a149992433575977c2942 size 56018 From d6b1a1d0c2ee9aa19de49d439b3981c59add5863 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 7 Nov 2022 01:07:41 +0000 Subject: [PATCH 05/77] Started working on basic enemy collision --- Content/Levels/Main.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/Main.umap b/Content/Levels/Main.umap index bf2a5a7..5805f60 100644 --- a/Content/Levels/Main.umap +++ b/Content/Levels/Main.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adfd7b641c416a5f0050d277f7e2bf55e5df788d889a149992433575977c2942 -size 56018 +oid sha256:44b82ddba2a95a7bf5426d0c1eadd974839eaed56c4ecfd0e072cdeb97e3729f +size 57700 From aad21aa4912f2256f780866bdd7032a876b09e4b Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 7 Nov 2022 17:40:38 +0000 Subject: [PATCH 06/77] Added Enemycollision script Added enemy collision script and made it output the player being hit. --- Source/the_twilight_abyss/EnemyCollision.cpp | 11 +++++++++++ Source/the_twilight_abyss/EnemyCollision.h | 19 +++++++++++++++++++ the_twilight_abyss.code-workspace | 2 +- the_twilight_abyss.uproject | 5 ++++- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 Source/the_twilight_abyss/EnemyCollision.cpp create mode 100644 Source/the_twilight_abyss/EnemyCollision.h diff --git a/Source/the_twilight_abyss/EnemyCollision.cpp b/Source/the_twilight_abyss/EnemyCollision.cpp new file mode 100644 index 0000000..d6ce825 --- /dev/null +++ b/Source/the_twilight_abyss/EnemyCollision.cpp @@ -0,0 +1,11 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "EnemyCollision.h" + +void UEnemyCollision::BeginPlay() +{ + Super::BeginPlay(); + + UE_LOG(LogTemp, Display, TEXT("TRIGGER COLLISION BOX SPAWNED IN")); +} \ No newline at end of file diff --git a/Source/the_twilight_abyss/EnemyCollision.h b/Source/the_twilight_abyss/EnemyCollision.h new file mode 100644 index 0000000..97b9357 --- /dev/null +++ b/Source/the_twilight_abyss/EnemyCollision.h @@ -0,0 +1,19 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Components/BoxComponent.h" +#include "EnemyCollision.generated.h" + +/** + * + */ +UCLASS(ClassGroup = (Custom), meta = (BlueprintSpawnableComponent)) +class THE_TWILIGHT_ABYSS_API UEnemyCollision : public UBoxComponent +{ + GENERATED_BODY() + + protected: + virtual void BeginPlay() override; +}; diff --git a/the_twilight_abyss.code-workspace b/the_twilight_abyss.code-workspace index dfb1376..d2d5a9e 100644 --- a/the_twilight_abyss.code-workspace +++ b/the_twilight_abyss.code-workspace @@ -6,7 +6,7 @@ }, { "name": "UE5", - "path": "A:\\UnrealEngine\\UE_5.0" + "path": "H:\\UE5\\UE_5.0" } ], "settings": { diff --git a/the_twilight_abyss.uproject b/the_twilight_abyss.uproject index ade02f3..2387df4 100644 --- a/the_twilight_abyss.uproject +++ b/the_twilight_abyss.uproject @@ -7,7 +7,10 @@ { "Name": "the_twilight_abyss", "Type": "Runtime", - "LoadingPhase": "Default" + "LoadingPhase": "Default", + "AdditionalDependencies": [ + "Engine" + ] } ], "Plugins": [ From 94574da7c4d269170cd4a57c24eeb5848ac4e544 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 7 Nov 2022 17:41:34 +0000 Subject: [PATCH 07/77] Added enemy test player created a simple object which will act as the test collision for enemy player. --- Content/Levels/Main.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/Main.umap b/Content/Levels/Main.umap index 5805f60..41d596c 100644 --- a/Content/Levels/Main.umap +++ b/Content/Levels/Main.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44b82ddba2a95a7bf5426d0c1eadd974839eaed56c4ecfd0e072cdeb97e3729f -size 57700 +oid sha256:ebb3f05b577a887b28ac85a9ddaa08e24356d99ac9d62c3104fee7d581ad2295 +size 59332 From 14d07f375a9476fa1f9678fcaf1a3cdc16ad6d7d Mon Sep 17 00:00:00 2001 From: MH261677 Date: Wed, 9 Nov 2022 17:05:20 +0000 Subject: [PATCH 08/77] Added Rider to .gitignore --- .gitignore | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++- .ignore | 1 + 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e9fc022..402f5d5 100644 --- a/.gitignore +++ b/.gitignore @@ -106,4 +106,80 @@ Saved Script # Discord Rich Presence -EditorDiscordRichPresence \ No newline at end of file +EditorDiscordRichPresence + +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser +.idea +*.iml +out +gen \ No newline at end of file diff --git a/.ignore b/.ignore index c85ee45..2c368e1 100644 --- a/.ignore +++ b/.ignore @@ -1,3 +1,4 @@ +.idea .git .vscode Content From ab922824e2c830c514a74999790788cd4eda8560 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Wed, 9 Nov 2022 17:13:01 +0000 Subject: [PATCH 09/77] Added .gitignore for all Rider related plugins Gitignore is now working for all IDES and languages. --- .gitignore | 6519 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 6518 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 402f5d5..7ac8fb4 100644 --- a/.gitignore +++ b/.gitignore @@ -182,4 +182,6521 @@ fabric.properties .idea *.iml out -gen \ No newline at end of file +gen### Diff template +*.patch +*.diff + +### Node template +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.yarn/install-state.gz +.pnp.* + +### Leiningen template +pom.xml +pom.xml.asc +*.jar +*.class +/lib/ +/classes/ +/target/ +/checkouts/ +.lein-deps-sum +.lein-repl-history +.lein-plugins/ +.lein-failures +.nrepl-port +.cpcache/ + +### Erlang template +.eunit +*.o +*.beam +*.plt +erl_crash.dump +.concrete/DEV_MODE + +# rebar 2.x +.rebar +rel/example_project +ebin/*.beam +deps + +# rebar 3 +.rebar3 +_build/ +_checkouts/ + +### MicrosoftOffice template +*.tmp + +# Word temporary +~$*.doc* + +# Word Auto Backup File +Backup of *.doc* + +# Excel temporary +~$*.xls* + +# Excel Backup File +*.xlk + +# PowerPoint temporary +~$*.ppt* + +# Visio autosave temporary files +*.~vsd* + +### Yeoman template +node_modules/ +bower_components/ +*.log + +build/ +dist/ + +### Ninja template +.ninja_deps +.ninja_log + +### JupyterNotebooks template +# gitignore template for Jupyter Notebooks +# website: http://jupyter.org/ + +.ipynb_checkpoints +*/.ipynb_checkpoints/* + +# IPython +profile_default/ +ipython_config.py + +# Remove previous ipynb_checkpoints +# git rm -r .ipynb_checkpoints/ + +### Eagle template +# Ignore list for Eagle, a PCB layout tool + +# Backup files +*.s#? +*.b#? +*.l#? +*.b$? +*.s$? +*.l$? + +# Eagle project file +# It contains a serial number and references to the file structure +# on your computer. +# comment the following line if you want to have your project file included. +eagle.epf + +# Autorouter files +*.pro +*.job + +# CAM files +*.$$$ +*.cmp +*.ly2 +*.l15 +*.sol +*.plc +*.stc +*.sts +*.crc +*.crs + +*.dri +*.drl +*.gpi +*.pls +*.ger +*.xln + +*.drd +*.drd.* + +*.s#* +*.b#* + +*.info + +*.eps + +# file locks introduced since 7.x +*.lck + +### Tags template +# Ignore tags created by etags, ctags, gtags (GNU global) and cscope +TAGS +.TAGS +!TAGS/ +tags +.tags +!tags/ +gtags.files +GTAGS +GRTAGS +GPATH +GSYMS +cscope.files +cscope.out +cscope.in.out +cscope.po.out + + +### Clojure template +pom.xml +pom.xml.asc +*.jar +*.class +/lib/ +/classes/ +/target/ +/checkouts/ +.lein-deps-sum +.lein-repl-history +.lein-plugins/ +.lein-failures +.nrepl-port +.cpcache/ + +### JBoss4 template +# gitignore for JBoss v4 projects + +/server/all/data +/server/all/log +/server/all/tmp +/server/all/work +/server/default/data +/server/default/log +/server/default/tmp +/server/default/work +/server/minimal/data +/server/minimal/log +/server/minimal/tmp +/server/minimal/work + +# Note: +# there may be other directories that contain *.xml.failed or *.war.failed files +/server/default/deploy/*.xml.failed +/server/default/deploy/*.war.failed + +### IGORPro template +# Avoid including Experiment files: they can be created and edited locally to test the ipf files +*.pxp +*.pxt +*.uxp +*.uxt + +### JBoss6 template +# gitignore for JBoss v6 projects +# +# Note: to ensure empty directories remain part of the repository, like +# `/server/minimal/lib`, you should add an empty `.gitignore` or `.gitkeep` file +# to the directory - otherwise you may have issues when starting the service. + +/server/all/data +/server/all/log +/server/all/tmp +/server/all/work +/server/default/data +/server/default/log +/server/default/tmp +/server/default/work +/server/minimal/data +/server/minimal/log +/server/minimal/tmp +/server/minimal/work +/server/jbossweb-standalone/data +/server/jbossweb-standalone/log +/server/jbossweb-standalone/tmp +/server/jbossweb-standalone/work +/server/standard/data +/server/standard/log +/server/standard/tmp +/server/standard/work +/server/default/deploy/*.jar.failed +/server/default/deploy/*.jar.dodeploy +/server/default/deploy/*.xml.failed +/server/default/deploy/*.xml.dodeploy +/server/default/deploy/*.war.failed +/server/default/deploy/*.war.dodeploy + + +### Rust template +# Generated by Cargo +# will have compiled files and executables +debug/ +target/ + +# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries +# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html +Cargo.lock + +# These are backup files generated by rustfmt +**/*.rs.bk + +### Images template +# JPEG +*.jpg +*.jpeg +*.jpe +*.jif +*.jfif +*.jfi + +# JPEG 2000 +*.jp2 +*.j2k +*.jpf +*.jpx +*.jpm +*.mj2 + +# JPEG XR +*.jxr +*.hdp +*.wdp + +# Graphics Interchange Format +*.gif + +# RAW +*.raw + +# Web P +*.webp + +# Portable Network Graphics +*.png + +# Animated Portable Network Graphics +*.apng + +# Multiple-image Network Graphics +*.mng + +# Tagged Image File Format +*.tiff +*.tif + +# Scalable Vector Graphics +*.svg +*.svgz + +# Portable Document Format +*.pdf + +# X BitMap +*.xbm + +# BMP +*.bmp +*.dib + +# ICO +*.ico + +# 3D Images +*.3dm +*.max + +### Bazel template +# gitignore template for Bazel build system +# website: https://bazel.build/ + +# Ignore all bazel-* symlinks. There is no full list since this can change +# based on the name of the directory bazel is cloned into. +/bazel-* + +### CommonLisp template +*.FASL +*.fasl +*.lisp-temp +*.dfsl +*.pfsl +*.d64fsl +*.p64fsl +*.lx64fsl +*.lx32fsl +*.dx64fsl +*.dx32fsl +*.fx64fsl +*.fx32fsl +*.sx64fsl +*.sx32fsl +*.wx64fsl +*.wx32fsl + +### GNOMEShellExtension template +# Ignored files for GNOME extension git repository + +*.zip + +### Joomla template +/.htaccess +/administrator/cache/* +/administrator/components/com_actionlogs/* +/administrator/components/com_admin/* +/administrator/components/com_ajax/* +/administrator/components/com_associations/* +/administrator/components/com_banners/* +/administrator/components/com_cache/* +/administrator/components/com_categories/* +/administrator/components/com_checkin/* +/administrator/components/com_config/* +/administrator/components/com_contact/* +/administrator/components/com_content/* +/administrator/components/com_contenthistory/* +/administrator/components/com_cpanel/* +/administrator/components/com_fields/* +/administrator/components/com_finder/* +/administrator/components/com_installer/* +/administrator/components/com_joomlaupdate/* +/administrator/components/com_languages/* +/administrator/components/com_login/* +/administrator/components/com_media/* +/administrator/components/com_menus/* +/administrator/components/com_messages/* +/administrator/components/com_modules/* +/administrator/components/com_newsfeeds/* +/administrator/components/com_plugins/* +/administrator/components/com_postinstall/* +/administrator/components/com_privacy/* +/administrator/components/com_redirect/* +/administrator/components/com_search/* +/administrator/components/com_tags/* +/administrator/components/com_templates/* +/administrator/components/com_users/* +/administrator/help/* +/administrator/includes/* +/administrator/index.php +/administrator/language/en-GB/en-GB.com_actionlogs.ini +/administrator/language/en-GB/en-GB.com_actionlogs.sys.ini +/administrator/language/en-GB/en-GB.com_admin.ini +/administrator/language/en-GB/en-GB.com_admin.sys.ini +/administrator/language/en-GB/en-GB.com_ajax.ini +/administrator/language/en-GB/en-GB.com_ajax.sys.ini +/administrator/language/en-GB/en-GB.com_associations.ini +/administrator/language/en-GB/en-GB.com_associations.sys.ini +/administrator/language/en-GB/en-GB.com_banners.ini +/administrator/language/en-GB/en-GB.com_banners.sys.ini +/administrator/language/en-GB/en-GB.com_cache.ini +/administrator/language/en-GB/en-GB.com_cache.sys.ini +/administrator/language/en-GB/en-GB.com_categories.ini +/administrator/language/en-GB/en-GB.com_categories.sys.ini +/administrator/language/en-GB/en-GB.com_checkin.ini +/administrator/language/en-GB/en-GB.com_checkin.sys.ini +/administrator/language/en-GB/en-GB.com_config.ini +/administrator/language/en-GB/en-GB.com_config.sys.ini +/administrator/language/en-GB/en-GB.com_contact.ini +/administrator/language/en-GB/en-GB.com_contact.sys.ini +/administrator/language/en-GB/en-GB.com_content.ini +/administrator/language/en-GB/en-GB.com_content.sys.ini +/administrator/language/en-GB/en-GB.com_contenthistory.ini +/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini +/administrator/language/en-GB/en-GB.com_cpanel.ini +/administrator/language/en-GB/en-GB.com_cpanel.sys.ini +/administrator/language/en-GB/en-GB.com_fields.ini +/administrator/language/en-GB/en-GB.com_fields.sys.ini +/administrator/language/en-GB/en-GB.com_finder.ini +/administrator/language/en-GB/en-GB.com_finder.sys.ini +/administrator/language/en-GB/en-GB.com_installer.ini +/administrator/language/en-GB/en-GB.com_installer.sys.ini +/administrator/language/en-GB/en-GB.com_joomlaupdate.ini +/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini +/administrator/language/en-GB/en-GB.com_languages.ini +/administrator/language/en-GB/en-GB.com_languages.sys.ini +/administrator/language/en-GB/en-GB.com_login.ini +/administrator/language/en-GB/en-GB.com_login.sys.ini +/administrator/language/en-GB/en-GB.com_mailto.sys.ini +/administrator/language/en-GB/en-GB.com_media.ini +/administrator/language/en-GB/en-GB.com_media.sys.ini +/administrator/language/en-GB/en-GB.com_menus.ini +/administrator/language/en-GB/en-GB.com_menus.sys.ini +/administrator/language/en-GB/en-GB.com_messages.ini +/administrator/language/en-GB/en-GB.com_messages.sys.ini +/administrator/language/en-GB/en-GB.com_modules.ini +/administrator/language/en-GB/en-GB.com_modules.sys.ini +/administrator/language/en-GB/en-GB.com_newsfeeds.ini +/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini +/administrator/language/en-GB/en-GB.com_plugins.ini +/administrator/language/en-GB/en-GB.com_plugins.sys.ini +/administrator/language/en-GB/en-GB.com_postinstall.ini +/administrator/language/en-GB/en-GB.com_postinstall.sys.ini +/administrator/language/en-GB/en-GB.com_privacy.ini +/administrator/language/en-GB/en-GB.com_privacy.sys.ini +/administrator/language/en-GB/en-GB.com_redirect.ini +/administrator/language/en-GB/en-GB.com_redirect.sys.ini +/administrator/language/en-GB/en-GB.com_search.ini +/administrator/language/en-GB/en-GB.com_search.sys.ini +/administrator/language/en-GB/en-GB.com_tags.ini +/administrator/language/en-GB/en-GB.com_tags.sys.ini +/administrator/language/en-GB/en-GB.com_templates.ini +/administrator/language/en-GB/en-GB.com_templates.sys.ini +/administrator/language/en-GB/en-GB.com_users.ini +/administrator/language/en-GB/en-GB.com_users.sys.ini +/administrator/language/en-GB/en-GB.com_weblinks.ini +/administrator/language/en-GB/en-GB.com_weblinks.sys.ini +/administrator/language/en-GB/en-GB.com_wrapper.ini +/administrator/language/en-GB/en-GB.com_wrapper.sys.ini +/administrator/language/en-GB/en-GB.ini +/administrator/language/en-GB/en-GB.lib_joomla.ini +/administrator/language/en-GB/en-GB.localise.php +/administrator/language/en-GB/en-GB.mod_custom.ini +/administrator/language/en-GB/en-GB.mod_custom.sys.ini +/administrator/language/en-GB/en-GB.mod_feed.ini +/administrator/language/en-GB/en-GB.mod_feed.sys.ini +/administrator/language/en-GB/en-GB.mod_latest.ini +/administrator/language/en-GB/en-GB.mod_latest.sys.ini +/administrator/language/en-GB/en-GB.mod_latestactions.ini +/administrator/language/en-GB/en-GB.mod_latestactions.sys.ini +/administrator/language/en-GB/en-GB.mod_logged.ini +/administrator/language/en-GB/en-GB.mod_logged.sys.ini +/administrator/language/en-GB/en-GB.mod_login.ini +/administrator/language/en-GB/en-GB.mod_login.sys.ini +/administrator/language/en-GB/en-GB.mod_menu.ini +/administrator/language/en-GB/en-GB.mod_menu.sys.ini +/administrator/language/en-GB/en-GB.mod_multilangstatus.ini +/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini +/administrator/language/en-GB/en-GB.mod_online.ini +/administrator/language/en-GB/en-GB.mod_online.sys.ini +/administrator/language/en-GB/en-GB.mod_popular.ini +/administrator/language/en-GB/en-GB.mod_popular.sys.ini +/administrator/language/en-GB/en-GB.mod_privacy_dashboard.ini +/administrator/language/en-GB/en-GB.mod_privacy_dashboard.sys.ini +/administrator/language/en-GB/en-GB.mod_quickicon.ini +/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini +/administrator/language/en-GB/en-GB.mod_sampledata.ini +/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini +/administrator/language/en-GB/en-GB.mod_stats_admin.ini +/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini +/administrator/language/en-GB/en-GB.mod_status.ini +/administrator/language/en-GB/en-GB.mod_status.sys.ini +/administrator/language/en-GB/en-GB.mod_submenu.ini +/administrator/language/en-GB/en-GB.mod_submenu.sys.ini +/administrator/language/en-GB/en-GB.mod_title.ini +/administrator/language/en-GB/en-GB.mod_title.sys.ini +/administrator/language/en-GB/en-GB.mod_toolbar.ini +/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini +/administrator/language/en-GB/en-GB.mod_unread.ini +/administrator/language/en-GB/en-GB.mod_unread.sys.ini +/administrator/language/en-GB/en-GB.mod_version.ini +/administrator/language/en-GB/en-GB.mod_version.sys.ini +/administrator/language/en-GB/en-GB.plg_actionlog_joomla.ini +/administrator/language/en-GB/en-GB.plg_actionlog_joomla.sys.ini +/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini +/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini +/administrator/language/en-GB/en-GB.plg_authentication_example.ini +/administrator/language/en-GB/en-GB.plg_authentication_example.sys.ini +/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini +/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini +/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini +/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini +/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini +/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini +/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini +/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini +/administrator/language/en-GB/en-GB.plg_captcha_recaptcha_invisible.ini +/administrator/language/en-GB/en-GB.plg_captcha_recaptcha_invisible.sys.ini +/administrator/language/en-GB/en-GB.plg_content_confirmconsent.ini +/administrator/language/en-GB/en-GB.plg_content_confirmconsent.sys.ini +/administrator/language/en-GB/en-GB.plg_content_contact.ini +/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini +/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini +/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini +/administrator/language/en-GB/en-GB.plg_content_fields.ini +/administrator/language/en-GB/en-GB.plg_content_fields.sys.ini +/administrator/language/en-GB/en-GB.plg_content_finder.ini +/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini +/administrator/language/en-GB/en-GB.plg_content_geshi.ini +/administrator/language/en-GB/en-GB.plg_content_geshi.sys.ini +/administrator/language/en-GB/en-GB.plg_content_joomla.ini +/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini +/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini +/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini +/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini +/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini +/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini +/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini +/administrator/language/en-GB/en-GB.plg_content_vote.ini +/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.sys.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini +/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini +/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini +/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini +/administrator/language/en-GB/en-GB.plg_editors_none.ini +/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini +/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini +/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini +/administrator/language/en-GB/en-GB.plg_extension_joomla.ini +/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_calendar.ini +/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini +/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_color.ini +/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_editor.ini +/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_image.ini +/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini +/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_integer.ini +/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_list.ini +/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_media.ini +/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_radio.ini +/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_repeatable.ini +/administrator/language/en-GB/en-GB.plg_fields_repeatable.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_sql.ini +/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_text.ini +/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_textarea.ini +/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_url.ini +/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_user.ini +/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini +/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini +/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini +/administrator/language/en-GB/en-GB.plg_finder_categories.ini +/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini +/administrator/language/en-GB/en-GB.plg_finder_contacts.ini +/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini +/administrator/language/en-GB/en-GB.plg_finder_content.ini +/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini +/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini +/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini +/administrator/language/en-GB/en-GB.plg_finder_tags.ini +/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini +/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini +/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini +/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini +/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini +/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini +/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini +/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini +/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini +/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini +/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini +/administrator/language/en-GB/en-GB.plg_privacy_actionlogs.ini +/administrator/language/en-GB/en-GB.plg_privacy_actionlogs.sys.ini +/administrator/language/en-GB/en-GB.plg_privacy_consents.ini +/administrator/language/en-GB/en-GB.plg_privacy_consents.sys.ini +/administrator/language/en-GB/en-GB.plg_privacy_contact.ini +/administrator/language/en-GB/en-GB.plg_privacy_contact.sys.ini +/administrator/language/en-GB/en-GB.plg_privacy_content.ini +/administrator/language/en-GB/en-GB.plg_privacy_content.sys.ini +/administrator/language/en-GB/en-GB.plg_privacy_message.ini +/administrator/language/en-GB/en-GB.plg_privacy_message.sys.ini +/administrator/language/en-GB/en-GB.plg_privacy_user.ini +/administrator/language/en-GB/en-GB.plg_privacy_user.sys.ini +/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini +/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini +/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini +/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini +/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini +/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini +/administrator/language/en-GB/en-GB.plg_quickicon_privacycheck.ini +/administrator/language/en-GB/en-GB.plg_quickicon_privacycheck.sys.ini +/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini +/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini +/administrator/language/en-GB/en-GB.plg_search_categories.ini +/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini +/administrator/language/en-GB/en-GB.plg_search_contacts.ini +/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini +/administrator/language/en-GB/en-GB.plg_search_content.ini +/administrator/language/en-GB/en-GB.plg_search_content.sys.ini +/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini +/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini +/administrator/language/en-GB/en-GB.plg_search_tags.ini +/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini +/administrator/language/en-GB/en-GB.plg_search_weblinks.ini +/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini +/administrator/language/en-GB/en-GB.plg_system_actionlogs.ini +/administrator/language/en-GB/en-GB.plg_system_actionlogs.sys.ini +/administrator/language/en-GB/en-GB.plg_system_cache.ini +/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini +/administrator/language/en-GB/en-GB.plg_system_debug.ini +/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini +/administrator/language/en-GB/en-GB.plg_system_fields.ini +/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini +/administrator/language/en-GB/en-GB.plg_system_highlight.ini +/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini +/administrator/language/en-GB/en-GB.plg_system_languagecode.ini +/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini +/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini +/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini +/administrator/language/en-GB/en-GB.plg_system_log.ini +/administrator/language/en-GB/en-GB.plg_system_log.sys.ini +/administrator/language/en-GB/en-GB.plg_system_logout.ini +/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini +/administrator/language/en-GB/en-GB.plg_system_logrotation.ini +/administrator/language/en-GB/en-GB.plg_system_logrotation.sys.ini +/administrator/language/en-GB/en-GB.plg_system_p3p.ini +/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini +/administrator/language/en-GB/en-GB.plg_system_privacyconsent.ini +/administrator/language/en-GB/en-GB.plg_system_privacyconsent.sys.ini +/administrator/language/en-GB/en-GB.plg_system_redirect.ini +/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini +/administrator/language/en-GB/en-GB.plg_system_remember.ini +/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini +/administrator/language/en-GB/en-GB.plg_system_sef.ini +/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini +/administrator/language/en-GB/en-GB.plg_system_sessiongc.ini +/administrator/language/en-GB/en-GB.plg_system_sessiongc.sys.ini +/administrator/language/en-GB/en-GB.plg_system_stats.ini +/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini +/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini +/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini +/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini +/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini +/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini +/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini +/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini +/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini +/administrator/language/en-GB/en-GB.plg_user_joomla.ini +/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini +/administrator/language/en-GB/en-GB.plg_user_profile.ini +/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini +/administrator/language/en-GB/en-GB.plg_user_terms.ini +/administrator/language/en-GB/en-GB.plg_user_terms.sys.ini +/administrator/language/en-GB/en-GB.tpl_hathor.ini +/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini +/administrator/language/en-GB/en-GB.tpl_isis.ini +/administrator/language/en-GB/en-GB.tpl_isis.sys.ini +/administrator/language/en-GB/en-GB.xml +/administrator/language/en-GB/install.xml +/administrator/language/overrides/* +/administrator/language/index.html +/administrator/logs/* +/administrator/manifests/files/joomla.xml +/administrator/manifests/libraries/fof.xml +/administrator/manifests/libraries/idna_convert.xml +/administrator/manifests/libraries/joomla.xml +/administrator/manifests/libraries/phpass.xml +/administrator/manifests/libraries/phputf8.xml +/administrator/manifests/packages/pkg_en-GB.xml +/administrator/manifests/packages/index.html +/administrator/modules/mod_custom/* +/administrator/modules/mod_feed/* +/administrator/modules/mod_latest/* +/administrator/modules/mod_latestactions/* +/administrator/modules/mod_logged/* +/administrator/modules/mod_login/* +/administrator/modules/mod_menu/* +/administrator/modules/mod_multilangstatus/* +/administrator/modules/mod_online/* +/administrator/modules/mod_popular/* +/administrator/modules/mod_privacy_dashboard/* +/administrator/modules/mod_quickicon/* +/administrator/modules/mod_sampledata/* +/administrator/modules/mod_stats_admin/* +/administrator/modules/mod_status/* +/administrator/modules/mod_submenu/* +/administrator/modules/mod_title/* +/administrator/modules/mod_toolbar/* +/administrator/modules/mod_unread/* +/administrator/modules/mod_version/* +/administrator/templates/hathor/* +/administrator/templates/isis/* +/administrator/templates/system/* +/bin/* +/cache/* +/cli/* +/components/com_ajax/* +/components/com_banners/* +/components/com_config/* +/components/com_contact/* +/components/com_content/* +/components/com_contenthistory/* +/components/com_fields/* +/components/com_finder/* +/components/com_mailto/* +/components/com_media/* +/components/com_menus/* +/components/com_modules/* +/components/com_newsfeeds/* +/components/com_privacy/* +/components/com_search/* +/components/com_tags/* +/components/com_users/* +/components/com_wrapper/* +/components/index.html +/images/banners/* +/images/headers/* +/images/sampledata/* +/images/index.html +/images/joomla* +/images/powered_by.png +/includes/* +/installation/* +/language/en-GB/en-GB.com_ajax.ini +/language/en-GB/en-GB.com_config.ini +/language/en-GB/en-GB.com_contact.ini +/language/en-GB/en-GB.com_content.ini +/language/en-GB/en-GB.com_finder.ini +/language/en-GB/en-GB.com_mailto.ini +/language/en-GB/en-GB.com_media.ini +/language/en-GB/en-GB.com_messages.ini +/language/en-GB/en-GB.com_newsfeeds.ini +/language/en-GB/en-GB.com_privacy.ini +/language/en-GB/en-GB.com_search.ini +/language/en-GB/en-GB.com_tags.ini +/language/en-GB/en-GB.com_users.ini +/language/en-GB/en-GB.com_weblinks.ini +/language/en-GB/en-GB.com_wrapper.ini +/language/en-GB/en-GB.files_joomla.sys.ini +/language/en-GB/en-GB.finder_cli.ini +/language/en-GB/en-GB.ini +/language/en-GB/en-GB.lib_fof.ini +/language/en-GB/en-GB.lib_fof.sys.ini +/language/en-GB/en-GB.lib_idna_convert.sys.ini +/language/en-GB/en-GB.lib_joomla.ini +/language/en-GB/en-GB.lib_joomla.sys.ini +/language/en-GB/en-GB.lib_phpass.sys.ini +/language/en-GB/en-GB.lib_phpmailer.sys.ini +/language/en-GB/en-GB.lib_phputf8.sys.ini +/language/en-GB/en-GB.lib_simplepie.sys.ini +/language/en-GB/en-GB.localise.php +/language/en-GB/en-GB.mod_articles_archive.ini +/language/en-GB/en-GB.mod_articles_archive.sys.ini +/language/en-GB/en-GB.mod_articles_categories.ini +/language/en-GB/en-GB.mod_articles_categories.sys.ini +/language/en-GB/en-GB.mod_articles_category.ini +/language/en-GB/en-GB.mod_articles_category.sys.ini +/language/en-GB/en-GB.mod_articles_latest.ini +/language/en-GB/en-GB.mod_articles_latest.sys.ini +/language/en-GB/en-GB.mod_articles_news.ini +/language/en-GB/en-GB.mod_articles_news.sys.ini +/language/en-GB/en-GB.mod_articles_popular.ini +/language/en-GB/en-GB.mod_articles_popular.sys.ini +/language/en-GB/en-GB.mod_banners.ini +/language/en-GB/en-GB.mod_banners.sys.ini +/language/en-GB/en-GB.mod_breadcrumbs.ini +/language/en-GB/en-GB.mod_breadcrumbs.sys.ini +/language/en-GB/en-GB.mod_custom.ini +/language/en-GB/en-GB.mod_custom.sys.ini +/language/en-GB/en-GB.mod_feed.ini +/language/en-GB/en-GB.mod_feed.sys.ini +/language/en-GB/en-GB.mod_finder.ini +/language/en-GB/en-GB.mod_finder.sys.ini +/language/en-GB/en-GB.mod_footer.ini +/language/en-GB/en-GB.mod_footer.sys.ini +/language/en-GB/en-GB.mod_languages.ini +/language/en-GB/en-GB.mod_languages.sys.ini +/language/en-GB/en-GB.mod_login.ini +/language/en-GB/en-GB.mod_login.sys.ini +/language/en-GB/en-GB.mod_menu.ini +/language/en-GB/en-GB.mod_menu.sys.ini +/language/en-GB/en-GB.mod_random_image.ini +/language/en-GB/en-GB.mod_random_image.sys.ini +/language/en-GB/en-GB.mod_related_items.ini +/language/en-GB/en-GB.mod_related_items.sys.ini +/language/en-GB/en-GB.mod_search.ini +/language/en-GB/en-GB.mod_search.sys.ini +/language/en-GB/en-GB.mod_stats.ini +/language/en-GB/en-GB.mod_stats.sys.ini +/language/en-GB/en-GB.mod_syndicate.ini +/language/en-GB/en-GB.mod_syndicate.sys.ini +/language/en-GB/en-GB.mod_tags_popular.ini +/language/en-GB/en-GB.mod_tags_popular.sys.ini +/language/en-GB/en-GB.mod_tags_similar.ini +/language/en-GB/en-GB.mod_tags_similar.sys.ini +/language/en-GB/en-GB.mod_users_latest.ini +/language/en-GB/en-GB.mod_users_latest.sys.ini +/language/en-GB/en-GB.mod_weblinks.ini +/language/en-GB/en-GB.mod_weblinks.sys.ini +/language/en-GB/en-GB.mod_whosonline.ini +/language/en-GB/en-GB.mod_whosonline.sys.ini +/language/en-GB/en-GB.mod_wrapper.ini +/language/en-GB/en-GB.mod_wrapper.sys.ini +/language/en-GB/en-GB.tpl_atomic.ini +/language/en-GB/en-GB.tpl_atomic.sys.ini +/language/en-GB/en-GB.tpl_beez3.ini +/language/en-GB/en-GB.tpl_beez3.sys.ini +/language/en-GB/en-GB.tpl_beez5.ini +/language/en-GB/en-GB.tpl_beez5.sys.ini +/language/en-GB/en-GB.tpl_beez_20.ini +/language/en-GB/en-GB.tpl_beez_20.sys.ini +/language/en-GB/en-GB.tpl_protostar.ini +/language/en-GB/en-GB.tpl_protostar.sys.ini +/language/en-GB/en-GB.xml +/language/en-GB/install.xml +/language/overrides/* +/language/index.html +/layouts/joomla/* +/layouts/libraries/* +/layouts/plugins/* +/layouts/index.html +/libraries/cms/* +/libraries/fof/* +/libraries/idna_convert/* +/libraries/joomla/* +/libraries/legacy/* +/libraries/php-encryption/* +/libraries/phpass/* +/libraries/phpmailer/* +/libraries/phputf8/* +/libraries/simplepie/* +/libraries/src/* +/libraries/vendor/* +/libraries/classmap.php +/libraries/cms.php +/libraries/import.legacy.php +/libraries/import.php +/libraries/index.html +/libraries/loader.php +/media/cms/* +/media/com_associations/* +/media/com_contact/* +/media/com_content/* +/media/com_contenthistory/* +/media/com_fields/* +/media/com_finder/* +/media/com_joomlaupdate/* +/media/com_menus/* +/media/com_modules/* +/media/com_wrapper/* +/media/contacts/* +/media/editors/* +/media/jui/* +/media/mailto/* +/media/media/* +/media/mod_languages/* +/media/mod_sampledata/* +/media/overrider/* +/media/plg_captcha_recaptcha/* +/media/plg_captcha_recaptcha_invisible/* +/media/plg_quickicon_extensionupdate/* +/media/plg_quickicon_joomlaupdate/* +/media/plg_quickicon_privacycheck/* +/media/plg_system_highlight/* +/media/plg_system_stats/* +/media/plg_twofactorauth_totp/* +/media/system/* +/media/index.html +/modules/mod_articles_archive/* +/modules/mod_articles_categories/* +/modules/mod_articles_category/* +/modules/mod_articles_latest/* +/modules/mod_articles_news/* +/modules/mod_articles_popular/* +/modules/mod_banners/* +/modules/mod_breadcrumbs/* +/modules/mod_custom/* +/modules/mod_feed/* +/modules/mod_finder/* +/modules/mod_footer/* +/modules/mod_languages/* +/modules/mod_login/* +/modules/mod_menu/* +/modules/mod_random_image/* +/modules/mod_related_items/* +/modules/mod_search/* +/modules/mod_stats/* +/modules/mod_syndicate/* +/modules/mod_tags_popular/* +/modules/mod_tags_similar/* +/modules/mod_users_latest/* +/modules/mod_whosonline/* +/modules/mod_wrapper/* +/modules/index.html +/plugins/actionlog/joomla/* +/plugins/authentication/cookie/* +/plugins/authentication/example/* +/plugins/authentication/gmail/* +/plugins/authentication/joomla/* +/plugins/authentication/ldap/* +/plugins/captcha/recaptcha/* +/plugins/captcha/recaptcha_invisible/* +/plugins/content/confirmconsent/* +/plugins/content/contact/* +/plugins/content/emailcloak/* +/plugins/content/example/* +/plugins/content/fields/* +/plugins/content/finder/* +/plugins/content/geshi/* +/plugins/content/joomla/* +/plugins/content/loadmodule/* +/plugins/content/pagebreak/* +/plugins/content/pagenavigation/* +/plugins/content/vote/* +/plugins/editors/codemirror/* +/plugins/editors/none/* +/plugins/editors/tinymce/* +/plugins/editors-xtd/article/* +/plugins/editors-xtd/contact/* +/plugins/editors-xtd/fields/* +/plugins/editors-xtd/image/* +/plugins/editors-xtd/menu/* +/plugins/editors-xtd/module/* +/plugins/editors-xtd/pagebreak/* +/plugins/editors-xtd/readmore/* +/plugins/extension/example/* +/plugins/extension/joomla/* +/plugins/fields/calendar/* +/plugins/fields/checkboxes/* +/plugins/fields/color/* +/plugins/fields/editor/* +/plugins/fields/imagelist/* +/plugins/fields/integer/* +/plugins/fields/list/* +/plugins/fields/media/* +/plugins/fields/radio/* +/plugins/fields/repeatable/* +/plugins/fields/sql/* +/plugins/fields/text/* +/plugins/fields/textarea/* +/plugins/fields/url/* +/plugins/fields/user/* +/plugins/fields/usergrouplist/* +/plugins/finder/categories/* +/plugins/finder/contacts/* +/plugins/finder/content/* +/plugins/finder/newsfeeds/* +/plugins/finder/tags/* +/plugins/installer/folderinstaller/* +/plugins/installer/packageinstaller/* +/plugins/installer/urlinstaller/* +/plugins/privacy/actionlogs/* +/plugins/privacy/consents/* +/plugins/privacy/contact/* +/plugins/privacy/content/* +/plugins/privacy/message/* +/plugins/privacy/user/* +/plugins/quickicon/extensionupdate/* +/plugins/quickicon/joomlaupdate/* +/plugins/quickicon/phpversioncheck/* +/plugins/quickicon/privacycheck/* +/plugins/quickicon/index.html +/plugins/sampledata/blog/* +/plugins/search/categories/* +/plugins/search/contacts/* +/plugins/search/content/* +/plugins/search/newsfeeds/* +/plugins/search/tags/* +/plugins/search/weblinks/* +/plugins/search/index.html +/plugins/system/actionlogs/* +/plugins/system/cache/* +/plugins/system/debug/* +/plugins/system/fields/* +/plugins/system/highlight/* +/plugins/system/languagecode/* +/plugins/system/languagefilter/* +/plugins/system/log/* +/plugins/system/logout/* +/plugins/system/logrotation/* +/plugins/system/p3p/* +/plugins/system/privacyconsent/* +/plugins/system/redirect/* +/plugins/system/remember/* +/plugins/system/sef/* +/plugins/system/sessiongc/* +/plugins/system/stats/* +/plugins/system/updatenotification/* +/plugins/system/index.html +/plugins/twofactorauth/totp/* +/plugins/twofactorauth/yubikey/* +/plugins/user/contactcreator/* +/plugins/user/example/* +/plugins/user/joomla/* +/plugins/user/profile/* +/plugins/user/terms/* +/plugins/user/index.html +/plugins/index.html +/templates/beez3/* +/templates/protostar/* +/templates/system/* +/templates/index.html +/tmp/* +/configuration.php +/htaccess.txt +/index.php +/joomla.xml +/LICENSE.txt +/README.txt +/robots.txt.dist +/web.config.txt + +### GitBook template +# Node rules: +## Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +## Dependency directory +## Commenting this out is preferred by some people, see +## https://docs.npmjs.com/misc/faq#should-i-check-my-node_modules-folder-into-git +node_modules + +# Book build output +_book + +# eBook build output +*.epub +*.mobi +*.pdf + +### Idris template +*.ibc +*.o + +### Symfony template +# Cache and logs (Symfony2) +/app/cache/* +/app/logs/* +!app/cache/.gitkeep +!app/logs/.gitkeep + +# Email spool folder +/app/spool/* + +# Cache, session files and logs (Symfony3) +/var/cache/* +/var/logs/* +/var/sessions/* +!var/cache/.gitkeep +!var/logs/.gitkeep +!var/sessions/.gitkeep + +# Logs (Symfony4) +/var/log/* +!var/log/.gitkeep + +# Parameters +/app/config/parameters.yml +/app/config/parameters.ini + +# Managed by Composer +/app/bootstrap.php.cache +/var/bootstrap.php.cache +/bin/* +!bin/console +!bin/symfony_requirements +/vendor/ + +# Assets and user uploads +/web/bundles/ +/web/uploads/ + +# PHPUnit +/app/phpunit.xml +/phpunit.xml + +# Build data +/build/ + +# Composer PHAR +/composer.phar + +# Backup entities generated with doctrine:generate:entities command +**/Entity/*~ + +# Embedded web-server pid file +/.web-server-pid + +### Magento template +#--------------------------# +# Magento Default Files # +#--------------------------# + +/PATCH_*.sh + +/app/etc/local.xml + +/media/* +!/media/.htaccess + +!/media/customer +/media/customer/* +!/media/customer/.htaccess + +!/media/dhl +/media/dhl/* +!/media/dhl/logo.jpg + +!/media/downloadable +/media/downloadable/* +!/media/downloadable/.htaccess + +!/media/xmlconnect +/media/xmlconnect/* + +!/media/xmlconnect/custom +/media/xmlconnect/custom/* +!/media/xmlconnect/custom/ok.gif + +!/media/xmlconnect/original +/media/xmlconnect/original/* +!/media/xmlconnect/original/ok.gif + +!/media/xmlconnect/system +/media/xmlconnect/system/* +!/media/xmlconnect/system/ok.gif + +/var/* +!/var/.htaccess + +!/var/package +/var/package/* +!/var/package/*.xml + + +### VisualStudio template +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +### ForceDotCom template +.project +.settings +salesforce.schema +Referenced Packages + +### Elixir template +/_build +/cover +/deps +/doc +/.fetch +erl_crash.dump +*.ez +*.beam +/config/*.secret.exs +.elixir_ls/ + +### Jigsaw template +# gitignore template for Jigsaw Static Site Generator +# +# website - https://jigsaw.tighten.co + +# Ignore build folder +build_* + +### CVS template +/CVS/* +**/CVS/* +.cvsignore +*/.cvsignore + +### C template +# Prerequisites +*.d + +# Object files +*.o +*.ko +*.obj +*.elf + +# Linker output +*.ilk +*.map +*.exp + +# Precompiled Headers +*.gch +*.pch + +# Libraries +*.lib +*.a +*.la +*.lo + +# Shared objects (inc. Windows DLLs) +*.dll +*.so +*.so.* +*.dylib + +# Executables +*.exe +*.out +*.app +*.i*86 +*.x86_64 +*.hex + +# Debug files +*.dSYM/ +*.su +*.idb +*.pdb + +# Kernel Module Compile Results +*.mod* +*.cmd +.tmp_versions/ +modules.order +Module.symvers +Mkfile.old +dkms.conf + +### Qt template +# C++ objects and libs +*.slo +*.lo +*.o +*.a +*.la +*.lai +*.so +*.so.* +*.dll +*.dylib + +# Qt-es +object_script.*.Release +object_script.*.Debug +*_plugin_import.cpp +/.qmake.cache +/.qmake.stash +*.pro.user +*.pro.user.* +*.qbs.user +*.qbs.user.* +*.moc +moc_*.cpp +moc_*.h +qrc_*.cpp +ui_*.h +*.qmlc +*.jsc +Makefile* +*build-* +*.qm +*.prl + +# Qt unit tests +target_wrapper.* + +# QtCreator +*.autosave + +# QtCreator Qml +*.qmlproject.user +*.qmlproject.user.* + +# QtCreator CMake +CMakeLists.txt.user* + +# QtCreator 4.8< compilation database +compile_commands.json + +# QtCreator local machine specific files for imported projects +*creator.user* + +*_qmlcache.qrc + +### D template +# Compiled Object files +*.o +*.obj + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Compiled Static libraries +*.a +*.lib + +# Executables +*.exe + +# DUB +.dub +docs.json +__dummy.html +docs/ + +# Code coverage +*.lst + +### Kate template +# Swap Files # +.*.kate-swp +.swp.* + +### PlayFramework template +# Ignore Play! working directory # +bin/ +/db +.eclipse +/lib/ +/logs/ +/modules +/project/project +/project/target +/target +tmp/ +test-result +server.pid +*.eml +/dist/ +.cache + +### Lithium template +libraries/* +resources/tmp/* + +### LyX template +# Ignore LyX backup and autosave files +# http://www.lyx.org/ +*.lyx~ +*.lyx# + +### SVN template +.svn/ + +### FlexBuilder template +bin/ +bin-debug/ +bin-release/ + +### Plone template +*.pyc +*.pyo +*.tmp* +*.mo +*.egg +*.EGG +*.egg-info +*.EGG-INFO +.*.cfg +bin/ +build/ +develop-eggs/ +downloads/ +eggs/ +fake-eggs/ +parts/ +dist/ +var/ + +### R template +# History files +.Rhistory +.Rapp.history + +# Session Data files +.RData + +# User-specific files +.Ruserdata + +# Example code in package build process +*-Ex.R + +# Output files from R CMD build +/*.tar.gz + +# Output files from R CMD check +/*.Rcheck/ + +# RStudio files +.Rproj.user/ + +# produced vignettes +vignettes/*.html +vignettes/*.pdf + +# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3 +.httr-oauth + +# knitr and R markdown default cache directories +*_cache/ +/cache/ + +# Temporary files created by R markdown +*.utf8.md +*.knit.md + +# R Environment Variables +.Renviron + +# pkgdown site +docs/ + +# translation temp files +po/*~ + +### Terraform template +# Local .terraform directories +**/.terraform/* + +# .tfstate files +*.tfstate +*.tfstate.* + +# Crash log files +crash.log + +# Exclude all .tfvars files, which are likely to contain sentitive data, such as +# password, private keys, and other secrets. These should not be part of version +# control as they are data points which are potentially sensitive and subject +# to change depending on the environment. +# +*.tfvars + +# Ignore override files as they are usually used to override resources locally and so +# are not checked in +override.tf +override.tf.json +*_override.tf +*_override.tf.json + +# Include override files you do wish to add to version control using negated pattern +# +# !example_override.tf + +# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan +# example: *tfplan* + +# Ignore CLI configuration files +.terraformrc +terraform.rc + +### Bazaar template +.bzr/ +.bzrignore + +### Dropbox template +# Dropbox settings and caches +.dropbox +.dropbox.attr +.dropbox.cache + +### PSoCCreator template +# Project Settings +*.cywrk.* +*.cyprj.* + +# Generated Assets and Resources +Debug/ +Release/ +Export/ +*/codegentemp +*/Generated_Source +*_datasheet.pdf +*_timing.html +*.cycdx +*.cyfit +*.rpt +*.svd +*.log +*.zip + +### Pimcore template +# gitignore template for Pimcore CMS + +# pimcore source files +/pimcore + +# asset files +/website/var/assets/* + +# backups +/website/var/backup/* + +# file cache +/website/var/cache/* + +# generated PHP classes, keep definition files (.psf) +/website/var/classes/Object* +!/website/var/classes/objectbricks + +# various configuration files +/website/var/config/system.xml +/website/var/config/cache.xml +/website/var/config/robots.txt +/website/var/config/Geo* +/website/var/config/object/* +/website/var/config/portal/* +/website/var/config/sqlreport/* + +# sent e-mail log files +/website/var/email/* + +# log files +/website/var/log/*.log + +# serialized recyclebin files +/website/var/recyclebin/* + +# search plugin +/website/var/search/* + +# various temp files +/website/var/system/* +/website/var/tmp/* + +# serialized version files +/website/var/versions/asset/* +/website/var/versions/document/* +/website/var/versions/object/* + +# user profile images +/website/var/user-image/* + +# keep .dummy files +!.dummy + +### Java template +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### SugarCRM template +## SugarCRM +# Ignore custom .htaccess stuff. +/.htaccess +# Ignore the cache directory completely. +# This will break the current behaviour. Which was often leading to +# the misuse of the repository as backup replacement. +# For development the cache directory can be safely ignored and +# therefore it is ignored. +/cache/* +!/cache/index.html +# Ignore some files and directories from the custom directory. +/custom/history/ +/custom/modulebuilder/ +/custom/working/ +/custom/modules/*/Ext/ +/custom/application/Ext/ +# Custom configuration should also be ignored. +/config.php +/config_override.php +# The silent upgrade scripts aren't needed. +/silentUpgrade*.php +# Logs files can safely be ignored. +*.log +# Ignore the new upload directories. +/upload/* +!/upload/index.html +/upload_backup/ + +### JEnv template +# JEnv local Java version configuration file +.java-version + +# Used by previous versions of JEnv +.jenv-version + +### Espresso template +*.esproj + +### Redcar template +.redcar + +### Stella template +# Atari 2600 (Stella) support for multiple assemblers +# - DASM +# - CC65 + +# Assembled binaries and object directories +obj/ +a.out +*.bin +*.a26 + +# Add in special Atari 7800-based binaries for good measure +*.a78 + +### Exercism template +# gitignore template for Exercism project +# website: https://exercism.io/ + +# Ignore .exercism folder which contain sensitive data +.exercism + +### Delphi template +# Uncomment these types if you want even more clean repository. But be careful. +# It can make harm to an existing project source. Read explanations below. +# +# Resource files are binaries containing manifest, project icon and version info. +# They can not be viewed as text or compared by diff-tools. Consider replacing them with .rc files. +#*.res +# +# Type library file (binary). In old Delphi versions it should be stored. +# Since Delphi 2009 it is produced from .ridl file and can safely be ignored. +#*.tlb +# +# Diagram Portfolio file. Used by the diagram editor up to Delphi 7. +# Uncomment this if you are not using diagrams or use newer Delphi version. +#*.ddp +# +# Visual LiveBindings file. Added in Delphi XE2. +# Uncomment this if you are not using LiveBindings Designer. +#*.vlb +# +# Deployment Manager configuration file for your project. Added in Delphi XE2. +# Uncomment this if it is not mobile development and you do not use remote debug feature. +#*.deployproj +# +# C++ object files produced when C/C++ Output file generation is configured. +# Uncomment this if you are not using external objects (zlib library for example). +#*.obj +# + +# Delphi compiler-generated binaries (safe to delete) +*.exe +*.dll +*.bpl +*.bpi +*.dcp +*.so +*.apk +*.drc +*.map +*.dres +*.rsm +*.tds +*.dcu +*.lib +*.a +*.o +*.ocx + +# Delphi autogenerated files (duplicated info) +*.cfg +*.hpp +*Resource.rc + +# Delphi local files (user-specific info) +*.local +*.identcache +*.projdata +*.tvsconfig +*.dsk + +# Delphi history and backups +__history/ +__recovery/ +*.~* + +# Castalia statistics file (since XE7 Castalia is distributed with Delphi) +*.stat + +# Boss dependency manager vendor folder https://github.com/HashLoad/boss +modules/ + +### CUDA template +*.i +*.ii +*.gpu +*.ptx +*.cubin +*.fatbin + +### Red template +# gitignore template for Red programming language +# website: http://www.red-lang.org/ + +# Red Compiled code +*.red + +# Libraries +crush.dll +crush.dylib +crush.so + +# Files generated during test +quick-test/quick-test.log +quick-test/runnable/ +system/tests/source/units/auto-tests/ +tests/source/units/auto-tests/ + +### NetBeans template +**/nbproject/private/ +**/nbproject/Makefile-*.mk +**/nbproject/Package-*.bash +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + +### Logtalk template +# gitignore template for LogTalk, a programming language that builds upon Prolog +# website: https://logtalk.org/ + +# Logtalk temporary file directories +.lgt_tmp/ +lgt_tmp/ + +# Logtalk default unit testing and doclet results and logs directories +logtalk_tester_logs/ +logtalk_doclet_logs/ + +# backend Prolog compiler temporary files +.pl-history +*.out +*.xwam +*.qo +*.ql +*.itf +*.po + +### Nanoc template +# For projects using Nanoc (http://nanoc.ws/) + +# Default location for output (needs to match output_dir's value found in nanoc.yaml) +output/ + +# Temporary file directory +tmp/nanoc/ + +# Crash Log +crash.log + +### AtmelStudio template +## Ignore Atmel Studio temporary files and build results +# https://www.microchip.com/mplab/avr-support/atmel-studio-7 + +# Atmel Studio is powered by an older version of Visual Studio, +# so most of the project and solution files are the same as VS files, +# only prefixed by an `at`. + +#Build Directories +[Dd]ebug/ +[Rr]elease/ + +#Build Results +*.o +*.d +*.eep +*.elf +*.hex +*.map +*.srec + +#User Specific Files +*.atsuo + +### ArchLinuxPackages template +*.tar +*.tar.* +*.jar +*.exe +*.msi +*.zip +*.tgz +*.log +*.log.* +*.sig + +pkg/ +src/ + +### Ada template +# Object file +*.o + +# Ada Library Information +*.ali + +### GPG template +secring.* + + +### Opa template +_build +_tracks + +opa-debug-js + +*.opp +*.opx +*.opx.broken +*.dump +*.api +*.api-txt +*.exe +*.log + +### Scheme template +*.ss~ +*.ss#* +.#*.ss + +*.scm~ +*.scm#* +.#*.scm + +### VirtualEnv template +# Virtualenv +# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/ +.Python +[Bb]in +[Ii]nclude +[Ll]ib +[Ll]ib64 +[Ll]ocal +[Ss]cripts +pyvenv.cfg +.venv +pip-selfcheck.json + +### Elm template +# elm-package generated files +elm-stuff +# elm-repl generated files +repl-temp-* + +### DM template +*.dmb +*.rsc +*.int +*.lk +*.zip + +### Umbraco template +## Ignore Umbraco files/folders generated for each instance +## +## Get latest from https://github.com/github/gitignore/blob/master/Umbraco.gitignore + +# Note: VisualStudio gitignore rules may also be relevant + +# Umbraco +# Ignore unimportant folders generated by Umbraco +**/App_Data/Logs/ +**/App_Data/[Pp]review/ +**/App_Data/TEMP/ +**/App_Data/NuGetBackup/ + +# Ignore Umbraco content cache file +**/App_Data/umbraco.config + +## this [Uu]mbraco/ folder should be created by cmd like `Install-Package UmbracoCms -Version 8.5.3` +## you can find your umbraco version at your Web.config. (i.e. ) +## Uncomment this line if you think it fits the way you work on your project. +## **/[Uu]mbraco/ + +# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder) +# Make sure to include details from VisualStudio.gitignore BEFORE this +!**/App_Data/[Pp]ackages/* +!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/* +!**/[Uu]mbraco/[Vv]iews/[Pp]ackages/* + +# ImageProcessor DiskCache +**/App_Data/cache/ + +# Ignore the Models Builder models out of date flag +**/App_Data/Models/ood.flag + +### Dreamweaver template +# DW Dreamweaver added files +_notes +_compareTemp +configs/ +dwsync.xml +dw_php_codehinting.config +*.mno + +### WordPress template +# ignore everything in the root except the "wp-content" directory. +!wp-content/ + +# ignore everything in the "wp-content" directory, except: +# "mu-plugins", "plugins", "themes" directory +wp-content/* +!wp-content/mu-plugins/ +!wp-content/plugins/ +!wp-content/themes/ + +# ignore these plugins +wp-content/plugins/hello.php + +# ignore specific themes +wp-content/themes/twenty*/ + +# ignore node dependency directories +node_modules/ + +# ignore log files and databases +*.log +*.sql +*.sqlite + +### Racket template +# gitignore template for the Racket language +# website: http://www.racket-lang.org/ + +# DrRacket autosave files +*.rkt~ +*.rkt.bak +\#*.rkt# +\#*.rkt#*# + +# Compiled racket bytecode +compiled/ +*.zo + +# Dependency tracking files +*.dep + +### SCons template +# for projects that use SCons for building: http://http://www.scons.org/ +.sconsign.dblite + +# When configure fails, SCons outputs these +config.log +.sconf_temp + +### DartEditor template +.project +.buildlog + +### Fancy template +*.rbc +*.fyc + +### Finale template +*.bak +*.db +*.avi +*.pdf +*.ps +*.mid +*.midi +*.mp3 +*.aif +*.wav +# Some versions of Finale have a bug and randomly save extra copies of +# the music source as " copy.mus" +*copy.mus + +### SketchUp template +*.skb + +### PureScript template +# Dependencies +.psci_modules +.spago +bower_components +node_modules + +# Generated files +.psci +output + +### EPiServer template +###################### +## EPiServer Files +###################### +*License.config + +### Grails template +# .gitignore for Grails 1.2 and 1.3 +# Although this should work for most versions of grails, it is +# suggested that you use the "grails integrate-with --git" command +# to generate your .gitignore file. + +# web application files +/web-app/WEB-INF/classes + +# default HSQL database files for production mode +/prodDb.* + +# general HSQL database files +*Db.properties +*Db.script + +# logs +/stacktrace.log +/test/reports +/logs + +# project release file +/*.war + +# plugin release files +/*.zip +/plugin.xml + +# older plugin install locations +/plugins +/web-app/plugins + +# "temporary" build files +/target + +### ZendFramework template +# Composer files +composer.phar +vendor/ + +# Local configs +config/autoload/*.local.php + +# Binary gettext files +*.mo + +# Data +data/logs/ +data/cache/ +data/sessions/ +data/tmp/ +temp/ + +#Doctrine 2 +data/DoctrineORMModule/Proxy/ +data/DoctrineORMModule/cache/ + +# Legacy ZF1 +demos/ +extras/documentation + +### Stata template +# .gitignore file for git projects containing Stata files +# Commercial statistical software: http://www.stata.com + +# Stata dataset and output files +*.dta +*.gph +*.log +*.smcl +*.stpr +*.stsem + +# Graphic export files from Stata +# Stata command graph export: http://www.stata.com/manuals14/g-2graphexport.pdf +# +# You may add graphic export files to your .gitignore. However you should be +# aware that this will exclude all image files from this main directory +# and subdirectories. +# *.ps +# *.eps +# *.wmf +# *.emf +# *.pdf +# *.png +# *.tif + +### Phalcon template +/cache/ +/config/development/ + +### Lilypond template +*.pdf +*.ps +*.midi +*.mid +*.log +*~ + +### OpenSSL template +# OpenSSL-related files best not committed + +## Certificate Authority +*.ca + +## Certificate +*.crt + +## Certificate Sign Request +*.csr + +## Certificate +*.der + +## Key database file +*.kdb + +## OSCP request data +*.org + +## PKCS #12 +*.p12 + +## PEM-encoded certificate data +*.pem + +## Random number seed +*.rnd + +## SSLeay data +*.ssleay + +## S/MIME message +*.smime + +### Packer template +# Cache objects +packer_cache/ + +# Crash log +crash.log + +# For built boxes +*.box + +### esp-idf template +# gitignore template for esp-idf, the official development framework for ESP32 +# https://github.com/espressif/esp-idf + +build/ +sdkconfig +sdkconfig.old + +### Linux template +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### CodeIgniter template +*/config/development +*/logs/log-*.php +!*/logs/index.html +*/cache/* +!*/cache/index.html +!*/cache/.htaccess + +user_guide_src/build/* +user_guide_src/cilexer/build/* +user_guide_src/cilexer/dist/* +user_guide_src/cilexer/pycilexer.egg-info/* + +#codeigniter 3 +application/logs/* +!application/logs/index.html +!application/logs/.htaccess +/vendor/ + +### Xojo template +# Xojo (formerly REALbasic and Real Studio) + +Builds* +*.debug +*.debug.app +Debug*.exe +Debug*/Debug*.exe +Debug*/Debug*\ Libs +*.rbuistate +*.xojo_uistate +*.obsolete + +### Ensime template +# Ensime specific +.ensime +.ensime_cache/ +.ensime_lucene/ + +### Sdcc template +# SDCC stuff +*.lnk +*.lst +*.map +*.mem +*.rel +*.rst +*.sym + +### Xilinx template +# gitignore template for Xilinx Vivado Design Suite +# website: https://www.xilinx.com/support/download.html + +# [home] +*.jou +*.log +*.debug +*.str +*.zip +*.tmp +*.rst +*.os +*.js +*.pb +*.dcp +*.hwdef +*.vds +*.veo +*.wdf +*.vdi +*.dmp +*.rpx +*.rpt +*_stub.v +*_stub.vhdl +*_funcsim.v +*_funcsim.vhdl +.project + +# [dir] +*.cache +.metadata +*.data +*.ipdefs +.Xil +*.sdk +*.hw +*.ip_user_files + +### IP synth +*_synth_* + +.jobs + +### project synth +*/*.runs/synth*/*.xml +*/*.runs/synth*/*.txt +*/*.runs/synth*/*.sh +*/*.runs/synth*/*.tcl +*/*.runs/synth*/*.bat +*/*.runs/synth*/*.xdc +!*/*.runs/synth*/*utilization*.rpt + +*.runs/synth*/*.xml +*.runs/synth*/*.txt +*.runs/synth*/*.sh +*.runs/synth*/*.tcl +*.runs/synth*/*.bat +*.runs/synth*/*.xdc +!*.runs/synth*/*utilization*.rpt + +### project impl +*/*.runs/impl*/*.xml +*/*.runs/impl*/*.html +*/*.runs/impl*/*.txt +*/*.runs/impl*/*.sh +*/*.runs/impl*/*.tcl +*/*.runs/impl*/*.bat +!*/*.runs/impl*/*utilization*.rpt + +*.runs/impl*/*.xml +*.runs/impl*/*.html +*.runs/impl*/*.txt +*.runs/impl*/*.sh +*.runs/impl*/*.tcl +*.runs/impl*/*.bat +!*.runs/impl*/*utilization*.rpt + +### block design +*/*/bd/*/hdl +*/*/*/bd/*/hdl + +*/*/bd/*/*.xdc +*/*/*/bd/*/*.xdc + +*/*/bd/*/ip/*/*.xdc +*/*/*/bd/*/ip/*/*.xdc + +*/*/bd/*/ip/*/*/ +*/*/*/bd/*/ip/*/*/ + +*/*/bd/*/ip/*/*.vhd +*/*/*/bd/*/ip/*/*.vhd + +*/*/bd/*/ip/*/*.xml +*/*/*/bd/*/ip/*/*.xml + +*.c +*.h +*.vho +*.html +*/*/bd/*/ip/*/*.tcl +*/*/*/bd/*/ip/*/*.tcl +hw_handoff +ipshared + +### Waf template +# For projects that use the Waf build system: https://waf.io/ +# Dot-hidden on Unix-like systems +.waf-*-*/ +.waf3-*-*/ +# Hidden directory on Windows (no dot) +waf-*-*/ +waf3-*-*/ +# Lockfile +.lock-waf_*_build + +### Patch template +*.orig +*.rej + +### Cloud9 template +# Cloud9 IDE - http://c9.io +.c9revisions +.c9 + +### Mercurial template +.hg/ +.hgignore +.hgsigs +.hgsub +.hgsubstate +.hgtags + +### Laravel template +/vendor/ +node_modules/ +npm-debug.log +yarn-error.log + +# Laravel 4 specific +bootstrap/compiled.php +app/storage/ + +# Laravel 5 & Lumen specific +public/storage +public/hot + +# Laravel 5 & Lumen specific with changed public path +public_html/storage +public_html/hot + +storage/*.key +.env +Homestead.yaml +Homestead.json +/.vagrant +.phpunit.result.cache + +### Processing template +.DS_Store +applet +application.linux-arm64 +application.linux-armv6hf +application.linux32 +application.linux64 +application.windows32 +application.windows64 +application.macosx +out + +### CodeKit template +# General CodeKit files to ignore +config.codekit +config.codekit3 +/min + +### Smalltalk template +# changes file +*.changes +*.chg + +# system image +*.image +*.img7 +*.img + +# Pharo Smalltalk Debug log file +PharoDebug.log + +# Squeak Smalltalk Debug log file +SqueakDebug.log + +# Dolphin Smalltalk source file +*.sml + +# Dolphin Smalltalk error file +*.errors + +# Monticello package cache +/package-cache + +# playground cache +/play-cache +/play-stash + +# Metacello-github cache +/github-cache +github-*.zip + +### BricxCC template +# Bricx Command Center IDE +# http://bricxcc.sourceforge.net +*.bak +*.sym + +### Phoenix template +# gitignore template for Phoenix projects +# website: http://www.phoenixframework.org/ +# +# Recommended template: Elixir.gitignore + +# Temporary files +/tmp + +# Static artifacts +/node_modules +/assets/node_modules + +# Since we are building assets from web/static, +# we ignore priv/static. You may want to comment +# this depending on your deployment strategy. +/priv/static/ + +# Installer-related files +/installer/_build +/installer/tmp +/installer/doc +/installer/deps + +### SeamGen template +/bootstrap/data +/bootstrap/tmp +/classes/ +/dist/ +/exploded-archives/ +/test-build/ +/test-output/ +/test-report/ +/target/ +temp-testng-customsuite.xml + +# based on http://stackoverflow.com/a/8865858/422476 I am removing inline comments + +#/classes/ all class files +#/dist/ contains generated war files for deployment +#/exploded-archives/ war content generation during deploy (or explode) +#/test-build/ test compilation (ant target for Seam) +#/test-output/ test results +#/test-report/ test report generation for, e.g., Hudson +#/target/ maven output folder +#temp-testng-customsuite.xml generated when running test cases under Eclipse + +# Thanks to @VonC and @kraftan for their helpful answers on a related question +# on StackOverflow.com: +# http://stackoverflow.com/questions/4176687 +# /what-is-the-recommended-source-control-ignore-pattern-for-seam-projects + +### Scrivener template +*/Files/binder.autosave +*/Files/binder.backup +*/Files/search.indexes +*/Files/user.lock +*/Files/Docs/docs.checksum +*/Files/Data/docs.checksum +*/QuickLook/ +*/Settings/ui.plist + +### C++ template +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +### JBoss template +jboss/server/all/deploy/project.ext +jboss/server/default/deploy/project.ext +jboss/server/minimal/deploy/project.ext +jboss/server/all/log/*.log +jboss/server/all/tmp/**/* +jboss/server/all/data/**/* +jboss/server/all/work/**/* +jboss/server/default/log/*.log +jboss/server/default/tmp/**/* +jboss/server/default/data/**/* +jboss/server/default/work/**/* +jboss/server/minimal/log/*.log +jboss/server/minimal/tmp/**/* +jboss/server/minimal/data/**/* +jboss/server/minimal/work/**/* + +# deployed package files # + +*.DEPLOYED + +### Meteor template +# gitignore template for the Meteor framework +# website: https://www.meteor.com/ +# +# Recommended template: Node.gitignore + +# protect api keys in setting json +settings-production.json +settings.json + +# protect your mup.json settings +mup.json +mup.js + +### CraftCMS template +# Craft 2 Storage (https://craftcms.com/support/craft-storage-gitignore) +# not necessary for Craft 3 (https://github.com/craftcms/craft/issues/26) +/craft/storage/* +!/craft/storage/rebrand + +### Concrete5 template +# ignore the error log and .htaccess and others +error_log +.htaccess + +# concrete5 5.6 specific + +config/site.php +files/cache/* +files/tmp/* + +# concrete5 5.7 specific + +# ignore everything but the index.html +/application/files/* +!/application/files/index.html + +# ignore updates folder +/updates/* + +# ignore sitemap.xml +/sitemap.xml + +### Autotools template +# http://www.gnu.org/software/automake + +Makefile.in +/ar-lib +/mdate-sh +/py-compile +/test-driver +/ylwrap +.deps/ +.dirstamp + +# http://www.gnu.org/software/autoconf + +autom4te.cache +/autoscan.log +/autoscan-*.log +/aclocal.m4 +/compile +/config.guess +/config.h.in +/config.log +/config.status +/config.sub +/configure +/configure.scan +/depcomp +/install-sh +/missing +/stamp-h1 + +# https://www.gnu.org/software/libtool/ + +/ltmain.sh + +# http://www.gnu.org/software/texinfo + +/texinfo.tex + +# http://www.gnu.org/software/m4/ + +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 + +# Generated Makefile +# (meta build system like autotools, +# can automatically generate from config.status script +# (which is called by configure script)) +Makefile + +### NWjs template +# gitignore template for NW.js projects +# website: https://nwjs.io/ + +# Seen in standard and sdk versions +credits.html +locales/ +libEGL.dll +libGLEv2.dll +node.dll +nw.dll +nw.exe +natives_blob.bin +nw_100_percent.pak +nw_200_percent.pak +nw_elf.dll +snapshot_blob.bin +resources.pak + +# Seen only in standard +d3dcompiler_47.dll +ffmpeg.dll +icudtl.dat + +# Seen only in sdk +pnacl/ +chromedriver.exe +nacl_irt_x86_64.nexe +nwjc.exe +payload.exe + +### Hugo template +# Generated files by hugo +/public/ +/resources/_gen/ + +# Executable may be added to repository +hugo.exe +hugo.darwin +hugo.linux + +### Splunk template +# gitignore template for Splunk apps +# documentation: http://docs.splunk.com/Documentation/Splunk/6.2.3/admin/Defaultmetaconf + +# Splunk local meta file +local.meta + +# Splunk local folder +local + +### Cordova template +# gitignore template for the Cordova framework +# website: https://cordova.apache.org/ +# +# Recommended template: Node.gitignore + +# App platform binaries and built files +/platforms + +# Optional to ignore plugin Git clones +#/plugins + +### Mercury template +Mercury/ +Mercury.modules +*.mh +*.err +*.init +*.dll +*.exe +*.a +*.so +*.dylib +*.beams +*.d +*.c_date + +### LabVIEW template +# Libraries +*.lvlibp +*.llb + +# Shared objects (inc. Windows DLLs) +*.dll +*.so +*.so.* +*.dylib + +# Executables +*.exe + +# Metadata +*.aliases +*.lvlps +.cache/ + +### Maven template +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar + +### MonoDevelop template +#User Specific +*.userprefs +*.usertasks + +#Mono Project Files +*.pidb +*.resources +test-results/ + +### VisualStudioCode template +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +### CMake template +CMakeLists.txt.user +CMakeCache.txt +CMakeFiles +CMakeScripts +Testing +Makefile +cmake_install.cmake +install_manifest.txt +compile_commands.json +CTestTestfile.cmake +_deps + +### Magento2 template +/sitemap +/sitemap.xml +/pub/sitemap +/pub/sitemap.xml +/app/config_sandbox +/app/etc/config.php +/app/etc/env.php +/app/code/Magento/TestModule* +/lib/internal/flex/uploader/.actionScriptProperties +/lib/internal/flex/uploader/.flexProperties +/lib/internal/flex/uploader/.project +/lib/internal/flex/uploader/.settings +/lib/internal/flex/varien/.actionScriptProperties +/lib/internal/flex/varien/.flexLibProperties +/lib/internal/flex/varien/.project +/lib/internal/flex/varien/.settings +/.grunt +/.php_cs.cache +/grunt-config.json +/dev/tools/grunt/configs/local-themes.js + +/pub/media/*.* +!/pub/media/.htaccess +/pub/media/attribute/* +!/pub/media/attribute/.htaccess +/pub/media/analytics/* +/pub/media/catalog/* +!/pub/media/catalog/.htaccess +/pub/media/customer/* +!/pub/media/customer/.htaccess +/pub/media/downloadable/* +!/pub/media/downloadable/.htaccess +/pub/media/favicon/* +/pub/media/import/* +!/pub/media/import/.htaccess +/pub/media/logo/* +/pub/media/theme/* +/pub/media/theme_customization/* +!/pub/media/theme_customization/.htaccess +/pub/media/wysiwyg/* +!/pub/media/wysiwyg/.htaccess +/pub/media/tmp/* +!/pub/media/tmp/.htaccess +/pub/media/captcha/* +!/pub/media/captcha/.htaccess +/pub/static/* +!/pub/static/.htaccess + +/var/* +!/var/.htaccess +/vendor/* +!/vendor/.htaccess +/generated/* +!/generated/.htaccess + +### Eclipse template +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ +.apt_generated_test/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +# Uncomment this line if you wish to ignore the project description file. +# Typically, this file would be tracked if it contains build/dependency configurations: +#.project + +### Magento1 template +# gitignore template for Magento v1 projects +# +# It is recommended that you use `Magento.gitignore` as this is the latest version + +/PATCH_*.sh + +/app/etc/local.xml + +/media/* +!/media/.htaccess + +!/media/customer +/media/customer/* +!/media/customer/.htaccess + +!/media/dhl +/media/dhl/* +!/media/dhl/logo.jpg + +!/media/downloadable +/media/downloadable/* +!/media/downloadable/.htaccess + +!/media/xmlconnect +/media/xmlconnect/* + +!/media/xmlconnect/custom +/media/xmlconnect/custom/* +!/media/xmlconnect/custom/ok.gif + +!/media/xmlconnect/original +/media/xmlconnect/original/* +!/media/xmlconnect/original/ok.gif + +!/media/xmlconnect/system +/media/xmlconnect/system/* +!/media/xmlconnect/system/ok.gif + +/var/* +!/var/.htaccess + +!/var/package +/var/package/* +!/var/package/*.xml + + +### Go template +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories (remove the comment below to include it) +# vendor/ + +### PuTTY template +# Private key +*.ppk + +### MATLAB template +# Windows default autosave extension +*.asv + +# OSX / *nix default autosave extension +*.m~ + +# Compiled MEX binaries (all platforms) +*.mex* + +# Packaged app and toolbox files +*.mlappinstall +*.mltbx + +# Generated helpsearch folders +helpsearch*/ + +# Simulink code generation folders +slprj/ +sccprj/ + +# Matlab code generation folders +codegen/ + +# Simulink autosave extension +*.autosave + +# Simulink cache files +*.slxc + +# Octave session info +octave-workspace + +### RhodesRhomobile template +rholog-* +sim-* +bin/libs +bin/RhoBundle +bin/tmp +bin/target +bin/*.ap_ +*.o +*.jar + +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### OpenCart template +.htaccess +/config.php +admin/config.php + +!index.html + +download/ +image/data/ +image/cache/ +system/cache/ +system/logs/ + +system/storage/ + +# vQmod log files +vqmod/logs/* +# vQmod cache files +vqmod/vqcache/* +vqmod/checked.cache +vqmod/mods.cache + +### OCaml template +*.annot +*.cmo +*.cma +*.cmi +*.a +*.o +*.cmx +*.cmxs +*.cmxa + +# ocamlbuild working directory +_build/ + +# ocamlbuild targets +*.byte +*.native + +# oasis generated files +setup.data +setup.log + +# Merlin configuring file for Vim and Emacs +.merlin + +# Dune generated files +*.install + +# Local OPAM switch +_opam/ + +### Haskell template +dist +dist-* +cabal-dev +*.o +*.hi +*.hie +*.chi +*.chs.h +*.dyn_o +*.dyn_hi +.hpc +.hsenv +.cabal-sandbox/ +cabal.sandbox.config +*.prof +*.aux +*.hp +*.eventlog +.stack-work/ +cabal.project.local +cabal.project.local~ +.HTF/ +.ghc.environment.* + +### Prestashop template +# Cache, temp and personal files + +/.htaccess +*.log + +# Cache +/cache/* +!/cache/.htaccess +!/cache/cachefs/index.php +!/cache/deprecated.txt +!/cache/index.php +!/cache/purifier/index.php +!/cache/push/activity +!/cache/push/index.php +!/cache/push/trends +!/cache/sandbox/index.php +!/cache/smarty/cache/index.php +!/cache/smarty/compile/index.php +!/cache/smarty/index.php +!/cache/tcpdf/index.php + +# Download +/download/* +!/download/.htaccess +!/download/index.php + +# Images +/img/* +!/img/.htaccess +!/img/index.php +!/img/404.gif +!/img/bg_500.png +!/img/bg_loader.png +!/img/favicon.ico +!/img/loader.gif +!/img/loadingAnimation.gif +!/img/logo.jpg +!/img/logo.png +!/img/logo_invoice.jpg +!/img/logo_stores.png +!/img/macFFBgHack.png +!/img/prestashop-avatar.png +!/img/prestashop@2x.png +!/img/preston-login-wink@2x.png +!/img/preston-login@2x.png +!/img/questionmark.png +!/img/genders/index.php +!/img/admin/index.php +!/img/c/index.php +!/img/cms/index.php +!/img/co/index.php +!/img/jquery-ui +!/img/l/index.php +!/img/m/index.php +!/img/os/index.php +!/img/p/index.php +!/img/s/index.php +!/img/scenes +!/img/st/index.php +!/img/su/index.php +!/img/t/index.php +!/img/tmp/index.php + +# Upload +/upload/* +!/upload/.htaccess + +/vendor/* +/docs/phpdoc-sf/ +/composer.lock +*.hot-update.js +*.hot-update.json + + +/admin-dev/autoupgrade/* +!/admin-dev/autoupgrade/index.php +!/admin-dev/autoupgrade/backup/index.php + +/admin-dev/backups/* +!/admin-dev/backups/.htaccess + +/admin-dev/import/* +!/admin-dev/import/.htaccess +!/admin-dev/import/index.php + +/admin-dev/export/* +!/admin-dev/export/.htaccess +!/admin-dev/export/index.php + +# Downloaded RTL files +/admin-dev/themes/default/css/bundle/default_rtl.css +/admin-dev/themes/default/css/bundle/shared_rtl.css +/admin-dev/themes/default/css/font_rtl.css +/admin-dev/themes/default/css/overrides_rtl.css +/admin-dev/themes/default/css/vendor/font-awesome/font-awesome_rtl.css +/admin-dev/themes/default/css/vendor/nv.d3_rtl.css +/admin-dev/themes/default/css/vendor/titatoggle-min_rtl.css +/admin-dev/themes/default/public/theme_rtl.css +/admin-dev/themes/new-theme/css/module/drop_rtl.css +/admin-dev/themes/new-theme/css/right-sidebar_rtl.css + +themes/*/cache/* + +# Config + +config/settings.inc.php +config/settings.old.php +config/xml/* +config/themes/* +!config/xml/themes/default.xml +themes/*/config/settings_*.json +app/config/parameters.old.yml +app/config/config.php + +# Themes, modules and overrides + +modules/* +override/* +themes/*/ +!themes/classic +!themes/_core +!themes/_libraries + +# Vendors and dependencies + +bower_components/ +node_modules/ +composer.phar +php-cs-fixer +.grunt/* + +# Translations and emails templates + +translations/* +mails/* +!mails/themes/ +!mails/_partials/ +themes/default-bootstrap/lang/* +themes/default-bootstrap/modules/*/translations/*.php +themes/default-bootstrap/mails/* +!themes/default-bootstrap/mails/en/ +themes/default-bootstrap/modules/*/mails/* +!themes/default-bootstrap/modules/*/mails/en + +# MISC + +*sitemap.xml +/robots.txt + +# Symfony + +/bin/ +/app/Resources/geoip/GeoLite2-City.mmdb +/app/Resources/translations/* +!/app/Resources/translations/default +/app/config/parameters.yml +/app/config/parameters.php +/build/ +/phpunit.xml +/var/* +!/var/cache +/var/cache/* +!var/cache/.gitkeep +!/var/logs +/var/logs/* +!var/logs/.gitkeep +!/var/sessions +/var/sessions/* +!var/sessions/.gitkeep +!var/SymfonyRequirements.php +/vendor/ +/web/bundles/ + + +### TortoiseGit template +# Project-level settings +/.tgitconfig + +### Nikola template +# gitignore template for Nikola static site generator +# website: https://getnikola.com/ + +.doit.db +*.py[cod] +cache/ +output/ + +### Perl template +!Build/ +.last_cover_stats +/META.yml +/META.json +/MYMETA.* +*.o +*.pm.tdy +*.bs + +# Devel::Cover +cover_db/ + +# Devel::NYTProf +nytprof.out + +# Dizt::Zilla +/.build/ + +# Module::Build +_build/ +Build +Build.bat + +# Module::Install +inc/ + +# ExtUtils::MakeMaker +/blib/ +/_eumm/ +/*.gz +/Makefile +/Makefile.old +/MANIFEST.bak +/pm_to_blib +/*.zip + +### JENKINS_HOME template +# Learn more about Jenkins and JENKINS_HOME directory for which this file is +# intended. +# +# http://jenkins-ci.org/ +# https://wiki.jenkins-ci.org/display/JENKINS/Administering+Jenkins +# +# Note: secret.key is purposefully not tracked by git. This should be backed up +# separately because configs may contain secrets which were encrypted using the +# secret.key. To back up secrets use 'tar -czf /tmp/secrets.tgz secret*' and +# save the file separate from your repository. If you want secrets backed up +# with configuration, then see the bottom of this file for an example. + +# Ignore all JENKINS_HOME except jobs directory, root xml config, and +# .gitignore file. +/* +!/jobs +!/.gitignore +!/*.xml + +# Ignore all files in jobs subdirectories except for folders. +# Note: git doesn't track folders, only file content. +jobs/** +!jobs/**/ + +# Uncomment the following line to save next build numbers with config. + +#!jobs/**/nextBuildNumber + +# For performance reasons, we want to ignore builds in Jenkins jobs because it +# contains many tiny files on large installations. This can impact git +# performance when running even basic commands like 'git status'. +builds +indexing + +# Exclude only config.xml files in repository subdirectories. +!config.xml + +# Don't track workspaces (when users build on the master). +jobs/**/*workspace + +# Security warning: If secrets are included with your configuration, then an +# adversary will be able to decrypt all encrypted secrets within Jenkins +# config. Including secrets is a bad practice, but the example is included in +# case someone still wants it for convenience. Uncomment the following line to +# include secrets for decryption with repository configuration in Git. + +#!/secret* + +# As a result, only Jenkins settings and job config.xml files in JENKINS_HOME +# will be tracked by git. + +### KDevelop4 template +*.kdev4 +.kdev4/ + +### ExtJs template +.architect +bootstrap.css +bootstrap.js +bootstrap.json +bootstrap.jsonp +build/ +classic.json +classic.jsonp +ext/ +modern.json +modern.jsonp +resources/sass/.sass-cache/ +resources/.arch-internal-preview.css +.arch-internal-preview.css + +### Drupal template +# gitignore template for Drupal 8 projects +# +# earlier versions of Drupal are tracked in `community/PHP/` + +# Ignore configuration files that may contain sensitive information +/sites/*/*settings*.php +/sites/*/*services*.yml + +# Ignore paths that may contain user-generated content +/sites/*/files +/sites/*/public +/sites/*/private +/sites/*/files-public +/sites/*/files-private + +# Ignore paths that may contain temporary files +/sites/*/translations +/sites/*/tmp +/sites/*/cache + +# Ignore testing related files +/sites/simpletest + +# Ignore drupal core (if not versioning drupal sources) +/core +/vendor +/modules/README.txt +/profiles/README.txt +/themes/README.txt +/sites/README.txt +/sites/example.sites.php +/sites/example.settings.local.php +/sites/development.services.yml +/.csslintrc +/.editorconfig +/.eslintignore +/.eslintrc.json +/.gitattributes +/.ht.router.php +/.htaccess +/autoload.php +/example.gitignore +/index.php +/INSTALL.txt +/LICENSE.txt +/README.txt +/robots.txt +/update.php +/web.config + +### SlickEdit template +# SlickEdit workspace and project files are ignored by default because +# typically they are considered to be developer-specific and not part of a +# project. +*.vpw +*.vpj + +# SlickEdit workspace history and tag files always contain user-specific +# data so they should not be stored in a repository. +*.vpwhistu +*.vpwhist +*.vtg + +### Emacs template +# -*- mode: gitignore; -*- +*~ +\#*\# +/.emacs.desktop +/.emacs.desktop.lock +*.elc +auto-save-list +tramp +.\#* + +# Org-mode +.org-id-locations +*_archive + +# flymake-mode +*_flymake.* + +# eshell files +/eshell/history +/eshell/lastdir + +# elpa packages +/elpa/ + +# reftex files +*.rel + +# AUCTeX auto folder +/auto/ + +# cask packages +.cask/ +dist/ + +# Flycheck +flycheck_*.el + +# server auth directory +/server/ + +# projectiles files +.projectile + +# directory configuration +.dir-locals.el + +# network security +/network-security.data + + +### Yii template +assets/* +!assets/.gitignore +protected/runtime/* +!protected/runtime/.gitignore +protected/data/*.db +themes/classic/views/ + +### AppEngine template +# Google App Engine generated folder +appengine-generated/ + +### KiCad template +# For PCBs designed using KiCad: http://www.kicad-pcb.org/ +# Format documentation: http://kicad-pcb.org/help/file-formats/ + +# Temporary files +*.000 +*.bak +*.bck +*.kicad_pcb-bak +*.kicad_sch-bak +*.kicad_prl +*.sch-bak +*~ +_autosave-* +*.tmp +*-save.pro +*-save.kicad_pcb +fp-info-cache + +# Netlist files (exported from Eeschema) +*.net + +# Autorouter files (exported from Pcbnew) +*.dsn +*.ses + +# Exported BOM files +*.xml +*.csv + +### Swift template +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +build/ +DerivedData/ +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 + +## Obj-C/Swift specific +*.hmap + +## App packaging +*.ipa +*.dSYM.zip +*.dSYM + +## Playgrounds +timeline.xctimeline +playground.xcworkspace + +# Swift Package Manager +# +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +# Packages/ +# Package.pins +# Package.resolved +# *.xcodeproj +# +# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata +# hence it is not needed unless you have added a package configuration file to your project +# .swiftpm + +.build/ + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +# Pods/ +# +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build/ + +# Accio dependency management +Dependencies/ +.accio/ + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. +# Instead, use fastlane to re-generate the screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ + +### Calabash template +# Calabash / Cucumber +rerun/ +reports/ +screenshots/ +screenshot*.png +test-servers/ + +# bundler +.bundle +vendor + +### LemonStand template +boot.php +index.php +install.php +/config/* +!/config/config.php +/controllers/* +/init/* +/logs/* +/phproad/* +/temp/* +/uploaded/* +/installer_files/* +/modules/backend/* +/modules/blog/* +/modules/cms/* +/modules/core/* +/modules/session/* +/modules/shop/* +/modules/system/* +/modules/users/* +# add content_*.php if you don't want erase client changes to content + +### Jekyll template +_site/ +.sass-cache/ +.jekyll-cache/ +.jekyll-metadata + +### Xcode template +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +build/ +DerivedData/ +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 + +## Gcc Patch +/*.gcno + +### Metals template + # Generated Metals (Scala Language Server) files + # Reference: https://scalameta.org/metals/ +.metals/ +.bloop/ +project/metals.sbt + +### Lazarus template +# Lazarus compiler-generated binaries (safe to delete) +*.exe +*.dll +*.so +*.dylib +*.lrs +*.res +*.compiled +*.dbg +*.ppu +*.o +*.or +*.a + +# Lazarus autogenerated files (duplicated info) +*.rst +*.rsj +*.lrt + +# Lazarus local files (user-specific info) +*.lps + +# Lazarus backups and unit output folders. +# These can be changed by user in Lazarus/project options. +backup/ +*.bak +lib/ + +# Application bundle for Mac OS +*.app/ + +### Drupal7 template +# gitignore template for Drupal 7 projects +# +# It is recommended that you use `Drupal.gitignore` as this is the latest version + +# Ignore configuration files that may contain sensitive information. +sites/*/*settings*.php +sites/example.sites.php + +# Ignore paths that contain generated content. +files/ +sites/*/files +sites/*/private +sites/*/translations + +# Ignore default text files +robots.txt +/CHANGELOG.txt +/COPYRIGHT.txt +/INSTALL*.txt +/LICENSE.txt +/MAINTAINERS.txt +/UPGRADE.txt +/README.txt +sites/README.txt +sites/all/libraries/README.txt +sites/all/modules/README.txt +sites/all/themes/README.txt + +# Ignore everything but the "sites" folder ( for non core developer ) +.htaccess +web.config +authorize.php +cron.php +index.php +install.php +update.php +xmlrpc.php +/includes +/misc +/modules +/profiles +/scripts +/themes + +### Objective-C template +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +build/ +DerivedData/ +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 + +## Obj-C/Swift specific +*.hmap + +## App packaging +*.ipa +*.dSYM.zip +*.dSYM + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +# Pods/ +# +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build/ + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. +# Instead, use fastlane to re-generate the screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ + +### Textpattern template +.htaccess +css.php +rpc/ +sites/site*/admin/ +sites/site*/private/ +sites/site*/public/admin/ +sites/site*/public/setup/ +sites/site*/public/theme/ +textpattern/ +HISTORY.txt +README.txt + +### Agda template +*.agdai +MAlonzo/** + +### Godot template +# Godot-specific ignores +.import/ +export.cfg +export_presets.cfg + +# Imported translations (automatically generated from CSV files) +*.translation + +# Mono-specific ignores +.mono/ +data_*/ + +### macOS template +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Composer template +composer.phar +/vendor/ + +# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +# composer.lock + +### Coq template +.*.aux +.*.d +*.a +*.cma +*.cmi +*.cmo +*.cmx +*.cmxa +*.cmxs +*.glob +*.ml.d +*.ml4.d +*.mli.d +*.mllib.d +*.mlpack.d +*.native +*.o +*.v.d +*.vio +*.vo +*.vok +*.vos +.coq-native/ +.csdp.cache +.lia.cache +.nia.cache +.nlia.cache +.nra.cache +csdp.cache +lia.cache +nia.cache +nlia.cache +nra.cache + +# generated timing files +*.timing.diff +*.v.after-timing +*.v.before-timing +*.v.timing +time-of-build-after.log +time-of-build-before.log +time-of-build-both.log +time-of-build-pretty.log + +### GWT template +*.class + +# Package Files # +*.jar +*.war + +# gwt caches and compiled units # +war/gwt_bree/ +gwt-unitCache/ + +# boilerplate generated classes # +.apt_generated/ + +# more caches and things from deploy # +war/WEB-INF/deploy/ +war/WEB-INF/classes/ + +#compilation logs +.gwt/ + +#gwt junit compilation files +www-test/ + +#old GWT (1.5) created this dir +.gwt-tmp/ + +### Otto template +.otto/ + +### Vue template +# gitignore template for Vue.js projects +# +# Recommended template: Node.gitignore + +# TODO: where does this rule come from? +docs/_book + +# TODO: where does this rule come from? +test/ + +### Sass template +.sass-cache/ +*.css.map +*.sass.map +*.scss.map + +### Kotlin template +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Julia template +# Files generated by invoking Julia with --code-coverage +*.jl.cov +*.jl.*.cov + +# Files generated by invoking Julia with --track-allocation +*.jl.mem + +# System-specific files and directories generated by the BinaryProvider and BinDeps packages +# They contain absolute paths specific to the host computer, and so should not be committed +deps/deps.jl +deps/build.log +deps/downloads/ +deps/usr/ +deps/src/ + +# Build artifacts for creating documentation generated by the Documenter package +docs/build/ +docs/site/ + +# File generated by Pkg, the package manager, based on a corresponding Project.toml +# It records a fixed state of all packages used by the project. As such, it should not be +# committed for packages, but should be committed for applications that require a static +# environment. +Manifest.toml + +### Puppet template +# gitignore template for Puppet modules +# website: https://forge.puppet.com/ + +# Built packages +pkg/* + +# Should run on multiple platforms so don't check in +Gemfile.lock + +# Tests +spec/fixtures/* +coverage/* + +# Third-party +vendor/* +.bundle/* + +### JDeveloper template +# default application storage directory used by the IDE Performance Cache feature +.data/ + +# used for ADF styles caching +temp/ + +# default output directories +classes/ +deploy/ +javadoc/ + +# lock file, a part of Oracle Credential Store Framework +cwallet.sso.lck +### Virtuoso template +# Gitignore for Cadence Virtuoso +################################################################ + +# Log files +*.log +panic*.log.* + +# OpenAccess database lock files +*.cdslck* + +# Run directories for layout vs. schematic and design rule check +lvsRunDir/* +drcRunDir/* + +# Abstract generation tool +abstract.log* +abstract.record* + + +### NotepadPP template +# Notepad++ backups # +*.bak + +### IAR_EWARM template +# gitignore template for the IAR EWARM +# website: https://www.iar.com/ + +# Some tools will put the EWARM files +# under a subdirectory with the same name +# as the configuration. +# Example +# EWARM/Config1/Obj /List /Exe +# EWARM/Config2/Obj /List /Exe +EWARM/**/Obj +EWARM/**/List +EWARM/**/Exe + +# Autogenerated project files +*.dep +*.ewt + +# Autogenerated folder for debugger +EWARM/settings + +### EiffelStudio template +# The compilation directory +EIFGENs + +### Bitrix template +# gitignore template for 1C-Bitrix, a PHP-based CMS +# website: https://www.1c-bitrix.ru + +#Exclude all of core files +/bitrix/* + +#But not the templates and non bitrix components +!/bitrix/templates +!/bitrix/components +/bitrix/components/bitrix + +#Exclude bitrix gadgets +!/bitrix/gadgets +/bitrix/gadgets/bitrix + +#User can use that directory to store some stuff, but it's not really recommended, just use /local instead of this +!/bitrix/php_interface/ + +#Exclude database configs +/bitrix/php_interface/dbconn.php + +#Exclude default file storage directory +/upload/ + +### WebMethods template +**/IntegrationServer/datastore/ +**/IntegrationServer/db/ +**/IntegrationServer/DocumentStore/ +**/IntegrationServer/lib/ +**/IntegrationServer/logs/ +**/IntegrationServer/replicate/ +**/IntegrationServer/sdk/ +**/IntegrationServer/support/ +**/IntegrationServer/update/ +**/IntegrationServer/userFtpRoot/ +**/IntegrationServer/web/ +**/IntegrationServer/WmRepository4/ +**/IntegrationServer/XAStore/ +**/IntegrationServer/packages/Wm*/ + +### TurboGears2 template +*.py[co] + +# Default development database +devdata.db + +# Default data directory +data/* + +# Packages +*.egg +*.egg-info +dist +build + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +### Fortran template +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +### Vagrant template +# General +.vagrant/ + +# Log files (if you are creating logs in debug mode, uncomment this) +# *.log + +### ThinkPHP template +# gitignore template for ThinkPHP v3.2.3 +# website: http://www.thinkphp.cn/ + +# Logs and Cache files +/Application/Runtime/ + +# Common configure file +/Application/Common/Conf/config.php +### Example user template template +### Example user template + +# IntelliJ project files +.idea +*.iml +out +gen +### Typo3 template +## TYPO3 v6.2 +# Ignore several upload and file directories. +/fileadmin/user_upload/ +/fileadmin/_temp_/ +/fileadmin/_processed_/ +/uploads/ +# Ignore cache +/typo3conf/temp_CACHED* +/typo3conf/temp_fieldInfo.php +/typo3conf/deprecation_*.log +/typo3conf/ENABLE_INSTALL_TOOL +/typo3conf/realurl_autoconf.php +/FIRST_INSTALL +# Ignore system folders, you should have them symlinked. +# If not comment out the following entries. +/typo3 +/typo3_src +/typo3_src-* +/Packages +/.htaccess +/index.php +# Ignore temp directory. +/typo3temp/ + +### CodeSniffer template +# gitignore for the PHP Codesniffer framework +# website: https://github.com/squizlabs/PHP_CodeSniffer +# +# Recommended template: PHP.gitignore + +/wpcs/* + +### Archives template +# It's better to unpack these files and commit the raw source because +# git has its own built in compression methods. +*.7z +*.jar +*.rar +*.zip +*.gz +*.gzip +*.tgz +*.bzip +*.bzip2 +*.bz2 +*.xz +*.lzma +*.cab +*.xar + +# Packing-only formats +*.iso +*.tar + +# Package management formats +*.dmg +*.xpi +*.gem +*.egg +*.deb +*.rpm +*.msi +*.msm +*.msp +*.txz + +### UnrealEngine template +# Visual Studio 2015 user specific files +.vs/ + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app +*.ipa + +# These project files can be generated by the engine +*.xcodeproj +*.xcworkspace +*.sln +*.suo +*.opensdf +*.sdf +*.VC.db +*.VC.opendb + +# Precompiled Assets +SourceArt/**/*.png +SourceArt/**/*.tga + +# Binary Files +Binaries/* +Plugins/*/Binaries/* + +# Builds +Build/* + +# Whitelist PakBlacklist-.txt files +!Build/*/ +Build/*/** +!Build/*/PakBlacklist*.txt + +# Don't ignore icon files in Build +!Build/**/*.ico + +# Built data for maps +*_BuiltData.uasset + +# Configuration files generated by the Editor +Saved/* + +# Compiled source files for the engine to use +Intermediate/* +Plugins/*/Intermediate/* + +# Cache files for the editor to use +DerivedDataCache/* + +### FuelPHP template +# the composer package lock file and install directory +# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +# /composer.lock +/fuel/vendor + +# the fuelphp document +/docs/ + +# you may install these packages with `oil package`. +# http://fuelphp.com/docs/packages/oil/package.html +# /fuel/packages/auth/ +# /fuel/packages/email/ +# /fuel/packages/oil/ +# /fuel/packages/orm/ +# /fuel/packages/parser/ + +# dynamically generated files +/fuel/app/logs/*/*/* +/fuel/app/cache/*/* +/fuel/app/config/crypt.php + +### SynopsysVCS template +# Waveform formats +*.vcd +*.vpd +*.evcd +*.fsdb + +# Default name of the simulation executable. A different name can be +# specified with this switch (the associated daidir database name is +# also taken from here): -o / +simv + +# Generated for Verilog and VHDL top configs +simv.daidir/ +simv.db.dir/ + +# Infrastructure necessary to co-simulate SystemC models with +# Verilog/VHDL models. An alternate directory may be specified with this +# switch: -Mdir= +csrc/ + +# Log file - the following switch allows to specify the file that will be +# used to write all messages from simulation: -l +*.log + +# Coverage results (generated with urg) and database location. The +# following switch can also be used: urg -dir .vdb +simv.vdb/ +urgReport/ + +# DVE and UCLI related files. +DVEfiles/ +ucli.key + +# When the design is elaborated for DirectC, the following file is created +# with declarations for C/C++ functions. +vc_hdrs.h + +### Python template +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +### Elisp template +# Compiled +*.elc + +# Packaging +.cask + +# Backup files +*~ + +# Undo-tree save-files +*.~undo-tree + +### Momentics template +# Built files +x86/ +arm/ +arm-p/ +translations/*.qm + +# IDE settings +.settings/ + +### VVVV template + +# .v4p backup files +*~.xml + +# Dynamic plugins .dll +bin/ + +### Octave template +# Windows default autosave extension +*.asv + +# OSX / *nix default autosave extension +*.m~ + +# Compiled MEX binaries (all platforms) +*.mex* + +# Packaged app and toolbox files +*.mlappinstall +*.mltbx + +# Generated helpsearch folders +helpsearch*/ + +# Simulink code generation folders +slprj/ +sccprj/ + +# Matlab code generation folders +codegen/ + +# Simulink autosave extension +*.autosave + +# Simulink cache files +*.slxc + +# Octave session info +octave-workspace + +### Qooxdoo template +cache +cache-downloads +inspector +api +source/inspector.html + +### Android template +# Built application files +*.apk +*.aar +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +# Uncomment the following line in case you need and you don't have the release build type files in your app +# release/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +# Android Studio 3 in .gitignore file. +.idea/caches +.idea/modules.xml +# Comment next line if keeping position of elements in Navigation Editor is relevant for you +.idea/navEditor.xml + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild +.cxx/ + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md + +# Version control +vcs.xml + +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ + +# Android Profiling +*.hprof + +### Rails template +*.rbc +capybara-*.html +.rspec +/db/*.sqlite3 +/db/*.sqlite3-journal +/db/*.sqlite3-[0-9]* +/public/system +/coverage/ +/spec/tmp +*.orig +rerun.txt +pickle-email-*.html + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# TODO Comment out this rule if you are OK with secrets being uploaded to the repo +config/initializers/secret_token.rb +config/master.key + +# Only include if you have production secrets in this file, which is no longer a Rails default +# config/secrets.yml + +# dotenv, dotenv-rails +# TODO Comment out these rules if environment variables can be committed +.env +.env.* + +## Environment normalization: +/.bundle +/vendor/bundle + +# these should all be checked in to normalize the environment: +# Gemfile.lock, .ruby-version, .ruby-gemset + +# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: +.rvmrc + +# if using bower-rails ignore default bower_components path bower.json files +/vendor/assets/bower_components +*.bowerrc +bower.json + +# Ignore pow environment settings +.powenv + +# Ignore Byebug command history file. +.byebug_history + +# Ignore node_modules +node_modules/ + +# Ignore precompiled javascript packs +/public/packs +/public/packs-test +/public/assets + +# Ignore yarn files +/yarn-error.log +yarn-debug.log* +.yarn-integrity + +# Ignore uploaded files in development +/storage/* +!/storage/.keep +/public/uploads + +### Unity template +# This .gitignore file should be placed at the root of your Unity project directory +# +# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore +# +/[Ll]ibrary/ +/[Tt]emp/ +/[Oo]bj/ +/[Bb]uild/ +/[Bb]uilds/ +/[Ll]ogs/ +/[Uu]ser[Ss]ettings/ + +# MemoryCaptures can get excessive in size. +# They also could contain extremely sensitive data +/[Mm]emoryCaptures/ + +# Asset meta data should only be ignored when the corresponding asset is also ignored +!/[Aa]ssets/**/*.meta + +# Uncomment this line if you wish to ignore the asset store tools plugin +# /[Aa]ssets/AssetStoreTools* + +# Autogenerated Jetbrains Rider plugin +/[Aa]ssets/Plugins/Editor/JetBrains* + +# Visual Studio cache directory +.vs/ + +# Gradle cache directory +.gradle/ + +# Autogenerated VS/MD/Consulo solution and project files +ExportedObj/ +.consulo/ +*.csproj +*.unityproj +*.sln +*.suo +*.tmp +*.user +*.userprefs +*.pidb +*.booproj +*.svd +*.pdb +*.mdb +*.opendb +*.VC.db + +# Unity3D generated meta files +*.pidb.meta +*.pdb.meta +*.mdb.meta + +# Unity3D generated file on crash reports +sysinfo.txt + +# Builds +*.apk +*.aab +*.unitypackage + +# Crashlytics generated file +crashlytics-build.properties + +# Packed Addressables +/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin* + +# Temporary auto-generated Android Assets +/[Aa]ssets/[Ss]treamingAssets/aa.meta +/[Aa]ssets/[Ss]treamingAssets/aa/* + +### SymphonyCMS template +manifest/cache/ +manifest/logs/ +manifest/tmp/ +symphony/ +workspace/uploads/ +install-log.txt + +### XilinxISE template +# intermediate build files +*.bgn +*.bit +*.bld +*.cmd_log +*.drc +*.ll +*.lso +*.msd +*.msk +*.ncd +*.ngc +*.ngd +*.ngr +*.pad +*.par +*.pcf +*.prj +*.ptwx +*.rbb +*.rbd +*.stx +*.syr +*.twr +*.twx +*.unroutes +*.ut +*.xpi +*.xst +*_bitgen.xwbt +*_envsettings.html +*_map.map +*_map.mrp +*_map.ngm +*_map.xrpt +*_ngdbuild.xrpt +*_pad.csv +*_pad.txt +*_par.xrpt +*_summary.html +*_summary.xml +*_usage.xml +*_xst.xrpt + +# iMPACT generated files +_impactbatch.log +impact.xsl +impact_impact.xwbt +ise_impact.cmd +webtalk_impact.xml + +# Core Generator generated files +xaw2verilog.log + +# project-wide generated files +*.gise +par_usage_statistics.html +usage_statistics_webtalk.html +webtalk.log +webtalk_pn.xml + +# generated folders +iseconfig/ +xlnx_auto_0_xdb/ +xst/ +_ngo/ +_xmsgs/ + +### ROS template +devel/ +logs/ +build/ +bin/ +lib/ +msg_gen/ +srv_gen/ +msg/*Action.msg +msg/*ActionFeedback.msg +msg/*ActionGoal.msg +msg/*ActionResult.msg +msg/*Feedback.msg +msg/*Goal.msg +msg/*Result.msg +msg/_*.py +build_isolated/ +devel_isolated/ + +# Generated by dynamic reconfigure +*.cfgc +/cfg/cpp/ +/cfg/*.py + +# Ignore generated docs +*.dox +*.wikidoc + +# eclipse stuff +.project +.cproject + +# qcreator stuff +CMakeLists.txt.user + +srv/_*.py +*.pcd +*.pyc +qtcreator-* +*.user + +/planning/cfg +/planning/docs +/planning/src + +*~ + +# Emacs +.#* + +# Catkin custom files +CATKIN_IGNORE + +### Ansible template +*.retry + +### Kohana template +application/cache/* +application/logs/* + +### Zephir template +# Cache files, generates by Zephir +.temp/ +.libs/ + +# Object files, generates by linker +*.lo +*.la +*.o +*.loT + +# Files generated by configure and Zephir, +# not required for extension compilation. +ext/build/ +ext/modules/ +ext/Makefile* +ext/config* +ext/acinclude.m4 +ext/aclocal.m4 +ext/autom4te* +ext/install-sh +ext/ltmain.sh +ext/missing +ext/mkinstalldirs +ext/run-tests.php +ext/.deps +ext/libtool + +### SAM template +# gitignore template for AWS Serverless Application Model project +# website: https://docs.aws.amazon.com/serverless-application-model + +# Ignore build folder +.aws-sam/ + +### Dart template +# See https://www.dartlang.org/guides/libraries/private-files + +# Files and directories created by pub +.dart_tool/ +.packages +build/ +# If you're building an application, you may want to check-in your pubspec.lock +pubspec.lock + +# Directory created by dartdoc +# If you don't generate documentation locally you can remove this line. +doc/api/ + +# Avoid committing generated Javascript files: +*.dart.js +*.info.json # Produced by the --dump-info flag. +*.js # When generated by dart2js. Don't specify *.js if your + # project includes source files written in JavaScript. +*.js_ +*.js.deps +*.js.map + +.flutter-plugins +.flutter-plugins-dependencies + +### MetaProgrammingSystem template +workspace.xml +junitvmwatcher*.properties +build.properties + +# generated java classes and java source files +# manually add any custom artifacts that can't be generated from the models +# http://confluence.jetbrains.com/display/MPSD25/HowTo+--+MPS+and+Git +classes_gen +source_gen +source_gen.caches + +# generated test code and test results +test_gen +test_gen.caches +TEST-*.xml +junit*.properties + +### Gcov template +# gcc coverage testing tool files + +*.gcno +*.gcda +*.gcov + +### Kentico template +# gitignore template for using Kentico CMS +# website: http://www.kentico.com/ +# +# Recommended template: VisualStudio.gitignore + +# Include some Kentico folders excluded by Visual Studio rules +!CMS/CMSAdminControls/*/ +!CMS/CMSModules/System/*/ +!CMS/App_Data/CIRepository/** + +# Kentico temporary/environment files +CMS/App_Data/AzureCache +CMS/App_Data/AzureTemp +CMS/App_Data/CMSModules/DeviceProfile/logFiftyOne.txt +CMS/App_Data/CMSModules/DeviceProfiles/logFiftyOne.txt +CMS/App_Data/CMSModules/WebFarm/webfarm.sync +CMS/App_Data/CMSTemp +CMS/App_Data/Persistent +CMS/CMSSiteUtils/Export +CMS/CMSSiteUtils/Import + +# Ignore all smart search indexes, but not the other system folder contents +CMS/App_Data/CMSModules/SmartSearch/** +!CMS/App_Data/CMSModules/SmartSearch/*/ +!CMS/App_Data/CMSModules/SmartSearch/_StopWords/** +!CMS/App_Data/CMSModules/SmartSearch/_Synonyms/** + +## Kentico Starter Sites +# Starter site resource Files +CMS/App_Data/DancingGoat + +# Starter site web templates +CMS/App_Data/Templates/CommunitySite +CMS/App_Data/Templates/CorporateSite +CMS/App_Data/Templates/DancingGoat +CMS/App_Data/Templates/EcommerceSite +CMS/App_Data/Templates/IntranetPortal +CMS/App_Data/Templates/PersonalSite + +# Starter site app themes +CMS/App_Themes/CommunitySite +CMS/App_Themes/CorporateSite +CMS/App_Themes/EcommerceSite +CMS/App_Themes/IntranetPortal* +CMS/App_Themes/PersonalSite + +# Starter site ASPX templates +CMS/CMSTemplates/CorporateSite + +# Starter site media libraries +CMS/CommunitySite +CMS/CorporateSite +CMS/DancingGoat +CMS/EcommerceSite +CMS/IntranetPortal +CMS/PersonalSite + +## Project specific ignores +# Sensitive settings +AppSettings.config +ConnectionStrings.config + +# Project media libraries (recommend shared file storage) +# e.g. CMS/{SiteCodeName} + +### InforCMS template +# gitignore template for InforCRM (formerly SalesLogix) +# website: https://www.infor.com/product-summary/cx/infor-crm/ +# +# Recommended: VisualStudio.gitignore + +# Ignore model files that are auto-generated +ModelIndex.xml +ExportedFiles.xml + +# Ignore deployment files +[Mm]odel/[Dd]eployment + +# Force include portal SupportFiles +!Model/Portal/*/SupportFiles/[Bb]in/ +!Model/Portal/PortalTemplates/*/SupportFiles/[Bb]in + +### Backup template +*.bak +*.gho +*.ori +*.orig +*.tmp + +### Windows template +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +### Snap template +# gitginore template for creating Snap packages +# website: https://snapcraft.io/ + +parts/ +prime/ +stage/ +*.snap + +# Snapcraft global state tracking data(automatically generated) +# https://forum.snapcraft.io/t/location-to-save-global-state/768 +/snap/.snapcraft/ + +# Source archive packed by `snapcraft cleanbuild` before pushing to the LXD container +/*_source.tar.bz2 + +### SublimeText template +# Cache files for Sublime Text +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache + +# Workspace files are user-specific +*.sublime-workspace + +# Project files should be checked into the repository, unless a significant +# proportion of contributors will probably not be using Sublime Text +# *.sublime-project + +# SFTP configuration file +sftp-config.json +sftp-config-alt*.json + +# Package control specific files +Package Control.last-run +Package Control.ca-list +Package Control.ca-bundle +Package Control.system-ca-bundle +Package Control.cache/ +Package Control.ca-certs/ +Package Control.merged-ca-bundle +Package Control.user-ca-bundle +oscrypto-ca-bundle.crt +bh_unicode_properties.cache + +# Sublime-github package stores a github token in this file +# https://packagecontrol.io/packages/sublime-github +GitHub.sublime-settings + +### ChefCookbook template +.vagrant +/cookbooks + +# Bundler +bin/* +.bundle/* + +.kitchen/ +.kitchen.local.yml + +### Lua template +# Compiled Lua sources +luac.out + +# luarocks build files +*.src.rock +*.zip +*.tar.gz + +# Object files +*.o +*.os +*.ko +*.obj +*.elf + +# Precompiled Headers +*.gch +*.pch + +# Libraries +*.lib +*.a +*.la +*.lo +*.def +*.exp + +# Shared objects (inc. Windows DLLs) +*.dll +*.so +*.so.* +*.dylib + +# Executables +*.exe +*.out +*.app +*.i*86 +*.x86_64 +*.hex + + +### CakePHP template +# CakePHP 3 + +/vendor/* +/config/app.php + +/tmp/cache/models/* +!/tmp/cache/models/empty +/tmp/cache/persistent/* +!/tmp/cache/persistent/empty +/tmp/cache/views/* +!/tmp/cache/views/empty +/tmp/sessions/* +!/tmp/sessions/empty +/tmp/tests/* +!/tmp/tests/empty + +/logs/* +!/logs/empty + +# CakePHP 2 + +/app/tmp/* +/app/Config/core.php +/app/Config/database.php +/vendors/* + +### LibreOffice template +# LibreOffice locks +.~lock.*# + +### Ruby template +*.gem +*.rbc +/.config +/coverage/ +/InstalledFiles +/pkg/ +/spec/reports/ +/spec/examples.txt +/test/tmp/ +/test/version_tmp/ +/tmp/ + +# Used by dotenv library to load environment variables. +# .env + +# Ignore Byebug command history file. +.byebug_history + +## Specific to RubyMotion: +.dat* +.repl_history +build/ +*.bridgesupport +build-iPhoneOS/ +build-iPhoneSimulator/ + +## Specific to RubyMotion (use of CocoaPods): +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +# vendor/Pods/ + +## Documentation cache and generated files: +/.yardoc/ +/_yardoc/ +/doc/ +/rdoc/ + +## Environment normalization: +/.bundle/ +/vendor/bundle +/lib/bundler/man/ + +# for a library or gem, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# Gemfile.lock +# .ruby-version +# .ruby-gemset + +# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: +.rvmrc + +# Used by RuboCop. Remote config files pulled in from inherit_from directive. +# .rubocop-https?--* + +### Raku template +# Gitignore for Raku (https://raku.org) +# As part of https://github.com/github/gitignore + +# precompiled files +.precomp +lib/.precomp + + +### ExpressionEngine template +.DS_Store + +# Images +images/avatars/ +images/captchas/ +images/smileys/ +images/member_photos/ +images/signature_attachments/ +images/pm_attachments/ + +# For security do not publish the following files +system/expressionengine/config/database.php +system/expressionengine/config/config.php + +# Caches +sized/ +thumbs/ +_thumbs/ +*/expressionengine/cache/* + +### OracleForms template +# Compiled Form Modules +*.fmx + +# Compiled Menu Modules +*.mmx + +# Compiled Pre-Linked Libraries +*.plx + +### SBT template +# Simple Build Tool +# http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control + +dist/* +target/ +lib_managed/ +src_managed/ +project/boot/ +project/plugins/project/ +.history +.cache +.lib/ + +### Scala template +*.class +*.log + +### TeX template +## Core latex/pdflatex auxiliary files: +*.aux +*.lof +*.log +*.lot +*.fls +*.out +*.toc +*.fmt +*.fot +*.cb +*.cb2 +.*.lb + +## Intermediate documents: +*.dvi +*.xdv +*-converted-to.* +# these rules might exclude image files for figures etc. +# *.ps +# *.eps +# *.pdf + +## Generated if empty string is given at "Please type another file name for output:" +.pdf + +## Bibliography auxiliary files (bibtex/biblatex/biber): +*.bbl +*.bcf +*.blg +*-blx.aux +*-blx.bib +*.run.xml + +## Build tool auxiliary files: +*.fdb_latexmk +*.synctex +*.synctex(busy) +*.synctex.gz +*.synctex.gz(busy) +*.pdfsync + +## Build tool directories for auxiliary files +# latexrun +latex.out/ + +## Auxiliary and intermediate files from other packages: +# algorithms +*.alg +*.loa + +# achemso +acs-*.bib + +# amsthm +*.thm + +# beamer +*.nav +*.pre +*.snm +*.vrb + +# changes +*.soc + +# comment +*.cut + +# cprotect +*.cpt + +# elsarticle (documentclass of Elsevier journals) +*.spl + +# endnotes +*.ent + +# fixme +*.lox + +# feynmf/feynmp +*.mf +*.mp +*.t[1-9] +*.t[1-9][0-9] +*.tfm + +#(r)(e)ledmac/(r)(e)ledpar +*.end +*.?end +*.[1-9] +*.[1-9][0-9] +*.[1-9][0-9][0-9] +*.[1-9]R +*.[1-9][0-9]R +*.[1-9][0-9][0-9]R +*.eledsec[1-9] +*.eledsec[1-9]R +*.eledsec[1-9][0-9] +*.eledsec[1-9][0-9]R +*.eledsec[1-9][0-9][0-9] +*.eledsec[1-9][0-9][0-9]R + +# glossaries +*.acn +*.acr +*.glg +*.glo +*.gls +*.glsdefs +*.lzo +*.lzs + +# uncomment this for glossaries-extra (will ignore makeindex's style files!) +# *.ist + +# gnuplottex +*-gnuplottex-* + +# gregoriotex +*.gaux +*.gtex + +# htlatex +*.4ct +*.4tc +*.idv +*.lg +*.trc +*.xref + +# hyperref +*.brf + +# knitr +*-concordance.tex +# TODO Uncomment the next line if you use knitr and want to ignore its generated tikz files +# *.tikz +*-tikzDictionary + +# listings +*.lol + +# luatexja-ruby +*.ltjruby + +# makeidx +*.idx +*.ilg +*.ind + +# minitoc +*.maf +*.mlf +*.mlt +*.mtc[0-9]* +*.slf[0-9]* +*.slt[0-9]* +*.stc[0-9]* + +# minted +_minted* +*.pyg + +# morewrites +*.mw + +# nomencl +*.nlg +*.nlo +*.nls + +# pax +*.pax + +# pdfpcnotes +*.pdfpc + +# sagetex +*.sagetex.sage +*.sagetex.py +*.sagetex.scmd + +# scrwfile +*.wrt + +# sympy +*.sout +*.sympy +sympy-plots-for-*.tex/ + +# pdfcomment +*.upa +*.upb + +# pythontex +*.pytxcode +pythontex-files-*/ + +# tcolorbox +*.listing + +# thmtools +*.loe + +# TikZ & PGF +*.dpth +*.md5 +*.auxlock + +# todonotes +*.tdo + +# vhistory +*.hst +*.ver + +# easy-todo +*.lod + +# xcolor +*.xcp + +# xmpincl +*.xmpi + +# xindy +*.xdy + +# xypic precompiled matrices and outlines +*.xyc +*.xyd + +# endfloat +*.ttt +*.fff + +# Latexian +TSWLatexianTemp* + +## Editors: +# WinEdt +*.bak +*.sav + +# Texpad +.texpadtmp + +# LyX +*.lyx~ + +# Kile +*.backup + +# gummi +.*.swp + +# KBibTeX +*~[0-9]* + +# TeXnicCenter +*.tps + +# auto folder when using emacs and auctex +./auto/* +*.el + +# expex forward references with \gathertags +*-tags.tex + +# standalone packages +*.sta + +# Makeindex log files +*.lpz + +# xwatermark package +*.xwm + +# REVTeX puts footnotes in the bibliography by default, unless the nofootinbib +# option is specified. Footnotes are the stored in a file with suffix Notes.bib. +# Uncomment the next line to have this generated file ignored. +#*Notes.bib + +### Redis template +# Ignore redis binary dump (dump.rdb) files + +*.rdb + +### AppceleratorTitanium template +# Build folder and log file +build/ +build.log + +### Anjuta template +# Local configuration folder and symbol database +/.anjuta/ +/.anjuta_sym_db.db + +### Nim template +nimcache/ +nimblecache/ +htmldocs/ + +### TextMate template +*.tmproj +*.tmproject +tmtags + +### CFWheels template +# unpacked plugin folders +plugins/**/* + +# files directory where uploads go +files + +# DBMigrate plugin: generated SQL +db/sql + +# AssetBundler plugin: generated bundles +javascripts/bundles +stylesheets/bundles + +### ModelSim template +# ignore ModelSim generated files and directories (temp files and so on) +[_@]* + +# ignore compilation output of ModelSim +*.mti +*.dat +*.dbs +*.psm +*.bak +*.cmp +*.jpg +*.html +*.bsf + +# ignore simulation output of ModelSim +wlf* +*.wlf +*.vstf +*.ucdb +cov*/ +transcript* +sc_dpiheader.h +vsim.dbg + +### Actionscript template +# Build and Release Folders +bin-debug/ +bin-release/ +[Oo]bj/ +[Bb]in/ + +# Other files and folders +.settings/ + +# Executables +*.swf +*.air +*.ipa +*.apk + +# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties` +# should NOT be excluded as they contain compiler settings and other important +# information for Eclipse / Flash Builder. + +### Gradle template +.gradle +**/build/ +!src/**/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Vim template +# Swap +[._]*.s[a-v][a-z] +!*.svg # comment out if you don't need vector files +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim +Sessionx.vim + +# Temporary +.netrwhist +*~ +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ + From bcd81273461ecf2d399d085bfaf3cc8977301095 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Wed, 9 Nov 2022 20:31:47 +0000 Subject: [PATCH 10/77] Revert "Added .gitignore for all Rider related plugins" This reverts commit ab922824e2c830c514a74999790788cd4eda8560. --- .gitignore | 6519 +--------------------------------------------------- 1 file changed, 1 insertion(+), 6518 deletions(-) diff --git a/.gitignore b/.gitignore index 7ac8fb4..402f5d5 100644 --- a/.gitignore +++ b/.gitignore @@ -182,6521 +182,4 @@ fabric.properties .idea *.iml out -gen### Diff template -*.patch -*.diff - -### Node template -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* - -### Leiningen template -pom.xml -pom.xml.asc -*.jar -*.class -/lib/ -/classes/ -/target/ -/checkouts/ -.lein-deps-sum -.lein-repl-history -.lein-plugins/ -.lein-failures -.nrepl-port -.cpcache/ - -### Erlang template -.eunit -*.o -*.beam -*.plt -erl_crash.dump -.concrete/DEV_MODE - -# rebar 2.x -.rebar -rel/example_project -ebin/*.beam -deps - -# rebar 3 -.rebar3 -_build/ -_checkouts/ - -### MicrosoftOffice template -*.tmp - -# Word temporary -~$*.doc* - -# Word Auto Backup File -Backup of *.doc* - -# Excel temporary -~$*.xls* - -# Excel Backup File -*.xlk - -# PowerPoint temporary -~$*.ppt* - -# Visio autosave temporary files -*.~vsd* - -### Yeoman template -node_modules/ -bower_components/ -*.log - -build/ -dist/ - -### Ninja template -.ninja_deps -.ninja_log - -### JupyterNotebooks template -# gitignore template for Jupyter Notebooks -# website: http://jupyter.org/ - -.ipynb_checkpoints -*/.ipynb_checkpoints/* - -# IPython -profile_default/ -ipython_config.py - -# Remove previous ipynb_checkpoints -# git rm -r .ipynb_checkpoints/ - -### Eagle template -# Ignore list for Eagle, a PCB layout tool - -# Backup files -*.s#? -*.b#? -*.l#? -*.b$? -*.s$? -*.l$? - -# Eagle project file -# It contains a serial number and references to the file structure -# on your computer. -# comment the following line if you want to have your project file included. -eagle.epf - -# Autorouter files -*.pro -*.job - -# CAM files -*.$$$ -*.cmp -*.ly2 -*.l15 -*.sol -*.plc -*.stc -*.sts -*.crc -*.crs - -*.dri -*.drl -*.gpi -*.pls -*.ger -*.xln - -*.drd -*.drd.* - -*.s#* -*.b#* - -*.info - -*.eps - -# file locks introduced since 7.x -*.lck - -### Tags template -# Ignore tags created by etags, ctags, gtags (GNU global) and cscope -TAGS -.TAGS -!TAGS/ -tags -.tags -!tags/ -gtags.files -GTAGS -GRTAGS -GPATH -GSYMS -cscope.files -cscope.out -cscope.in.out -cscope.po.out - - -### Clojure template -pom.xml -pom.xml.asc -*.jar -*.class -/lib/ -/classes/ -/target/ -/checkouts/ -.lein-deps-sum -.lein-repl-history -.lein-plugins/ -.lein-failures -.nrepl-port -.cpcache/ - -### JBoss4 template -# gitignore for JBoss v4 projects - -/server/all/data -/server/all/log -/server/all/tmp -/server/all/work -/server/default/data -/server/default/log -/server/default/tmp -/server/default/work -/server/minimal/data -/server/minimal/log -/server/minimal/tmp -/server/minimal/work - -# Note: -# there may be other directories that contain *.xml.failed or *.war.failed files -/server/default/deploy/*.xml.failed -/server/default/deploy/*.war.failed - -### IGORPro template -# Avoid including Experiment files: they can be created and edited locally to test the ipf files -*.pxp -*.pxt -*.uxp -*.uxt - -### JBoss6 template -# gitignore for JBoss v6 projects -# -# Note: to ensure empty directories remain part of the repository, like -# `/server/minimal/lib`, you should add an empty `.gitignore` or `.gitkeep` file -# to the directory - otherwise you may have issues when starting the service. - -/server/all/data -/server/all/log -/server/all/tmp -/server/all/work -/server/default/data -/server/default/log -/server/default/tmp -/server/default/work -/server/minimal/data -/server/minimal/log -/server/minimal/tmp -/server/minimal/work -/server/jbossweb-standalone/data -/server/jbossweb-standalone/log -/server/jbossweb-standalone/tmp -/server/jbossweb-standalone/work -/server/standard/data -/server/standard/log -/server/standard/tmp -/server/standard/work -/server/default/deploy/*.jar.failed -/server/default/deploy/*.jar.dodeploy -/server/default/deploy/*.xml.failed -/server/default/deploy/*.xml.dodeploy -/server/default/deploy/*.war.failed -/server/default/deploy/*.war.dodeploy - - -### Rust template -# Generated by Cargo -# will have compiled files and executables -debug/ -target/ - -# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries -# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html -Cargo.lock - -# These are backup files generated by rustfmt -**/*.rs.bk - -### Images template -# JPEG -*.jpg -*.jpeg -*.jpe -*.jif -*.jfif -*.jfi - -# JPEG 2000 -*.jp2 -*.j2k -*.jpf -*.jpx -*.jpm -*.mj2 - -# JPEG XR -*.jxr -*.hdp -*.wdp - -# Graphics Interchange Format -*.gif - -# RAW -*.raw - -# Web P -*.webp - -# Portable Network Graphics -*.png - -# Animated Portable Network Graphics -*.apng - -# Multiple-image Network Graphics -*.mng - -# Tagged Image File Format -*.tiff -*.tif - -# Scalable Vector Graphics -*.svg -*.svgz - -# Portable Document Format -*.pdf - -# X BitMap -*.xbm - -# BMP -*.bmp -*.dib - -# ICO -*.ico - -# 3D Images -*.3dm -*.max - -### Bazel template -# gitignore template for Bazel build system -# website: https://bazel.build/ - -# Ignore all bazel-* symlinks. There is no full list since this can change -# based on the name of the directory bazel is cloned into. -/bazel-* - -### CommonLisp template -*.FASL -*.fasl -*.lisp-temp -*.dfsl -*.pfsl -*.d64fsl -*.p64fsl -*.lx64fsl -*.lx32fsl -*.dx64fsl -*.dx32fsl -*.fx64fsl -*.fx32fsl -*.sx64fsl -*.sx32fsl -*.wx64fsl -*.wx32fsl - -### GNOMEShellExtension template -# Ignored files for GNOME extension git repository - -*.zip - -### Joomla template -/.htaccess -/administrator/cache/* -/administrator/components/com_actionlogs/* -/administrator/components/com_admin/* -/administrator/components/com_ajax/* -/administrator/components/com_associations/* -/administrator/components/com_banners/* -/administrator/components/com_cache/* -/administrator/components/com_categories/* -/administrator/components/com_checkin/* -/administrator/components/com_config/* -/administrator/components/com_contact/* -/administrator/components/com_content/* -/administrator/components/com_contenthistory/* -/administrator/components/com_cpanel/* -/administrator/components/com_fields/* -/administrator/components/com_finder/* -/administrator/components/com_installer/* -/administrator/components/com_joomlaupdate/* -/administrator/components/com_languages/* -/administrator/components/com_login/* -/administrator/components/com_media/* -/administrator/components/com_menus/* -/administrator/components/com_messages/* -/administrator/components/com_modules/* -/administrator/components/com_newsfeeds/* -/administrator/components/com_plugins/* -/administrator/components/com_postinstall/* -/administrator/components/com_privacy/* -/administrator/components/com_redirect/* -/administrator/components/com_search/* -/administrator/components/com_tags/* -/administrator/components/com_templates/* -/administrator/components/com_users/* -/administrator/help/* -/administrator/includes/* -/administrator/index.php -/administrator/language/en-GB/en-GB.com_actionlogs.ini -/administrator/language/en-GB/en-GB.com_actionlogs.sys.ini -/administrator/language/en-GB/en-GB.com_admin.ini -/administrator/language/en-GB/en-GB.com_admin.sys.ini -/administrator/language/en-GB/en-GB.com_ajax.ini -/administrator/language/en-GB/en-GB.com_ajax.sys.ini -/administrator/language/en-GB/en-GB.com_associations.ini -/administrator/language/en-GB/en-GB.com_associations.sys.ini -/administrator/language/en-GB/en-GB.com_banners.ini -/administrator/language/en-GB/en-GB.com_banners.sys.ini -/administrator/language/en-GB/en-GB.com_cache.ini -/administrator/language/en-GB/en-GB.com_cache.sys.ini -/administrator/language/en-GB/en-GB.com_categories.ini -/administrator/language/en-GB/en-GB.com_categories.sys.ini -/administrator/language/en-GB/en-GB.com_checkin.ini -/administrator/language/en-GB/en-GB.com_checkin.sys.ini -/administrator/language/en-GB/en-GB.com_config.ini -/administrator/language/en-GB/en-GB.com_config.sys.ini -/administrator/language/en-GB/en-GB.com_contact.ini -/administrator/language/en-GB/en-GB.com_contact.sys.ini -/administrator/language/en-GB/en-GB.com_content.ini -/administrator/language/en-GB/en-GB.com_content.sys.ini -/administrator/language/en-GB/en-GB.com_contenthistory.ini -/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini -/administrator/language/en-GB/en-GB.com_cpanel.ini -/administrator/language/en-GB/en-GB.com_cpanel.sys.ini -/administrator/language/en-GB/en-GB.com_fields.ini -/administrator/language/en-GB/en-GB.com_fields.sys.ini -/administrator/language/en-GB/en-GB.com_finder.ini -/administrator/language/en-GB/en-GB.com_finder.sys.ini -/administrator/language/en-GB/en-GB.com_installer.ini -/administrator/language/en-GB/en-GB.com_installer.sys.ini -/administrator/language/en-GB/en-GB.com_joomlaupdate.ini -/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini -/administrator/language/en-GB/en-GB.com_languages.ini -/administrator/language/en-GB/en-GB.com_languages.sys.ini -/administrator/language/en-GB/en-GB.com_login.ini -/administrator/language/en-GB/en-GB.com_login.sys.ini -/administrator/language/en-GB/en-GB.com_mailto.sys.ini -/administrator/language/en-GB/en-GB.com_media.ini -/administrator/language/en-GB/en-GB.com_media.sys.ini -/administrator/language/en-GB/en-GB.com_menus.ini -/administrator/language/en-GB/en-GB.com_menus.sys.ini -/administrator/language/en-GB/en-GB.com_messages.ini -/administrator/language/en-GB/en-GB.com_messages.sys.ini -/administrator/language/en-GB/en-GB.com_modules.ini -/administrator/language/en-GB/en-GB.com_modules.sys.ini -/administrator/language/en-GB/en-GB.com_newsfeeds.ini -/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini -/administrator/language/en-GB/en-GB.com_plugins.ini -/administrator/language/en-GB/en-GB.com_plugins.sys.ini -/administrator/language/en-GB/en-GB.com_postinstall.ini -/administrator/language/en-GB/en-GB.com_postinstall.sys.ini -/administrator/language/en-GB/en-GB.com_privacy.ini -/administrator/language/en-GB/en-GB.com_privacy.sys.ini -/administrator/language/en-GB/en-GB.com_redirect.ini -/administrator/language/en-GB/en-GB.com_redirect.sys.ini -/administrator/language/en-GB/en-GB.com_search.ini -/administrator/language/en-GB/en-GB.com_search.sys.ini -/administrator/language/en-GB/en-GB.com_tags.ini -/administrator/language/en-GB/en-GB.com_tags.sys.ini -/administrator/language/en-GB/en-GB.com_templates.ini -/administrator/language/en-GB/en-GB.com_templates.sys.ini -/administrator/language/en-GB/en-GB.com_users.ini -/administrator/language/en-GB/en-GB.com_users.sys.ini -/administrator/language/en-GB/en-GB.com_weblinks.ini -/administrator/language/en-GB/en-GB.com_weblinks.sys.ini -/administrator/language/en-GB/en-GB.com_wrapper.ini -/administrator/language/en-GB/en-GB.com_wrapper.sys.ini -/administrator/language/en-GB/en-GB.ini -/administrator/language/en-GB/en-GB.lib_joomla.ini -/administrator/language/en-GB/en-GB.localise.php -/administrator/language/en-GB/en-GB.mod_custom.ini -/administrator/language/en-GB/en-GB.mod_custom.sys.ini -/administrator/language/en-GB/en-GB.mod_feed.ini -/administrator/language/en-GB/en-GB.mod_feed.sys.ini -/administrator/language/en-GB/en-GB.mod_latest.ini -/administrator/language/en-GB/en-GB.mod_latest.sys.ini -/administrator/language/en-GB/en-GB.mod_latestactions.ini -/administrator/language/en-GB/en-GB.mod_latestactions.sys.ini -/administrator/language/en-GB/en-GB.mod_logged.ini -/administrator/language/en-GB/en-GB.mod_logged.sys.ini -/administrator/language/en-GB/en-GB.mod_login.ini -/administrator/language/en-GB/en-GB.mod_login.sys.ini -/administrator/language/en-GB/en-GB.mod_menu.ini -/administrator/language/en-GB/en-GB.mod_menu.sys.ini -/administrator/language/en-GB/en-GB.mod_multilangstatus.ini -/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini -/administrator/language/en-GB/en-GB.mod_online.ini -/administrator/language/en-GB/en-GB.mod_online.sys.ini -/administrator/language/en-GB/en-GB.mod_popular.ini -/administrator/language/en-GB/en-GB.mod_popular.sys.ini -/administrator/language/en-GB/en-GB.mod_privacy_dashboard.ini -/administrator/language/en-GB/en-GB.mod_privacy_dashboard.sys.ini -/administrator/language/en-GB/en-GB.mod_quickicon.ini -/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini -/administrator/language/en-GB/en-GB.mod_sampledata.ini -/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini -/administrator/language/en-GB/en-GB.mod_stats_admin.ini -/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini -/administrator/language/en-GB/en-GB.mod_status.ini -/administrator/language/en-GB/en-GB.mod_status.sys.ini -/administrator/language/en-GB/en-GB.mod_submenu.ini -/administrator/language/en-GB/en-GB.mod_submenu.sys.ini -/administrator/language/en-GB/en-GB.mod_title.ini -/administrator/language/en-GB/en-GB.mod_title.sys.ini -/administrator/language/en-GB/en-GB.mod_toolbar.ini -/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini -/administrator/language/en-GB/en-GB.mod_unread.ini -/administrator/language/en-GB/en-GB.mod_unread.sys.ini -/administrator/language/en-GB/en-GB.mod_version.ini -/administrator/language/en-GB/en-GB.mod_version.sys.ini -/administrator/language/en-GB/en-GB.plg_actionlog_joomla.ini -/administrator/language/en-GB/en-GB.plg_actionlog_joomla.sys.ini -/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini -/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini -/administrator/language/en-GB/en-GB.plg_authentication_example.ini -/administrator/language/en-GB/en-GB.plg_authentication_example.sys.ini -/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini -/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini -/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini -/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini -/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini -/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini -/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini -/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini -/administrator/language/en-GB/en-GB.plg_captcha_recaptcha_invisible.ini -/administrator/language/en-GB/en-GB.plg_captcha_recaptcha_invisible.sys.ini -/administrator/language/en-GB/en-GB.plg_content_confirmconsent.ini -/administrator/language/en-GB/en-GB.plg_content_confirmconsent.sys.ini -/administrator/language/en-GB/en-GB.plg_content_contact.ini -/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini -/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini -/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini -/administrator/language/en-GB/en-GB.plg_content_fields.ini -/administrator/language/en-GB/en-GB.plg_content_fields.sys.ini -/administrator/language/en-GB/en-GB.plg_content_finder.ini -/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini -/administrator/language/en-GB/en-GB.plg_content_geshi.ini -/administrator/language/en-GB/en-GB.plg_content_geshi.sys.ini -/administrator/language/en-GB/en-GB.plg_content_joomla.ini -/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini -/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini -/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini -/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini -/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini -/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini -/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini -/administrator/language/en-GB/en-GB.plg_content_vote.ini -/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.sys.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini -/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini -/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini -/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini -/administrator/language/en-GB/en-GB.plg_editors_none.ini -/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini -/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini -/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini -/administrator/language/en-GB/en-GB.plg_extension_joomla.ini -/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_calendar.ini -/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini -/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_color.ini -/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_editor.ini -/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_image.ini -/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini -/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_integer.ini -/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_list.ini -/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_media.ini -/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_radio.ini -/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_repeatable.ini -/administrator/language/en-GB/en-GB.plg_fields_repeatable.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_sql.ini -/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_text.ini -/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_textarea.ini -/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_url.ini -/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_user.ini -/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini -/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini -/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini -/administrator/language/en-GB/en-GB.plg_finder_categories.ini -/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini -/administrator/language/en-GB/en-GB.plg_finder_contacts.ini -/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini -/administrator/language/en-GB/en-GB.plg_finder_content.ini -/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini -/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini -/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini -/administrator/language/en-GB/en-GB.plg_finder_tags.ini -/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini -/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini -/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini -/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini -/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini -/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini -/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini -/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini -/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini -/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini -/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini -/administrator/language/en-GB/en-GB.plg_privacy_actionlogs.ini -/administrator/language/en-GB/en-GB.plg_privacy_actionlogs.sys.ini -/administrator/language/en-GB/en-GB.plg_privacy_consents.ini -/administrator/language/en-GB/en-GB.plg_privacy_consents.sys.ini -/administrator/language/en-GB/en-GB.plg_privacy_contact.ini -/administrator/language/en-GB/en-GB.plg_privacy_contact.sys.ini -/administrator/language/en-GB/en-GB.plg_privacy_content.ini -/administrator/language/en-GB/en-GB.plg_privacy_content.sys.ini -/administrator/language/en-GB/en-GB.plg_privacy_message.ini -/administrator/language/en-GB/en-GB.plg_privacy_message.sys.ini -/administrator/language/en-GB/en-GB.plg_privacy_user.ini -/administrator/language/en-GB/en-GB.plg_privacy_user.sys.ini -/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini -/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini -/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini -/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini -/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini -/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini -/administrator/language/en-GB/en-GB.plg_quickicon_privacycheck.ini -/administrator/language/en-GB/en-GB.plg_quickicon_privacycheck.sys.ini -/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini -/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini -/administrator/language/en-GB/en-GB.plg_search_categories.ini -/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini -/administrator/language/en-GB/en-GB.plg_search_contacts.ini -/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini -/administrator/language/en-GB/en-GB.plg_search_content.ini -/administrator/language/en-GB/en-GB.plg_search_content.sys.ini -/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini -/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini -/administrator/language/en-GB/en-GB.plg_search_tags.ini -/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini -/administrator/language/en-GB/en-GB.plg_search_weblinks.ini -/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini -/administrator/language/en-GB/en-GB.plg_system_actionlogs.ini -/administrator/language/en-GB/en-GB.plg_system_actionlogs.sys.ini -/administrator/language/en-GB/en-GB.plg_system_cache.ini -/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini -/administrator/language/en-GB/en-GB.plg_system_debug.ini -/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini -/administrator/language/en-GB/en-GB.plg_system_fields.ini -/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini -/administrator/language/en-GB/en-GB.plg_system_highlight.ini -/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini -/administrator/language/en-GB/en-GB.plg_system_languagecode.ini -/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini -/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini -/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini -/administrator/language/en-GB/en-GB.plg_system_log.ini -/administrator/language/en-GB/en-GB.plg_system_log.sys.ini -/administrator/language/en-GB/en-GB.plg_system_logout.ini -/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini -/administrator/language/en-GB/en-GB.plg_system_logrotation.ini -/administrator/language/en-GB/en-GB.plg_system_logrotation.sys.ini -/administrator/language/en-GB/en-GB.plg_system_p3p.ini -/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini -/administrator/language/en-GB/en-GB.plg_system_privacyconsent.ini -/administrator/language/en-GB/en-GB.plg_system_privacyconsent.sys.ini -/administrator/language/en-GB/en-GB.plg_system_redirect.ini -/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini -/administrator/language/en-GB/en-GB.plg_system_remember.ini -/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini -/administrator/language/en-GB/en-GB.plg_system_sef.ini -/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini -/administrator/language/en-GB/en-GB.plg_system_sessiongc.ini -/administrator/language/en-GB/en-GB.plg_system_sessiongc.sys.ini -/administrator/language/en-GB/en-GB.plg_system_stats.ini -/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini -/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini -/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini -/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini -/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini -/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini -/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini -/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini -/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini -/administrator/language/en-GB/en-GB.plg_user_joomla.ini -/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini -/administrator/language/en-GB/en-GB.plg_user_profile.ini -/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini -/administrator/language/en-GB/en-GB.plg_user_terms.ini -/administrator/language/en-GB/en-GB.plg_user_terms.sys.ini -/administrator/language/en-GB/en-GB.tpl_hathor.ini -/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini -/administrator/language/en-GB/en-GB.tpl_isis.ini -/administrator/language/en-GB/en-GB.tpl_isis.sys.ini -/administrator/language/en-GB/en-GB.xml -/administrator/language/en-GB/install.xml -/administrator/language/overrides/* -/administrator/language/index.html -/administrator/logs/* -/administrator/manifests/files/joomla.xml -/administrator/manifests/libraries/fof.xml -/administrator/manifests/libraries/idna_convert.xml -/administrator/manifests/libraries/joomla.xml -/administrator/manifests/libraries/phpass.xml -/administrator/manifests/libraries/phputf8.xml -/administrator/manifests/packages/pkg_en-GB.xml -/administrator/manifests/packages/index.html -/administrator/modules/mod_custom/* -/administrator/modules/mod_feed/* -/administrator/modules/mod_latest/* -/administrator/modules/mod_latestactions/* -/administrator/modules/mod_logged/* -/administrator/modules/mod_login/* -/administrator/modules/mod_menu/* -/administrator/modules/mod_multilangstatus/* -/administrator/modules/mod_online/* -/administrator/modules/mod_popular/* -/administrator/modules/mod_privacy_dashboard/* -/administrator/modules/mod_quickicon/* -/administrator/modules/mod_sampledata/* -/administrator/modules/mod_stats_admin/* -/administrator/modules/mod_status/* -/administrator/modules/mod_submenu/* -/administrator/modules/mod_title/* -/administrator/modules/mod_toolbar/* -/administrator/modules/mod_unread/* -/administrator/modules/mod_version/* -/administrator/templates/hathor/* -/administrator/templates/isis/* -/administrator/templates/system/* -/bin/* -/cache/* -/cli/* -/components/com_ajax/* -/components/com_banners/* -/components/com_config/* -/components/com_contact/* -/components/com_content/* -/components/com_contenthistory/* -/components/com_fields/* -/components/com_finder/* -/components/com_mailto/* -/components/com_media/* -/components/com_menus/* -/components/com_modules/* -/components/com_newsfeeds/* -/components/com_privacy/* -/components/com_search/* -/components/com_tags/* -/components/com_users/* -/components/com_wrapper/* -/components/index.html -/images/banners/* -/images/headers/* -/images/sampledata/* -/images/index.html -/images/joomla* -/images/powered_by.png -/includes/* -/installation/* -/language/en-GB/en-GB.com_ajax.ini -/language/en-GB/en-GB.com_config.ini -/language/en-GB/en-GB.com_contact.ini -/language/en-GB/en-GB.com_content.ini -/language/en-GB/en-GB.com_finder.ini -/language/en-GB/en-GB.com_mailto.ini -/language/en-GB/en-GB.com_media.ini -/language/en-GB/en-GB.com_messages.ini -/language/en-GB/en-GB.com_newsfeeds.ini -/language/en-GB/en-GB.com_privacy.ini -/language/en-GB/en-GB.com_search.ini -/language/en-GB/en-GB.com_tags.ini -/language/en-GB/en-GB.com_users.ini -/language/en-GB/en-GB.com_weblinks.ini -/language/en-GB/en-GB.com_wrapper.ini -/language/en-GB/en-GB.files_joomla.sys.ini -/language/en-GB/en-GB.finder_cli.ini -/language/en-GB/en-GB.ini -/language/en-GB/en-GB.lib_fof.ini -/language/en-GB/en-GB.lib_fof.sys.ini -/language/en-GB/en-GB.lib_idna_convert.sys.ini -/language/en-GB/en-GB.lib_joomla.ini -/language/en-GB/en-GB.lib_joomla.sys.ini -/language/en-GB/en-GB.lib_phpass.sys.ini -/language/en-GB/en-GB.lib_phpmailer.sys.ini -/language/en-GB/en-GB.lib_phputf8.sys.ini -/language/en-GB/en-GB.lib_simplepie.sys.ini -/language/en-GB/en-GB.localise.php -/language/en-GB/en-GB.mod_articles_archive.ini -/language/en-GB/en-GB.mod_articles_archive.sys.ini -/language/en-GB/en-GB.mod_articles_categories.ini -/language/en-GB/en-GB.mod_articles_categories.sys.ini -/language/en-GB/en-GB.mod_articles_category.ini -/language/en-GB/en-GB.mod_articles_category.sys.ini -/language/en-GB/en-GB.mod_articles_latest.ini -/language/en-GB/en-GB.mod_articles_latest.sys.ini -/language/en-GB/en-GB.mod_articles_news.ini -/language/en-GB/en-GB.mod_articles_news.sys.ini -/language/en-GB/en-GB.mod_articles_popular.ini -/language/en-GB/en-GB.mod_articles_popular.sys.ini -/language/en-GB/en-GB.mod_banners.ini -/language/en-GB/en-GB.mod_banners.sys.ini -/language/en-GB/en-GB.mod_breadcrumbs.ini -/language/en-GB/en-GB.mod_breadcrumbs.sys.ini -/language/en-GB/en-GB.mod_custom.ini -/language/en-GB/en-GB.mod_custom.sys.ini -/language/en-GB/en-GB.mod_feed.ini -/language/en-GB/en-GB.mod_feed.sys.ini -/language/en-GB/en-GB.mod_finder.ini -/language/en-GB/en-GB.mod_finder.sys.ini -/language/en-GB/en-GB.mod_footer.ini -/language/en-GB/en-GB.mod_footer.sys.ini -/language/en-GB/en-GB.mod_languages.ini -/language/en-GB/en-GB.mod_languages.sys.ini -/language/en-GB/en-GB.mod_login.ini -/language/en-GB/en-GB.mod_login.sys.ini -/language/en-GB/en-GB.mod_menu.ini -/language/en-GB/en-GB.mod_menu.sys.ini -/language/en-GB/en-GB.mod_random_image.ini -/language/en-GB/en-GB.mod_random_image.sys.ini -/language/en-GB/en-GB.mod_related_items.ini -/language/en-GB/en-GB.mod_related_items.sys.ini -/language/en-GB/en-GB.mod_search.ini -/language/en-GB/en-GB.mod_search.sys.ini -/language/en-GB/en-GB.mod_stats.ini -/language/en-GB/en-GB.mod_stats.sys.ini -/language/en-GB/en-GB.mod_syndicate.ini -/language/en-GB/en-GB.mod_syndicate.sys.ini -/language/en-GB/en-GB.mod_tags_popular.ini -/language/en-GB/en-GB.mod_tags_popular.sys.ini -/language/en-GB/en-GB.mod_tags_similar.ini -/language/en-GB/en-GB.mod_tags_similar.sys.ini -/language/en-GB/en-GB.mod_users_latest.ini -/language/en-GB/en-GB.mod_users_latest.sys.ini -/language/en-GB/en-GB.mod_weblinks.ini -/language/en-GB/en-GB.mod_weblinks.sys.ini -/language/en-GB/en-GB.mod_whosonline.ini -/language/en-GB/en-GB.mod_whosonline.sys.ini -/language/en-GB/en-GB.mod_wrapper.ini -/language/en-GB/en-GB.mod_wrapper.sys.ini -/language/en-GB/en-GB.tpl_atomic.ini -/language/en-GB/en-GB.tpl_atomic.sys.ini -/language/en-GB/en-GB.tpl_beez3.ini -/language/en-GB/en-GB.tpl_beez3.sys.ini -/language/en-GB/en-GB.tpl_beez5.ini -/language/en-GB/en-GB.tpl_beez5.sys.ini -/language/en-GB/en-GB.tpl_beez_20.ini -/language/en-GB/en-GB.tpl_beez_20.sys.ini -/language/en-GB/en-GB.tpl_protostar.ini -/language/en-GB/en-GB.tpl_protostar.sys.ini -/language/en-GB/en-GB.xml -/language/en-GB/install.xml -/language/overrides/* -/language/index.html -/layouts/joomla/* -/layouts/libraries/* -/layouts/plugins/* -/layouts/index.html -/libraries/cms/* -/libraries/fof/* -/libraries/idna_convert/* -/libraries/joomla/* -/libraries/legacy/* -/libraries/php-encryption/* -/libraries/phpass/* -/libraries/phpmailer/* -/libraries/phputf8/* -/libraries/simplepie/* -/libraries/src/* -/libraries/vendor/* -/libraries/classmap.php -/libraries/cms.php -/libraries/import.legacy.php -/libraries/import.php -/libraries/index.html -/libraries/loader.php -/media/cms/* -/media/com_associations/* -/media/com_contact/* -/media/com_content/* -/media/com_contenthistory/* -/media/com_fields/* -/media/com_finder/* -/media/com_joomlaupdate/* -/media/com_menus/* -/media/com_modules/* -/media/com_wrapper/* -/media/contacts/* -/media/editors/* -/media/jui/* -/media/mailto/* -/media/media/* -/media/mod_languages/* -/media/mod_sampledata/* -/media/overrider/* -/media/plg_captcha_recaptcha/* -/media/plg_captcha_recaptcha_invisible/* -/media/plg_quickicon_extensionupdate/* -/media/plg_quickicon_joomlaupdate/* -/media/plg_quickicon_privacycheck/* -/media/plg_system_highlight/* -/media/plg_system_stats/* -/media/plg_twofactorauth_totp/* -/media/system/* -/media/index.html -/modules/mod_articles_archive/* -/modules/mod_articles_categories/* -/modules/mod_articles_category/* -/modules/mod_articles_latest/* -/modules/mod_articles_news/* -/modules/mod_articles_popular/* -/modules/mod_banners/* -/modules/mod_breadcrumbs/* -/modules/mod_custom/* -/modules/mod_feed/* -/modules/mod_finder/* -/modules/mod_footer/* -/modules/mod_languages/* -/modules/mod_login/* -/modules/mod_menu/* -/modules/mod_random_image/* -/modules/mod_related_items/* -/modules/mod_search/* -/modules/mod_stats/* -/modules/mod_syndicate/* -/modules/mod_tags_popular/* -/modules/mod_tags_similar/* -/modules/mod_users_latest/* -/modules/mod_whosonline/* -/modules/mod_wrapper/* -/modules/index.html -/plugins/actionlog/joomla/* -/plugins/authentication/cookie/* -/plugins/authentication/example/* -/plugins/authentication/gmail/* -/plugins/authentication/joomla/* -/plugins/authentication/ldap/* -/plugins/captcha/recaptcha/* -/plugins/captcha/recaptcha_invisible/* -/plugins/content/confirmconsent/* -/plugins/content/contact/* -/plugins/content/emailcloak/* -/plugins/content/example/* -/plugins/content/fields/* -/plugins/content/finder/* -/plugins/content/geshi/* -/plugins/content/joomla/* -/plugins/content/loadmodule/* -/plugins/content/pagebreak/* -/plugins/content/pagenavigation/* -/plugins/content/vote/* -/plugins/editors/codemirror/* -/plugins/editors/none/* -/plugins/editors/tinymce/* -/plugins/editors-xtd/article/* -/plugins/editors-xtd/contact/* -/plugins/editors-xtd/fields/* -/plugins/editors-xtd/image/* -/plugins/editors-xtd/menu/* -/plugins/editors-xtd/module/* -/plugins/editors-xtd/pagebreak/* -/plugins/editors-xtd/readmore/* -/plugins/extension/example/* -/plugins/extension/joomla/* -/plugins/fields/calendar/* -/plugins/fields/checkboxes/* -/plugins/fields/color/* -/plugins/fields/editor/* -/plugins/fields/imagelist/* -/plugins/fields/integer/* -/plugins/fields/list/* -/plugins/fields/media/* -/plugins/fields/radio/* -/plugins/fields/repeatable/* -/plugins/fields/sql/* -/plugins/fields/text/* -/plugins/fields/textarea/* -/plugins/fields/url/* -/plugins/fields/user/* -/plugins/fields/usergrouplist/* -/plugins/finder/categories/* -/plugins/finder/contacts/* -/plugins/finder/content/* -/plugins/finder/newsfeeds/* -/plugins/finder/tags/* -/plugins/installer/folderinstaller/* -/plugins/installer/packageinstaller/* -/plugins/installer/urlinstaller/* -/plugins/privacy/actionlogs/* -/plugins/privacy/consents/* -/plugins/privacy/contact/* -/plugins/privacy/content/* -/plugins/privacy/message/* -/plugins/privacy/user/* -/plugins/quickicon/extensionupdate/* -/plugins/quickicon/joomlaupdate/* -/plugins/quickicon/phpversioncheck/* -/plugins/quickicon/privacycheck/* -/plugins/quickicon/index.html -/plugins/sampledata/blog/* -/plugins/search/categories/* -/plugins/search/contacts/* -/plugins/search/content/* -/plugins/search/newsfeeds/* -/plugins/search/tags/* -/plugins/search/weblinks/* -/plugins/search/index.html -/plugins/system/actionlogs/* -/plugins/system/cache/* -/plugins/system/debug/* -/plugins/system/fields/* -/plugins/system/highlight/* -/plugins/system/languagecode/* -/plugins/system/languagefilter/* -/plugins/system/log/* -/plugins/system/logout/* -/plugins/system/logrotation/* -/plugins/system/p3p/* -/plugins/system/privacyconsent/* -/plugins/system/redirect/* -/plugins/system/remember/* -/plugins/system/sef/* -/plugins/system/sessiongc/* -/plugins/system/stats/* -/plugins/system/updatenotification/* -/plugins/system/index.html -/plugins/twofactorauth/totp/* -/plugins/twofactorauth/yubikey/* -/plugins/user/contactcreator/* -/plugins/user/example/* -/plugins/user/joomla/* -/plugins/user/profile/* -/plugins/user/terms/* -/plugins/user/index.html -/plugins/index.html -/templates/beez3/* -/templates/protostar/* -/templates/system/* -/templates/index.html -/tmp/* -/configuration.php -/htaccess.txt -/index.php -/joomla.xml -/LICENSE.txt -/README.txt -/robots.txt.dist -/web.config.txt - -### GitBook template -# Node rules: -## Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -## Dependency directory -## Commenting this out is preferred by some people, see -## https://docs.npmjs.com/misc/faq#should-i-check-my-node_modules-folder-into-git -node_modules - -# Book build output -_book - -# eBook build output -*.epub -*.mobi -*.pdf - -### Idris template -*.ibc -*.o - -### Symfony template -# Cache and logs (Symfony2) -/app/cache/* -/app/logs/* -!app/cache/.gitkeep -!app/logs/.gitkeep - -# Email spool folder -/app/spool/* - -# Cache, session files and logs (Symfony3) -/var/cache/* -/var/logs/* -/var/sessions/* -!var/cache/.gitkeep -!var/logs/.gitkeep -!var/sessions/.gitkeep - -# Logs (Symfony4) -/var/log/* -!var/log/.gitkeep - -# Parameters -/app/config/parameters.yml -/app/config/parameters.ini - -# Managed by Composer -/app/bootstrap.php.cache -/var/bootstrap.php.cache -/bin/* -!bin/console -!bin/symfony_requirements -/vendor/ - -# Assets and user uploads -/web/bundles/ -/web/uploads/ - -# PHPUnit -/app/phpunit.xml -/phpunit.xml - -# Build data -/build/ - -# Composer PHAR -/composer.phar - -# Backup entities generated with doctrine:generate:entities command -**/Entity/*~ - -# Embedded web-server pid file -/.web-server-pid - -### Magento template -#--------------------------# -# Magento Default Files # -#--------------------------# - -/PATCH_*.sh - -/app/etc/local.xml - -/media/* -!/media/.htaccess - -!/media/customer -/media/customer/* -!/media/customer/.htaccess - -!/media/dhl -/media/dhl/* -!/media/dhl/logo.jpg - -!/media/downloadable -/media/downloadable/* -!/media/downloadable/.htaccess - -!/media/xmlconnect -/media/xmlconnect/* - -!/media/xmlconnect/custom -/media/xmlconnect/custom/* -!/media/xmlconnect/custom/ok.gif - -!/media/xmlconnect/original -/media/xmlconnect/original/* -!/media/xmlconnect/original/ok.gif - -!/media/xmlconnect/system -/media/xmlconnect/system/* -!/media/xmlconnect/system/ok.gif - -/var/* -!/var/.htaccess - -!/var/package -/var/package/* -!/var/package/*.xml - - -### VisualStudio template -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -### ForceDotCom template -.project -.settings -salesforce.schema -Referenced Packages - -### Elixir template -/_build -/cover -/deps -/doc -/.fetch -erl_crash.dump -*.ez -*.beam -/config/*.secret.exs -.elixir_ls/ - -### Jigsaw template -# gitignore template for Jigsaw Static Site Generator -# -# website - https://jigsaw.tighten.co - -# Ignore build folder -build_* - -### CVS template -/CVS/* -**/CVS/* -.cvsignore -*/.cvsignore - -### C template -# Prerequisites -*.d - -# Object files -*.o -*.ko -*.obj -*.elf - -# Linker output -*.ilk -*.map -*.exp - -# Precompiled Headers -*.gch -*.pch - -# Libraries -*.lib -*.a -*.la -*.lo - -# Shared objects (inc. Windows DLLs) -*.dll -*.so -*.so.* -*.dylib - -# Executables -*.exe -*.out -*.app -*.i*86 -*.x86_64 -*.hex - -# Debug files -*.dSYM/ -*.su -*.idb -*.pdb - -# Kernel Module Compile Results -*.mod* -*.cmd -.tmp_versions/ -modules.order -Module.symvers -Mkfile.old -dkms.conf - -### Qt template -# C++ objects and libs -*.slo -*.lo -*.o -*.a -*.la -*.lai -*.so -*.so.* -*.dll -*.dylib - -# Qt-es -object_script.*.Release -object_script.*.Debug -*_plugin_import.cpp -/.qmake.cache -/.qmake.stash -*.pro.user -*.pro.user.* -*.qbs.user -*.qbs.user.* -*.moc -moc_*.cpp -moc_*.h -qrc_*.cpp -ui_*.h -*.qmlc -*.jsc -Makefile* -*build-* -*.qm -*.prl - -# Qt unit tests -target_wrapper.* - -# QtCreator -*.autosave - -# QtCreator Qml -*.qmlproject.user -*.qmlproject.user.* - -# QtCreator CMake -CMakeLists.txt.user* - -# QtCreator 4.8< compilation database -compile_commands.json - -# QtCreator local machine specific files for imported projects -*creator.user* - -*_qmlcache.qrc - -### D template -# Compiled Object files -*.o -*.obj - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Compiled Static libraries -*.a -*.lib - -# Executables -*.exe - -# DUB -.dub -docs.json -__dummy.html -docs/ - -# Code coverage -*.lst - -### Kate template -# Swap Files # -.*.kate-swp -.swp.* - -### PlayFramework template -# Ignore Play! working directory # -bin/ -/db -.eclipse -/lib/ -/logs/ -/modules -/project/project -/project/target -/target -tmp/ -test-result -server.pid -*.eml -/dist/ -.cache - -### Lithium template -libraries/* -resources/tmp/* - -### LyX template -# Ignore LyX backup and autosave files -# http://www.lyx.org/ -*.lyx~ -*.lyx# - -### SVN template -.svn/ - -### FlexBuilder template -bin/ -bin-debug/ -bin-release/ - -### Plone template -*.pyc -*.pyo -*.tmp* -*.mo -*.egg -*.EGG -*.egg-info -*.EGG-INFO -.*.cfg -bin/ -build/ -develop-eggs/ -downloads/ -eggs/ -fake-eggs/ -parts/ -dist/ -var/ - -### R template -# History files -.Rhistory -.Rapp.history - -# Session Data files -.RData - -# User-specific files -.Ruserdata - -# Example code in package build process -*-Ex.R - -# Output files from R CMD build -/*.tar.gz - -# Output files from R CMD check -/*.Rcheck/ - -# RStudio files -.Rproj.user/ - -# produced vignettes -vignettes/*.html -vignettes/*.pdf - -# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3 -.httr-oauth - -# knitr and R markdown default cache directories -*_cache/ -/cache/ - -# Temporary files created by R markdown -*.utf8.md -*.knit.md - -# R Environment Variables -.Renviron - -# pkgdown site -docs/ - -# translation temp files -po/*~ - -### Terraform template -# Local .terraform directories -**/.terraform/* - -# .tfstate files -*.tfstate -*.tfstate.* - -# Crash log files -crash.log - -# Exclude all .tfvars files, which are likely to contain sentitive data, such as -# password, private keys, and other secrets. These should not be part of version -# control as they are data points which are potentially sensitive and subject -# to change depending on the environment. -# -*.tfvars - -# Ignore override files as they are usually used to override resources locally and so -# are not checked in -override.tf -override.tf.json -*_override.tf -*_override.tf.json - -# Include override files you do wish to add to version control using negated pattern -# -# !example_override.tf - -# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan -# example: *tfplan* - -# Ignore CLI configuration files -.terraformrc -terraform.rc - -### Bazaar template -.bzr/ -.bzrignore - -### Dropbox template -# Dropbox settings and caches -.dropbox -.dropbox.attr -.dropbox.cache - -### PSoCCreator template -# Project Settings -*.cywrk.* -*.cyprj.* - -# Generated Assets and Resources -Debug/ -Release/ -Export/ -*/codegentemp -*/Generated_Source -*_datasheet.pdf -*_timing.html -*.cycdx -*.cyfit -*.rpt -*.svd -*.log -*.zip - -### Pimcore template -# gitignore template for Pimcore CMS - -# pimcore source files -/pimcore - -# asset files -/website/var/assets/* - -# backups -/website/var/backup/* - -# file cache -/website/var/cache/* - -# generated PHP classes, keep definition files (.psf) -/website/var/classes/Object* -!/website/var/classes/objectbricks - -# various configuration files -/website/var/config/system.xml -/website/var/config/cache.xml -/website/var/config/robots.txt -/website/var/config/Geo* -/website/var/config/object/* -/website/var/config/portal/* -/website/var/config/sqlreport/* - -# sent e-mail log files -/website/var/email/* - -# log files -/website/var/log/*.log - -# serialized recyclebin files -/website/var/recyclebin/* - -# search plugin -/website/var/search/* - -# various temp files -/website/var/system/* -/website/var/tmp/* - -# serialized version files -/website/var/versions/asset/* -/website/var/versions/document/* -/website/var/versions/object/* - -# user profile images -/website/var/user-image/* - -# keep .dummy files -!.dummy - -### Java template -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -### SugarCRM template -## SugarCRM -# Ignore custom .htaccess stuff. -/.htaccess -# Ignore the cache directory completely. -# This will break the current behaviour. Which was often leading to -# the misuse of the repository as backup replacement. -# For development the cache directory can be safely ignored and -# therefore it is ignored. -/cache/* -!/cache/index.html -# Ignore some files and directories from the custom directory. -/custom/history/ -/custom/modulebuilder/ -/custom/working/ -/custom/modules/*/Ext/ -/custom/application/Ext/ -# Custom configuration should also be ignored. -/config.php -/config_override.php -# The silent upgrade scripts aren't needed. -/silentUpgrade*.php -# Logs files can safely be ignored. -*.log -# Ignore the new upload directories. -/upload/* -!/upload/index.html -/upload_backup/ - -### JEnv template -# JEnv local Java version configuration file -.java-version - -# Used by previous versions of JEnv -.jenv-version - -### Espresso template -*.esproj - -### Redcar template -.redcar - -### Stella template -# Atari 2600 (Stella) support for multiple assemblers -# - DASM -# - CC65 - -# Assembled binaries and object directories -obj/ -a.out -*.bin -*.a26 - -# Add in special Atari 7800-based binaries for good measure -*.a78 - -### Exercism template -# gitignore template for Exercism project -# website: https://exercism.io/ - -# Ignore .exercism folder which contain sensitive data -.exercism - -### Delphi template -# Uncomment these types if you want even more clean repository. But be careful. -# It can make harm to an existing project source. Read explanations below. -# -# Resource files are binaries containing manifest, project icon and version info. -# They can not be viewed as text or compared by diff-tools. Consider replacing them with .rc files. -#*.res -# -# Type library file (binary). In old Delphi versions it should be stored. -# Since Delphi 2009 it is produced from .ridl file and can safely be ignored. -#*.tlb -# -# Diagram Portfolio file. Used by the diagram editor up to Delphi 7. -# Uncomment this if you are not using diagrams or use newer Delphi version. -#*.ddp -# -# Visual LiveBindings file. Added in Delphi XE2. -# Uncomment this if you are not using LiveBindings Designer. -#*.vlb -# -# Deployment Manager configuration file for your project. Added in Delphi XE2. -# Uncomment this if it is not mobile development and you do not use remote debug feature. -#*.deployproj -# -# C++ object files produced when C/C++ Output file generation is configured. -# Uncomment this if you are not using external objects (zlib library for example). -#*.obj -# - -# Delphi compiler-generated binaries (safe to delete) -*.exe -*.dll -*.bpl -*.bpi -*.dcp -*.so -*.apk -*.drc -*.map -*.dres -*.rsm -*.tds -*.dcu -*.lib -*.a -*.o -*.ocx - -# Delphi autogenerated files (duplicated info) -*.cfg -*.hpp -*Resource.rc - -# Delphi local files (user-specific info) -*.local -*.identcache -*.projdata -*.tvsconfig -*.dsk - -# Delphi history and backups -__history/ -__recovery/ -*.~* - -# Castalia statistics file (since XE7 Castalia is distributed with Delphi) -*.stat - -# Boss dependency manager vendor folder https://github.com/HashLoad/boss -modules/ - -### CUDA template -*.i -*.ii -*.gpu -*.ptx -*.cubin -*.fatbin - -### Red template -# gitignore template for Red programming language -# website: http://www.red-lang.org/ - -# Red Compiled code -*.red - -# Libraries -crush.dll -crush.dylib -crush.so - -# Files generated during test -quick-test/quick-test.log -quick-test/runnable/ -system/tests/source/units/auto-tests/ -tests/source/units/auto-tests/ - -### NetBeans template -**/nbproject/private/ -**/nbproject/Makefile-*.mk -**/nbproject/Package-*.bash -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ - -### Logtalk template -# gitignore template for LogTalk, a programming language that builds upon Prolog -# website: https://logtalk.org/ - -# Logtalk temporary file directories -.lgt_tmp/ -lgt_tmp/ - -# Logtalk default unit testing and doclet results and logs directories -logtalk_tester_logs/ -logtalk_doclet_logs/ - -# backend Prolog compiler temporary files -.pl-history -*.out -*.xwam -*.qo -*.ql -*.itf -*.po - -### Nanoc template -# For projects using Nanoc (http://nanoc.ws/) - -# Default location for output (needs to match output_dir's value found in nanoc.yaml) -output/ - -# Temporary file directory -tmp/nanoc/ - -# Crash Log -crash.log - -### AtmelStudio template -## Ignore Atmel Studio temporary files and build results -# https://www.microchip.com/mplab/avr-support/atmel-studio-7 - -# Atmel Studio is powered by an older version of Visual Studio, -# so most of the project and solution files are the same as VS files, -# only prefixed by an `at`. - -#Build Directories -[Dd]ebug/ -[Rr]elease/ - -#Build Results -*.o -*.d -*.eep -*.elf -*.hex -*.map -*.srec - -#User Specific Files -*.atsuo - -### ArchLinuxPackages template -*.tar -*.tar.* -*.jar -*.exe -*.msi -*.zip -*.tgz -*.log -*.log.* -*.sig - -pkg/ -src/ - -### Ada template -# Object file -*.o - -# Ada Library Information -*.ali - -### GPG template -secring.* - - -### Opa template -_build -_tracks - -opa-debug-js - -*.opp -*.opx -*.opx.broken -*.dump -*.api -*.api-txt -*.exe -*.log - -### Scheme template -*.ss~ -*.ss#* -.#*.ss - -*.scm~ -*.scm#* -.#*.scm - -### VirtualEnv template -# Virtualenv -# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/ -.Python -[Bb]in -[Ii]nclude -[Ll]ib -[Ll]ib64 -[Ll]ocal -[Ss]cripts -pyvenv.cfg -.venv -pip-selfcheck.json - -### Elm template -# elm-package generated files -elm-stuff -# elm-repl generated files -repl-temp-* - -### DM template -*.dmb -*.rsc -*.int -*.lk -*.zip - -### Umbraco template -## Ignore Umbraco files/folders generated for each instance -## -## Get latest from https://github.com/github/gitignore/blob/master/Umbraco.gitignore - -# Note: VisualStudio gitignore rules may also be relevant - -# Umbraco -# Ignore unimportant folders generated by Umbraco -**/App_Data/Logs/ -**/App_Data/[Pp]review/ -**/App_Data/TEMP/ -**/App_Data/NuGetBackup/ - -# Ignore Umbraco content cache file -**/App_Data/umbraco.config - -## this [Uu]mbraco/ folder should be created by cmd like `Install-Package UmbracoCms -Version 8.5.3` -## you can find your umbraco version at your Web.config. (i.e. ) -## Uncomment this line if you think it fits the way you work on your project. -## **/[Uu]mbraco/ - -# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder) -# Make sure to include details from VisualStudio.gitignore BEFORE this -!**/App_Data/[Pp]ackages/* -!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/* -!**/[Uu]mbraco/[Vv]iews/[Pp]ackages/* - -# ImageProcessor DiskCache -**/App_Data/cache/ - -# Ignore the Models Builder models out of date flag -**/App_Data/Models/ood.flag - -### Dreamweaver template -# DW Dreamweaver added files -_notes -_compareTemp -configs/ -dwsync.xml -dw_php_codehinting.config -*.mno - -### WordPress template -# ignore everything in the root except the "wp-content" directory. -!wp-content/ - -# ignore everything in the "wp-content" directory, except: -# "mu-plugins", "plugins", "themes" directory -wp-content/* -!wp-content/mu-plugins/ -!wp-content/plugins/ -!wp-content/themes/ - -# ignore these plugins -wp-content/plugins/hello.php - -# ignore specific themes -wp-content/themes/twenty*/ - -# ignore node dependency directories -node_modules/ - -# ignore log files and databases -*.log -*.sql -*.sqlite - -### Racket template -# gitignore template for the Racket language -# website: http://www.racket-lang.org/ - -# DrRacket autosave files -*.rkt~ -*.rkt.bak -\#*.rkt# -\#*.rkt#*# - -# Compiled racket bytecode -compiled/ -*.zo - -# Dependency tracking files -*.dep - -### SCons template -# for projects that use SCons for building: http://http://www.scons.org/ -.sconsign.dblite - -# When configure fails, SCons outputs these -config.log -.sconf_temp - -### DartEditor template -.project -.buildlog - -### Fancy template -*.rbc -*.fyc - -### Finale template -*.bak -*.db -*.avi -*.pdf -*.ps -*.mid -*.midi -*.mp3 -*.aif -*.wav -# Some versions of Finale have a bug and randomly save extra copies of -# the music source as " copy.mus" -*copy.mus - -### SketchUp template -*.skb - -### PureScript template -# Dependencies -.psci_modules -.spago -bower_components -node_modules - -# Generated files -.psci -output - -### EPiServer template -###################### -## EPiServer Files -###################### -*License.config - -### Grails template -# .gitignore for Grails 1.2 and 1.3 -# Although this should work for most versions of grails, it is -# suggested that you use the "grails integrate-with --git" command -# to generate your .gitignore file. - -# web application files -/web-app/WEB-INF/classes - -# default HSQL database files for production mode -/prodDb.* - -# general HSQL database files -*Db.properties -*Db.script - -# logs -/stacktrace.log -/test/reports -/logs - -# project release file -/*.war - -# plugin release files -/*.zip -/plugin.xml - -# older plugin install locations -/plugins -/web-app/plugins - -# "temporary" build files -/target - -### ZendFramework template -# Composer files -composer.phar -vendor/ - -# Local configs -config/autoload/*.local.php - -# Binary gettext files -*.mo - -# Data -data/logs/ -data/cache/ -data/sessions/ -data/tmp/ -temp/ - -#Doctrine 2 -data/DoctrineORMModule/Proxy/ -data/DoctrineORMModule/cache/ - -# Legacy ZF1 -demos/ -extras/documentation - -### Stata template -# .gitignore file for git projects containing Stata files -# Commercial statistical software: http://www.stata.com - -# Stata dataset and output files -*.dta -*.gph -*.log -*.smcl -*.stpr -*.stsem - -# Graphic export files from Stata -# Stata command graph export: http://www.stata.com/manuals14/g-2graphexport.pdf -# -# You may add graphic export files to your .gitignore. However you should be -# aware that this will exclude all image files from this main directory -# and subdirectories. -# *.ps -# *.eps -# *.wmf -# *.emf -# *.pdf -# *.png -# *.tif - -### Phalcon template -/cache/ -/config/development/ - -### Lilypond template -*.pdf -*.ps -*.midi -*.mid -*.log -*~ - -### OpenSSL template -# OpenSSL-related files best not committed - -## Certificate Authority -*.ca - -## Certificate -*.crt - -## Certificate Sign Request -*.csr - -## Certificate -*.der - -## Key database file -*.kdb - -## OSCP request data -*.org - -## PKCS #12 -*.p12 - -## PEM-encoded certificate data -*.pem - -## Random number seed -*.rnd - -## SSLeay data -*.ssleay - -## S/MIME message -*.smime - -### Packer template -# Cache objects -packer_cache/ - -# Crash log -crash.log - -# For built boxes -*.box - -### esp-idf template -# gitignore template for esp-idf, the official development framework for ESP32 -# https://github.com/espressif/esp-idf - -build/ -sdkconfig -sdkconfig.old - -### Linux template -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -### CodeIgniter template -*/config/development -*/logs/log-*.php -!*/logs/index.html -*/cache/* -!*/cache/index.html -!*/cache/.htaccess - -user_guide_src/build/* -user_guide_src/cilexer/build/* -user_guide_src/cilexer/dist/* -user_guide_src/cilexer/pycilexer.egg-info/* - -#codeigniter 3 -application/logs/* -!application/logs/index.html -!application/logs/.htaccess -/vendor/ - -### Xojo template -# Xojo (formerly REALbasic and Real Studio) - -Builds* -*.debug -*.debug.app -Debug*.exe -Debug*/Debug*.exe -Debug*/Debug*\ Libs -*.rbuistate -*.xojo_uistate -*.obsolete - -### Ensime template -# Ensime specific -.ensime -.ensime_cache/ -.ensime_lucene/ - -### Sdcc template -# SDCC stuff -*.lnk -*.lst -*.map -*.mem -*.rel -*.rst -*.sym - -### Xilinx template -# gitignore template for Xilinx Vivado Design Suite -# website: https://www.xilinx.com/support/download.html - -# [home] -*.jou -*.log -*.debug -*.str -*.zip -*.tmp -*.rst -*.os -*.js -*.pb -*.dcp -*.hwdef -*.vds -*.veo -*.wdf -*.vdi -*.dmp -*.rpx -*.rpt -*_stub.v -*_stub.vhdl -*_funcsim.v -*_funcsim.vhdl -.project - -# [dir] -*.cache -.metadata -*.data -*.ipdefs -.Xil -*.sdk -*.hw -*.ip_user_files - -### IP synth -*_synth_* - -.jobs - -### project synth -*/*.runs/synth*/*.xml -*/*.runs/synth*/*.txt -*/*.runs/synth*/*.sh -*/*.runs/synth*/*.tcl -*/*.runs/synth*/*.bat -*/*.runs/synth*/*.xdc -!*/*.runs/synth*/*utilization*.rpt - -*.runs/synth*/*.xml -*.runs/synth*/*.txt -*.runs/synth*/*.sh -*.runs/synth*/*.tcl -*.runs/synth*/*.bat -*.runs/synth*/*.xdc -!*.runs/synth*/*utilization*.rpt - -### project impl -*/*.runs/impl*/*.xml -*/*.runs/impl*/*.html -*/*.runs/impl*/*.txt -*/*.runs/impl*/*.sh -*/*.runs/impl*/*.tcl -*/*.runs/impl*/*.bat -!*/*.runs/impl*/*utilization*.rpt - -*.runs/impl*/*.xml -*.runs/impl*/*.html -*.runs/impl*/*.txt -*.runs/impl*/*.sh -*.runs/impl*/*.tcl -*.runs/impl*/*.bat -!*.runs/impl*/*utilization*.rpt - -### block design -*/*/bd/*/hdl -*/*/*/bd/*/hdl - -*/*/bd/*/*.xdc -*/*/*/bd/*/*.xdc - -*/*/bd/*/ip/*/*.xdc -*/*/*/bd/*/ip/*/*.xdc - -*/*/bd/*/ip/*/*/ -*/*/*/bd/*/ip/*/*/ - -*/*/bd/*/ip/*/*.vhd -*/*/*/bd/*/ip/*/*.vhd - -*/*/bd/*/ip/*/*.xml -*/*/*/bd/*/ip/*/*.xml - -*.c -*.h -*.vho -*.html -*/*/bd/*/ip/*/*.tcl -*/*/*/bd/*/ip/*/*.tcl -hw_handoff -ipshared - -### Waf template -# For projects that use the Waf build system: https://waf.io/ -# Dot-hidden on Unix-like systems -.waf-*-*/ -.waf3-*-*/ -# Hidden directory on Windows (no dot) -waf-*-*/ -waf3-*-*/ -# Lockfile -.lock-waf_*_build - -### Patch template -*.orig -*.rej - -### Cloud9 template -# Cloud9 IDE - http://c9.io -.c9revisions -.c9 - -### Mercurial template -.hg/ -.hgignore -.hgsigs -.hgsub -.hgsubstate -.hgtags - -### Laravel template -/vendor/ -node_modules/ -npm-debug.log -yarn-error.log - -# Laravel 4 specific -bootstrap/compiled.php -app/storage/ - -# Laravel 5 & Lumen specific -public/storage -public/hot - -# Laravel 5 & Lumen specific with changed public path -public_html/storage -public_html/hot - -storage/*.key -.env -Homestead.yaml -Homestead.json -/.vagrant -.phpunit.result.cache - -### Processing template -.DS_Store -applet -application.linux-arm64 -application.linux-armv6hf -application.linux32 -application.linux64 -application.windows32 -application.windows64 -application.macosx -out - -### CodeKit template -# General CodeKit files to ignore -config.codekit -config.codekit3 -/min - -### Smalltalk template -# changes file -*.changes -*.chg - -# system image -*.image -*.img7 -*.img - -# Pharo Smalltalk Debug log file -PharoDebug.log - -# Squeak Smalltalk Debug log file -SqueakDebug.log - -# Dolphin Smalltalk source file -*.sml - -# Dolphin Smalltalk error file -*.errors - -# Monticello package cache -/package-cache - -# playground cache -/play-cache -/play-stash - -# Metacello-github cache -/github-cache -github-*.zip - -### BricxCC template -# Bricx Command Center IDE -# http://bricxcc.sourceforge.net -*.bak -*.sym - -### Phoenix template -# gitignore template for Phoenix projects -# website: http://www.phoenixframework.org/ -# -# Recommended template: Elixir.gitignore - -# Temporary files -/tmp - -# Static artifacts -/node_modules -/assets/node_modules - -# Since we are building assets from web/static, -# we ignore priv/static. You may want to comment -# this depending on your deployment strategy. -/priv/static/ - -# Installer-related files -/installer/_build -/installer/tmp -/installer/doc -/installer/deps - -### SeamGen template -/bootstrap/data -/bootstrap/tmp -/classes/ -/dist/ -/exploded-archives/ -/test-build/ -/test-output/ -/test-report/ -/target/ -temp-testng-customsuite.xml - -# based on http://stackoverflow.com/a/8865858/422476 I am removing inline comments - -#/classes/ all class files -#/dist/ contains generated war files for deployment -#/exploded-archives/ war content generation during deploy (or explode) -#/test-build/ test compilation (ant target for Seam) -#/test-output/ test results -#/test-report/ test report generation for, e.g., Hudson -#/target/ maven output folder -#temp-testng-customsuite.xml generated when running test cases under Eclipse - -# Thanks to @VonC and @kraftan for their helpful answers on a related question -# on StackOverflow.com: -# http://stackoverflow.com/questions/4176687 -# /what-is-the-recommended-source-control-ignore-pattern-for-seam-projects - -### Scrivener template -*/Files/binder.autosave -*/Files/binder.backup -*/Files/search.indexes -*/Files/user.lock -*/Files/Docs/docs.checksum -*/Files/Data/docs.checksum -*/QuickLook/ -*/Settings/ui.plist - -### C++ template -# Prerequisites -*.d - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod -*.smod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app - -### JBoss template -jboss/server/all/deploy/project.ext -jboss/server/default/deploy/project.ext -jboss/server/minimal/deploy/project.ext -jboss/server/all/log/*.log -jboss/server/all/tmp/**/* -jboss/server/all/data/**/* -jboss/server/all/work/**/* -jboss/server/default/log/*.log -jboss/server/default/tmp/**/* -jboss/server/default/data/**/* -jboss/server/default/work/**/* -jboss/server/minimal/log/*.log -jboss/server/minimal/tmp/**/* -jboss/server/minimal/data/**/* -jboss/server/minimal/work/**/* - -# deployed package files # - -*.DEPLOYED - -### Meteor template -# gitignore template for the Meteor framework -# website: https://www.meteor.com/ -# -# Recommended template: Node.gitignore - -# protect api keys in setting json -settings-production.json -settings.json - -# protect your mup.json settings -mup.json -mup.js - -### CraftCMS template -# Craft 2 Storage (https://craftcms.com/support/craft-storage-gitignore) -# not necessary for Craft 3 (https://github.com/craftcms/craft/issues/26) -/craft/storage/* -!/craft/storage/rebrand - -### Concrete5 template -# ignore the error log and .htaccess and others -error_log -.htaccess - -# concrete5 5.6 specific - -config/site.php -files/cache/* -files/tmp/* - -# concrete5 5.7 specific - -# ignore everything but the index.html -/application/files/* -!/application/files/index.html - -# ignore updates folder -/updates/* - -# ignore sitemap.xml -/sitemap.xml - -### Autotools template -# http://www.gnu.org/software/automake - -Makefile.in -/ar-lib -/mdate-sh -/py-compile -/test-driver -/ylwrap -.deps/ -.dirstamp - -# http://www.gnu.org/software/autoconf - -autom4te.cache -/autoscan.log -/autoscan-*.log -/aclocal.m4 -/compile -/config.guess -/config.h.in -/config.log -/config.status -/config.sub -/configure -/configure.scan -/depcomp -/install-sh -/missing -/stamp-h1 - -# https://www.gnu.org/software/libtool/ - -/ltmain.sh - -# http://www.gnu.org/software/texinfo - -/texinfo.tex - -# http://www.gnu.org/software/m4/ - -m4/libtool.m4 -m4/ltoptions.m4 -m4/ltsugar.m4 -m4/ltversion.m4 -m4/lt~obsolete.m4 - -# Generated Makefile -# (meta build system like autotools, -# can automatically generate from config.status script -# (which is called by configure script)) -Makefile - -### NWjs template -# gitignore template for NW.js projects -# website: https://nwjs.io/ - -# Seen in standard and sdk versions -credits.html -locales/ -libEGL.dll -libGLEv2.dll -node.dll -nw.dll -nw.exe -natives_blob.bin -nw_100_percent.pak -nw_200_percent.pak -nw_elf.dll -snapshot_blob.bin -resources.pak - -# Seen only in standard -d3dcompiler_47.dll -ffmpeg.dll -icudtl.dat - -# Seen only in sdk -pnacl/ -chromedriver.exe -nacl_irt_x86_64.nexe -nwjc.exe -payload.exe - -### Hugo template -# Generated files by hugo -/public/ -/resources/_gen/ - -# Executable may be added to repository -hugo.exe -hugo.darwin -hugo.linux - -### Splunk template -# gitignore template for Splunk apps -# documentation: http://docs.splunk.com/Documentation/Splunk/6.2.3/admin/Defaultmetaconf - -# Splunk local meta file -local.meta - -# Splunk local folder -local - -### Cordova template -# gitignore template for the Cordova framework -# website: https://cordova.apache.org/ -# -# Recommended template: Node.gitignore - -# App platform binaries and built files -/platforms - -# Optional to ignore plugin Git clones -#/plugins - -### Mercury template -Mercury/ -Mercury.modules -*.mh -*.err -*.init -*.dll -*.exe -*.a -*.so -*.dylib -*.beams -*.d -*.c_date - -### LabVIEW template -# Libraries -*.lvlibp -*.llb - -# Shared objects (inc. Windows DLLs) -*.dll -*.so -*.so.* -*.dylib - -# Executables -*.exe - -# Metadata -*.aliases -*.lvlps -.cache/ - -### Maven template -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -# https://github.com/takari/maven-wrapper#usage-without-binary-jar -.mvn/wrapper/maven-wrapper.jar - -### MonoDevelop template -#User Specific -*.userprefs -*.usertasks - -#Mono Project Files -*.pidb -*.resources -test-results/ - -### VisualStudioCode template -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -*.code-workspace - -# Local History for Visual Studio Code -.history/ - -### CMake template -CMakeLists.txt.user -CMakeCache.txt -CMakeFiles -CMakeScripts -Testing -Makefile -cmake_install.cmake -install_manifest.txt -compile_commands.json -CTestTestfile.cmake -_deps - -### Magento2 template -/sitemap -/sitemap.xml -/pub/sitemap -/pub/sitemap.xml -/app/config_sandbox -/app/etc/config.php -/app/etc/env.php -/app/code/Magento/TestModule* -/lib/internal/flex/uploader/.actionScriptProperties -/lib/internal/flex/uploader/.flexProperties -/lib/internal/flex/uploader/.project -/lib/internal/flex/uploader/.settings -/lib/internal/flex/varien/.actionScriptProperties -/lib/internal/flex/varien/.flexLibProperties -/lib/internal/flex/varien/.project -/lib/internal/flex/varien/.settings -/.grunt -/.php_cs.cache -/grunt-config.json -/dev/tools/grunt/configs/local-themes.js - -/pub/media/*.* -!/pub/media/.htaccess -/pub/media/attribute/* -!/pub/media/attribute/.htaccess -/pub/media/analytics/* -/pub/media/catalog/* -!/pub/media/catalog/.htaccess -/pub/media/customer/* -!/pub/media/customer/.htaccess -/pub/media/downloadable/* -!/pub/media/downloadable/.htaccess -/pub/media/favicon/* -/pub/media/import/* -!/pub/media/import/.htaccess -/pub/media/logo/* -/pub/media/theme/* -/pub/media/theme_customization/* -!/pub/media/theme_customization/.htaccess -/pub/media/wysiwyg/* -!/pub/media/wysiwyg/.htaccess -/pub/media/tmp/* -!/pub/media/tmp/.htaccess -/pub/media/captcha/* -!/pub/media/captcha/.htaccess -/pub/static/* -!/pub/static/.htaccess - -/var/* -!/var/.htaccess -/vendor/* -!/vendor/.htaccess -/generated/* -!/generated/.htaccess - -### Eclipse template -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath -.recommenders - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# PyDev specific (Python IDE for Eclipse) -*.pydevproject - -# CDT-specific (C/C++ Development Tooling) -.cproject - -# CDT- autotools -.autotools - -# Java annotation processor (APT) -.factorypath - -# PDT-specific (PHP Development Tools) -.buildpath - -# sbteclipse plugin -.target - -# Tern plugin -.tern-project - -# TeXlipse plugin -.texlipse - -# STS (Spring Tool Suite) -.springBeans - -# Code Recommenders -.recommenders/ - -# Annotation Processing -.apt_generated/ -.apt_generated_test/ - -# Scala IDE specific (Scala & Java development for Eclipse) -.cache-main -.scala_dependencies -.worksheet - -# Uncomment this line if you wish to ignore the project description file. -# Typically, this file would be tracked if it contains build/dependency configurations: -#.project - -### Magento1 template -# gitignore template for Magento v1 projects -# -# It is recommended that you use `Magento.gitignore` as this is the latest version - -/PATCH_*.sh - -/app/etc/local.xml - -/media/* -!/media/.htaccess - -!/media/customer -/media/customer/* -!/media/customer/.htaccess - -!/media/dhl -/media/dhl/* -!/media/dhl/logo.jpg - -!/media/downloadable -/media/downloadable/* -!/media/downloadable/.htaccess - -!/media/xmlconnect -/media/xmlconnect/* - -!/media/xmlconnect/custom -/media/xmlconnect/custom/* -!/media/xmlconnect/custom/ok.gif - -!/media/xmlconnect/original -/media/xmlconnect/original/* -!/media/xmlconnect/original/ok.gif - -!/media/xmlconnect/system -/media/xmlconnect/system/* -!/media/xmlconnect/system/ok.gif - -/var/* -!/var/.htaccess - -!/var/package -/var/package/* -!/var/package/*.xml - - -### Go template -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, built with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -# Dependency directories (remove the comment below to include it) -# vendor/ - -### PuTTY template -# Private key -*.ppk - -### MATLAB template -# Windows default autosave extension -*.asv - -# OSX / *nix default autosave extension -*.m~ - -# Compiled MEX binaries (all platforms) -*.mex* - -# Packaged app and toolbox files -*.mlappinstall -*.mltbx - -# Generated helpsearch folders -helpsearch*/ - -# Simulink code generation folders -slprj/ -sccprj/ - -# Matlab code generation folders -codegen/ - -# Simulink autosave extension -*.autosave - -# Simulink cache files -*.slxc - -# Octave session info -octave-workspace - -### RhodesRhomobile template -rholog-* -sim-* -bin/libs -bin/RhoBundle -bin/tmp -bin/target -bin/*.ap_ -*.o -*.jar - -### JetBrains template -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/artifacts -# .idea/compiler.xml -# .idea/jarRepositories.xml -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -### OpenCart template -.htaccess -/config.php -admin/config.php - -!index.html - -download/ -image/data/ -image/cache/ -system/cache/ -system/logs/ - -system/storage/ - -# vQmod log files -vqmod/logs/* -# vQmod cache files -vqmod/vqcache/* -vqmod/checked.cache -vqmod/mods.cache - -### OCaml template -*.annot -*.cmo -*.cma -*.cmi -*.a -*.o -*.cmx -*.cmxs -*.cmxa - -# ocamlbuild working directory -_build/ - -# ocamlbuild targets -*.byte -*.native - -# oasis generated files -setup.data -setup.log - -# Merlin configuring file for Vim and Emacs -.merlin - -# Dune generated files -*.install - -# Local OPAM switch -_opam/ - -### Haskell template -dist -dist-* -cabal-dev -*.o -*.hi -*.hie -*.chi -*.chs.h -*.dyn_o -*.dyn_hi -.hpc -.hsenv -.cabal-sandbox/ -cabal.sandbox.config -*.prof -*.aux -*.hp -*.eventlog -.stack-work/ -cabal.project.local -cabal.project.local~ -.HTF/ -.ghc.environment.* - -### Prestashop template -# Cache, temp and personal files - -/.htaccess -*.log - -# Cache -/cache/* -!/cache/.htaccess -!/cache/cachefs/index.php -!/cache/deprecated.txt -!/cache/index.php -!/cache/purifier/index.php -!/cache/push/activity -!/cache/push/index.php -!/cache/push/trends -!/cache/sandbox/index.php -!/cache/smarty/cache/index.php -!/cache/smarty/compile/index.php -!/cache/smarty/index.php -!/cache/tcpdf/index.php - -# Download -/download/* -!/download/.htaccess -!/download/index.php - -# Images -/img/* -!/img/.htaccess -!/img/index.php -!/img/404.gif -!/img/bg_500.png -!/img/bg_loader.png -!/img/favicon.ico -!/img/loader.gif -!/img/loadingAnimation.gif -!/img/logo.jpg -!/img/logo.png -!/img/logo_invoice.jpg -!/img/logo_stores.png -!/img/macFFBgHack.png -!/img/prestashop-avatar.png -!/img/prestashop@2x.png -!/img/preston-login-wink@2x.png -!/img/preston-login@2x.png -!/img/questionmark.png -!/img/genders/index.php -!/img/admin/index.php -!/img/c/index.php -!/img/cms/index.php -!/img/co/index.php -!/img/jquery-ui -!/img/l/index.php -!/img/m/index.php -!/img/os/index.php -!/img/p/index.php -!/img/s/index.php -!/img/scenes -!/img/st/index.php -!/img/su/index.php -!/img/t/index.php -!/img/tmp/index.php - -# Upload -/upload/* -!/upload/.htaccess - -/vendor/* -/docs/phpdoc-sf/ -/composer.lock -*.hot-update.js -*.hot-update.json - - -/admin-dev/autoupgrade/* -!/admin-dev/autoupgrade/index.php -!/admin-dev/autoupgrade/backup/index.php - -/admin-dev/backups/* -!/admin-dev/backups/.htaccess - -/admin-dev/import/* -!/admin-dev/import/.htaccess -!/admin-dev/import/index.php - -/admin-dev/export/* -!/admin-dev/export/.htaccess -!/admin-dev/export/index.php - -# Downloaded RTL files -/admin-dev/themes/default/css/bundle/default_rtl.css -/admin-dev/themes/default/css/bundle/shared_rtl.css -/admin-dev/themes/default/css/font_rtl.css -/admin-dev/themes/default/css/overrides_rtl.css -/admin-dev/themes/default/css/vendor/font-awesome/font-awesome_rtl.css -/admin-dev/themes/default/css/vendor/nv.d3_rtl.css -/admin-dev/themes/default/css/vendor/titatoggle-min_rtl.css -/admin-dev/themes/default/public/theme_rtl.css -/admin-dev/themes/new-theme/css/module/drop_rtl.css -/admin-dev/themes/new-theme/css/right-sidebar_rtl.css - -themes/*/cache/* - -# Config - -config/settings.inc.php -config/settings.old.php -config/xml/* -config/themes/* -!config/xml/themes/default.xml -themes/*/config/settings_*.json -app/config/parameters.old.yml -app/config/config.php - -# Themes, modules and overrides - -modules/* -override/* -themes/*/ -!themes/classic -!themes/_core -!themes/_libraries - -# Vendors and dependencies - -bower_components/ -node_modules/ -composer.phar -php-cs-fixer -.grunt/* - -# Translations and emails templates - -translations/* -mails/* -!mails/themes/ -!mails/_partials/ -themes/default-bootstrap/lang/* -themes/default-bootstrap/modules/*/translations/*.php -themes/default-bootstrap/mails/* -!themes/default-bootstrap/mails/en/ -themes/default-bootstrap/modules/*/mails/* -!themes/default-bootstrap/modules/*/mails/en - -# MISC - -*sitemap.xml -/robots.txt - -# Symfony - -/bin/ -/app/Resources/geoip/GeoLite2-City.mmdb -/app/Resources/translations/* -!/app/Resources/translations/default -/app/config/parameters.yml -/app/config/parameters.php -/build/ -/phpunit.xml -/var/* -!/var/cache -/var/cache/* -!var/cache/.gitkeep -!/var/logs -/var/logs/* -!var/logs/.gitkeep -!/var/sessions -/var/sessions/* -!var/sessions/.gitkeep -!var/SymfonyRequirements.php -/vendor/ -/web/bundles/ - - -### TortoiseGit template -# Project-level settings -/.tgitconfig - -### Nikola template -# gitignore template for Nikola static site generator -# website: https://getnikola.com/ - -.doit.db -*.py[cod] -cache/ -output/ - -### Perl template -!Build/ -.last_cover_stats -/META.yml -/META.json -/MYMETA.* -*.o -*.pm.tdy -*.bs - -# Devel::Cover -cover_db/ - -# Devel::NYTProf -nytprof.out - -# Dizt::Zilla -/.build/ - -# Module::Build -_build/ -Build -Build.bat - -# Module::Install -inc/ - -# ExtUtils::MakeMaker -/blib/ -/_eumm/ -/*.gz -/Makefile -/Makefile.old -/MANIFEST.bak -/pm_to_blib -/*.zip - -### JENKINS_HOME template -# Learn more about Jenkins and JENKINS_HOME directory for which this file is -# intended. -# -# http://jenkins-ci.org/ -# https://wiki.jenkins-ci.org/display/JENKINS/Administering+Jenkins -# -# Note: secret.key is purposefully not tracked by git. This should be backed up -# separately because configs may contain secrets which were encrypted using the -# secret.key. To back up secrets use 'tar -czf /tmp/secrets.tgz secret*' and -# save the file separate from your repository. If you want secrets backed up -# with configuration, then see the bottom of this file for an example. - -# Ignore all JENKINS_HOME except jobs directory, root xml config, and -# .gitignore file. -/* -!/jobs -!/.gitignore -!/*.xml - -# Ignore all files in jobs subdirectories except for folders. -# Note: git doesn't track folders, only file content. -jobs/** -!jobs/**/ - -# Uncomment the following line to save next build numbers with config. - -#!jobs/**/nextBuildNumber - -# For performance reasons, we want to ignore builds in Jenkins jobs because it -# contains many tiny files on large installations. This can impact git -# performance when running even basic commands like 'git status'. -builds -indexing - -# Exclude only config.xml files in repository subdirectories. -!config.xml - -# Don't track workspaces (when users build on the master). -jobs/**/*workspace - -# Security warning: If secrets are included with your configuration, then an -# adversary will be able to decrypt all encrypted secrets within Jenkins -# config. Including secrets is a bad practice, but the example is included in -# case someone still wants it for convenience. Uncomment the following line to -# include secrets for decryption with repository configuration in Git. - -#!/secret* - -# As a result, only Jenkins settings and job config.xml files in JENKINS_HOME -# will be tracked by git. - -### KDevelop4 template -*.kdev4 -.kdev4/ - -### ExtJs template -.architect -bootstrap.css -bootstrap.js -bootstrap.json -bootstrap.jsonp -build/ -classic.json -classic.jsonp -ext/ -modern.json -modern.jsonp -resources/sass/.sass-cache/ -resources/.arch-internal-preview.css -.arch-internal-preview.css - -### Drupal template -# gitignore template for Drupal 8 projects -# -# earlier versions of Drupal are tracked in `community/PHP/` - -# Ignore configuration files that may contain sensitive information -/sites/*/*settings*.php -/sites/*/*services*.yml - -# Ignore paths that may contain user-generated content -/sites/*/files -/sites/*/public -/sites/*/private -/sites/*/files-public -/sites/*/files-private - -# Ignore paths that may contain temporary files -/sites/*/translations -/sites/*/tmp -/sites/*/cache - -# Ignore testing related files -/sites/simpletest - -# Ignore drupal core (if not versioning drupal sources) -/core -/vendor -/modules/README.txt -/profiles/README.txt -/themes/README.txt -/sites/README.txt -/sites/example.sites.php -/sites/example.settings.local.php -/sites/development.services.yml -/.csslintrc -/.editorconfig -/.eslintignore -/.eslintrc.json -/.gitattributes -/.ht.router.php -/.htaccess -/autoload.php -/example.gitignore -/index.php -/INSTALL.txt -/LICENSE.txt -/README.txt -/robots.txt -/update.php -/web.config - -### SlickEdit template -# SlickEdit workspace and project files are ignored by default because -# typically they are considered to be developer-specific and not part of a -# project. -*.vpw -*.vpj - -# SlickEdit workspace history and tag files always contain user-specific -# data so they should not be stored in a repository. -*.vpwhistu -*.vpwhist -*.vtg - -### Emacs template -# -*- mode: gitignore; -*- -*~ -\#*\# -/.emacs.desktop -/.emacs.desktop.lock -*.elc -auto-save-list -tramp -.\#* - -# Org-mode -.org-id-locations -*_archive - -# flymake-mode -*_flymake.* - -# eshell files -/eshell/history -/eshell/lastdir - -# elpa packages -/elpa/ - -# reftex files -*.rel - -# AUCTeX auto folder -/auto/ - -# cask packages -.cask/ -dist/ - -# Flycheck -flycheck_*.el - -# server auth directory -/server/ - -# projectiles files -.projectile - -# directory configuration -.dir-locals.el - -# network security -/network-security.data - - -### Yii template -assets/* -!assets/.gitignore -protected/runtime/* -!protected/runtime/.gitignore -protected/data/*.db -themes/classic/views/ - -### AppEngine template -# Google App Engine generated folder -appengine-generated/ - -### KiCad template -# For PCBs designed using KiCad: http://www.kicad-pcb.org/ -# Format documentation: http://kicad-pcb.org/help/file-formats/ - -# Temporary files -*.000 -*.bak -*.bck -*.kicad_pcb-bak -*.kicad_sch-bak -*.kicad_prl -*.sch-bak -*~ -_autosave-* -*.tmp -*-save.pro -*-save.kicad_pcb -fp-info-cache - -# Netlist files (exported from Eeschema) -*.net - -# Autorouter files (exported from Pcbnew) -*.dsn -*.ses - -# Exported BOM files -*.xml -*.csv - -### Swift template -# Xcode -# -# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore - -## User settings -xcuserdata/ - -## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) -*.xcscmblueprint -*.xccheckout - -## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) -build/ -DerivedData/ -*.moved-aside -*.pbxuser -!default.pbxuser -*.mode1v3 -!default.mode1v3 -*.mode2v3 -!default.mode2v3 -*.perspectivev3 -!default.perspectivev3 - -## Obj-C/Swift specific -*.hmap - -## App packaging -*.ipa -*.dSYM.zip -*.dSYM - -## Playgrounds -timeline.xctimeline -playground.xcworkspace - -# Swift Package Manager -# -# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. -# Packages/ -# Package.pins -# Package.resolved -# *.xcodeproj -# -# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata -# hence it is not needed unless you have added a package configuration file to your project -# .swiftpm - -.build/ - -# CocoaPods -# -# We recommend against adding the Pods directory to your .gitignore. However -# you should judge for yourself, the pros and cons are mentioned at: -# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control -# -# Pods/ -# -# Add this line if you want to avoid checking in source code from the Xcode workspace -# *.xcworkspace - -# Carthage -# -# Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts - -Carthage/Build/ - -# Accio dependency management -Dependencies/ -.accio/ - -# fastlane -# -# It is recommended to not store the screenshots in the git repo. -# Instead, use fastlane to re-generate the screenshots whenever they are needed. -# For more information about the recommended setup visit: -# https://docs.fastlane.tools/best-practices/source-control/#source-control - -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots/**/*.png -fastlane/test_output - -# Code Injection -# -# After new code Injection tools there's a generated folder /iOSInjectionProject -# https://github.com/johnno1962/injectionforxcode - -iOSInjectionProject/ - -### Calabash template -# Calabash / Cucumber -rerun/ -reports/ -screenshots/ -screenshot*.png -test-servers/ - -# bundler -.bundle -vendor - -### LemonStand template -boot.php -index.php -install.php -/config/* -!/config/config.php -/controllers/* -/init/* -/logs/* -/phproad/* -/temp/* -/uploaded/* -/installer_files/* -/modules/backend/* -/modules/blog/* -/modules/cms/* -/modules/core/* -/modules/session/* -/modules/shop/* -/modules/system/* -/modules/users/* -# add content_*.php if you don't want erase client changes to content - -### Jekyll template -_site/ -.sass-cache/ -.jekyll-cache/ -.jekyll-metadata - -### Xcode template -# Xcode -# -# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore - -## User settings -xcuserdata/ - -## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) -*.xcscmblueprint -*.xccheckout - -## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) -build/ -DerivedData/ -*.moved-aside -*.pbxuser -!default.pbxuser -*.mode1v3 -!default.mode1v3 -*.mode2v3 -!default.mode2v3 -*.perspectivev3 -!default.perspectivev3 - -## Gcc Patch -/*.gcno - -### Metals template - # Generated Metals (Scala Language Server) files - # Reference: https://scalameta.org/metals/ -.metals/ -.bloop/ -project/metals.sbt - -### Lazarus template -# Lazarus compiler-generated binaries (safe to delete) -*.exe -*.dll -*.so -*.dylib -*.lrs -*.res -*.compiled -*.dbg -*.ppu -*.o -*.or -*.a - -# Lazarus autogenerated files (duplicated info) -*.rst -*.rsj -*.lrt - -# Lazarus local files (user-specific info) -*.lps - -# Lazarus backups and unit output folders. -# These can be changed by user in Lazarus/project options. -backup/ -*.bak -lib/ - -# Application bundle for Mac OS -*.app/ - -### Drupal7 template -# gitignore template for Drupal 7 projects -# -# It is recommended that you use `Drupal.gitignore` as this is the latest version - -# Ignore configuration files that may contain sensitive information. -sites/*/*settings*.php -sites/example.sites.php - -# Ignore paths that contain generated content. -files/ -sites/*/files -sites/*/private -sites/*/translations - -# Ignore default text files -robots.txt -/CHANGELOG.txt -/COPYRIGHT.txt -/INSTALL*.txt -/LICENSE.txt -/MAINTAINERS.txt -/UPGRADE.txt -/README.txt -sites/README.txt -sites/all/libraries/README.txt -sites/all/modules/README.txt -sites/all/themes/README.txt - -# Ignore everything but the "sites" folder ( for non core developer ) -.htaccess -web.config -authorize.php -cron.php -index.php -install.php -update.php -xmlrpc.php -/includes -/misc -/modules -/profiles -/scripts -/themes - -### Objective-C template -# Xcode -# -# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore - -## User settings -xcuserdata/ - -## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) -*.xcscmblueprint -*.xccheckout - -## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) -build/ -DerivedData/ -*.moved-aside -*.pbxuser -!default.pbxuser -*.mode1v3 -!default.mode1v3 -*.mode2v3 -!default.mode2v3 -*.perspectivev3 -!default.perspectivev3 - -## Obj-C/Swift specific -*.hmap - -## App packaging -*.ipa -*.dSYM.zip -*.dSYM - -# CocoaPods -# -# We recommend against adding the Pods directory to your .gitignore. However -# you should judge for yourself, the pros and cons are mentioned at: -# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control -# -# Pods/ -# -# Add this line if you want to avoid checking in source code from the Xcode workspace -# *.xcworkspace - -# Carthage -# -# Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts - -Carthage/Build/ - -# fastlane -# -# It is recommended to not store the screenshots in the git repo. -# Instead, use fastlane to re-generate the screenshots whenever they are needed. -# For more information about the recommended setup visit: -# https://docs.fastlane.tools/best-practices/source-control/#source-control - -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots/**/*.png -fastlane/test_output - -# Code Injection -# -# After new code Injection tools there's a generated folder /iOSInjectionProject -# https://github.com/johnno1962/injectionforxcode - -iOSInjectionProject/ - -### Textpattern template -.htaccess -css.php -rpc/ -sites/site*/admin/ -sites/site*/private/ -sites/site*/public/admin/ -sites/site*/public/setup/ -sites/site*/public/theme/ -textpattern/ -HISTORY.txt -README.txt - -### Agda template -*.agdai -MAlonzo/** - -### Godot template -# Godot-specific ignores -.import/ -export.cfg -export_presets.cfg - -# Imported translations (automatically generated from CSV files) -*.translation - -# Mono-specific ignores -.mono/ -data_*/ - -### macOS template -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -### Composer template -composer.phar -/vendor/ - -# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -### Coq template -.*.aux -.*.d -*.a -*.cma -*.cmi -*.cmo -*.cmx -*.cmxa -*.cmxs -*.glob -*.ml.d -*.ml4.d -*.mli.d -*.mllib.d -*.mlpack.d -*.native -*.o -*.v.d -*.vio -*.vo -*.vok -*.vos -.coq-native/ -.csdp.cache -.lia.cache -.nia.cache -.nlia.cache -.nra.cache -csdp.cache -lia.cache -nia.cache -nlia.cache -nra.cache - -# generated timing files -*.timing.diff -*.v.after-timing -*.v.before-timing -*.v.timing -time-of-build-after.log -time-of-build-before.log -time-of-build-both.log -time-of-build-pretty.log - -### GWT template -*.class - -# Package Files # -*.jar -*.war - -# gwt caches and compiled units # -war/gwt_bree/ -gwt-unitCache/ - -# boilerplate generated classes # -.apt_generated/ - -# more caches and things from deploy # -war/WEB-INF/deploy/ -war/WEB-INF/classes/ - -#compilation logs -.gwt/ - -#gwt junit compilation files -www-test/ - -#old GWT (1.5) created this dir -.gwt-tmp/ - -### Otto template -.otto/ - -### Vue template -# gitignore template for Vue.js projects -# -# Recommended template: Node.gitignore - -# TODO: where does this rule come from? -docs/_book - -# TODO: where does this rule come from? -test/ - -### Sass template -.sass-cache/ -*.css.map -*.sass.map -*.scss.map - -### Kotlin template -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -### Julia template -# Files generated by invoking Julia with --code-coverage -*.jl.cov -*.jl.*.cov - -# Files generated by invoking Julia with --track-allocation -*.jl.mem - -# System-specific files and directories generated by the BinaryProvider and BinDeps packages -# They contain absolute paths specific to the host computer, and so should not be committed -deps/deps.jl -deps/build.log -deps/downloads/ -deps/usr/ -deps/src/ - -# Build artifacts for creating documentation generated by the Documenter package -docs/build/ -docs/site/ - -# File generated by Pkg, the package manager, based on a corresponding Project.toml -# It records a fixed state of all packages used by the project. As such, it should not be -# committed for packages, but should be committed for applications that require a static -# environment. -Manifest.toml - -### Puppet template -# gitignore template for Puppet modules -# website: https://forge.puppet.com/ - -# Built packages -pkg/* - -# Should run on multiple platforms so don't check in -Gemfile.lock - -# Tests -spec/fixtures/* -coverage/* - -# Third-party -vendor/* -.bundle/* - -### JDeveloper template -# default application storage directory used by the IDE Performance Cache feature -.data/ - -# used for ADF styles caching -temp/ - -# default output directories -classes/ -deploy/ -javadoc/ - -# lock file, a part of Oracle Credential Store Framework -cwallet.sso.lck -### Virtuoso template -# Gitignore for Cadence Virtuoso -################################################################ - -# Log files -*.log -panic*.log.* - -# OpenAccess database lock files -*.cdslck* - -# Run directories for layout vs. schematic and design rule check -lvsRunDir/* -drcRunDir/* - -# Abstract generation tool -abstract.log* -abstract.record* - - -### NotepadPP template -# Notepad++ backups # -*.bak - -### IAR_EWARM template -# gitignore template for the IAR EWARM -# website: https://www.iar.com/ - -# Some tools will put the EWARM files -# under a subdirectory with the same name -# as the configuration. -# Example -# EWARM/Config1/Obj /List /Exe -# EWARM/Config2/Obj /List /Exe -EWARM/**/Obj -EWARM/**/List -EWARM/**/Exe - -# Autogenerated project files -*.dep -*.ewt - -# Autogenerated folder for debugger -EWARM/settings - -### EiffelStudio template -# The compilation directory -EIFGENs - -### Bitrix template -# gitignore template for 1C-Bitrix, a PHP-based CMS -# website: https://www.1c-bitrix.ru - -#Exclude all of core files -/bitrix/* - -#But not the templates and non bitrix components -!/bitrix/templates -!/bitrix/components -/bitrix/components/bitrix - -#Exclude bitrix gadgets -!/bitrix/gadgets -/bitrix/gadgets/bitrix - -#User can use that directory to store some stuff, but it's not really recommended, just use /local instead of this -!/bitrix/php_interface/ - -#Exclude database configs -/bitrix/php_interface/dbconn.php - -#Exclude default file storage directory -/upload/ - -### WebMethods template -**/IntegrationServer/datastore/ -**/IntegrationServer/db/ -**/IntegrationServer/DocumentStore/ -**/IntegrationServer/lib/ -**/IntegrationServer/logs/ -**/IntegrationServer/replicate/ -**/IntegrationServer/sdk/ -**/IntegrationServer/support/ -**/IntegrationServer/update/ -**/IntegrationServer/userFtpRoot/ -**/IntegrationServer/web/ -**/IntegrationServer/WmRepository4/ -**/IntegrationServer/XAStore/ -**/IntegrationServer/packages/Wm*/ - -### TurboGears2 template -*.py[co] - -# Default development database -devdata.db - -# Default data directory -data/* - -# Packages -*.egg -*.egg-info -dist -build - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -### Fortran template -# Prerequisites -*.d - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod -*.smod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app - -### Vagrant template -# General -.vagrant/ - -# Log files (if you are creating logs in debug mode, uncomment this) -# *.log - -### ThinkPHP template -# gitignore template for ThinkPHP v3.2.3 -# website: http://www.thinkphp.cn/ - -# Logs and Cache files -/Application/Runtime/ - -# Common configure file -/Application/Common/Conf/config.php -### Example user template template -### Example user template - -# IntelliJ project files -.idea -*.iml -out -gen -### Typo3 template -## TYPO3 v6.2 -# Ignore several upload and file directories. -/fileadmin/user_upload/ -/fileadmin/_temp_/ -/fileadmin/_processed_/ -/uploads/ -# Ignore cache -/typo3conf/temp_CACHED* -/typo3conf/temp_fieldInfo.php -/typo3conf/deprecation_*.log -/typo3conf/ENABLE_INSTALL_TOOL -/typo3conf/realurl_autoconf.php -/FIRST_INSTALL -# Ignore system folders, you should have them symlinked. -# If not comment out the following entries. -/typo3 -/typo3_src -/typo3_src-* -/Packages -/.htaccess -/index.php -# Ignore temp directory. -/typo3temp/ - -### CodeSniffer template -# gitignore for the PHP Codesniffer framework -# website: https://github.com/squizlabs/PHP_CodeSniffer -# -# Recommended template: PHP.gitignore - -/wpcs/* - -### Archives template -# It's better to unpack these files and commit the raw source because -# git has its own built in compression methods. -*.7z -*.jar -*.rar -*.zip -*.gz -*.gzip -*.tgz -*.bzip -*.bzip2 -*.bz2 -*.xz -*.lzma -*.cab -*.xar - -# Packing-only formats -*.iso -*.tar - -# Package management formats -*.dmg -*.xpi -*.gem -*.egg -*.deb -*.rpm -*.msi -*.msm -*.msp -*.txz - -### UnrealEngine template -# Visual Studio 2015 user specific files -.vs/ - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app -*.ipa - -# These project files can be generated by the engine -*.xcodeproj -*.xcworkspace -*.sln -*.suo -*.opensdf -*.sdf -*.VC.db -*.VC.opendb - -# Precompiled Assets -SourceArt/**/*.png -SourceArt/**/*.tga - -# Binary Files -Binaries/* -Plugins/*/Binaries/* - -# Builds -Build/* - -# Whitelist PakBlacklist-.txt files -!Build/*/ -Build/*/** -!Build/*/PakBlacklist*.txt - -# Don't ignore icon files in Build -!Build/**/*.ico - -# Built data for maps -*_BuiltData.uasset - -# Configuration files generated by the Editor -Saved/* - -# Compiled source files for the engine to use -Intermediate/* -Plugins/*/Intermediate/* - -# Cache files for the editor to use -DerivedDataCache/* - -### FuelPHP template -# the composer package lock file and install directory -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# /composer.lock -/fuel/vendor - -# the fuelphp document -/docs/ - -# you may install these packages with `oil package`. -# http://fuelphp.com/docs/packages/oil/package.html -# /fuel/packages/auth/ -# /fuel/packages/email/ -# /fuel/packages/oil/ -# /fuel/packages/orm/ -# /fuel/packages/parser/ - -# dynamically generated files -/fuel/app/logs/*/*/* -/fuel/app/cache/*/* -/fuel/app/config/crypt.php - -### SynopsysVCS template -# Waveform formats -*.vcd -*.vpd -*.evcd -*.fsdb - -# Default name of the simulation executable. A different name can be -# specified with this switch (the associated daidir database name is -# also taken from here): -o / -simv - -# Generated for Verilog and VHDL top configs -simv.daidir/ -simv.db.dir/ - -# Infrastructure necessary to co-simulate SystemC models with -# Verilog/VHDL models. An alternate directory may be specified with this -# switch: -Mdir= -csrc/ - -# Log file - the following switch allows to specify the file that will be -# used to write all messages from simulation: -l -*.log - -# Coverage results (generated with urg) and database location. The -# following switch can also be used: urg -dir .vdb -simv.vdb/ -urgReport/ - -# DVE and UCLI related files. -DVEfiles/ -ucli.key - -# When the design is elaborated for DirectC, the following file is created -# with declarations for C/C++ functions. -vc_hdrs.h - -### Python template -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -### Elisp template -# Compiled -*.elc - -# Packaging -.cask - -# Backup files -*~ - -# Undo-tree save-files -*.~undo-tree - -### Momentics template -# Built files -x86/ -arm/ -arm-p/ -translations/*.qm - -# IDE settings -.settings/ - -### VVVV template - -# .v4p backup files -*~.xml - -# Dynamic plugins .dll -bin/ - -### Octave template -# Windows default autosave extension -*.asv - -# OSX / *nix default autosave extension -*.m~ - -# Compiled MEX binaries (all platforms) -*.mex* - -# Packaged app and toolbox files -*.mlappinstall -*.mltbx - -# Generated helpsearch folders -helpsearch*/ - -# Simulink code generation folders -slprj/ -sccprj/ - -# Matlab code generation folders -codegen/ - -# Simulink autosave extension -*.autosave - -# Simulink cache files -*.slxc - -# Octave session info -octave-workspace - -### Qooxdoo template -cache -cache-downloads -inspector -api -source/inspector.html - -### Android template -# Built application files -*.apk -*.aar -*.ap_ -*.aab - -# Files for the ART/Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ -out/ -# Uncomment the following line in case you need and you don't have the release build type files in your app -# release/ - -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# Log Files -*.log - -# Android Studio Navigation editor temp files -.navigation/ - -# Android Studio captures folder -captures/ - -# IntelliJ -*.iml -.idea/workspace.xml -.idea/tasks.xml -.idea/gradle.xml -.idea/assetWizardSettings.xml -.idea/dictionaries -.idea/libraries -# Android Studio 3 in .gitignore file. -.idea/caches -.idea/modules.xml -# Comment next line if keeping position of elements in Navigation Editor is relevant for you -.idea/navEditor.xml - -# Keystore files -# Uncomment the following lines if you do not want to check your keystore files in. -#*.jks -#*.keystore - -# External native build folder generated in Android Studio 2.2 and later -.externalNativeBuild -.cxx/ - -# Google Services (e.g. APIs or Firebase) -# google-services.json - -# Freeline -freeline.py -freeline/ -freeline_project_description.json - -# fastlane -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots -fastlane/test_output -fastlane/readme.md - -# Version control -vcs.xml - -# lint -lint/intermediates/ -lint/generated/ -lint/outputs/ -lint/tmp/ -# lint/reports/ - -# Android Profiling -*.hprof - -### Rails template -*.rbc -capybara-*.html -.rspec -/db/*.sqlite3 -/db/*.sqlite3-journal -/db/*.sqlite3-[0-9]* -/public/system -/coverage/ -/spec/tmp -*.orig -rerun.txt -pickle-email-*.html - -# Ignore all logfiles and tempfiles. -/log/* -/tmp/* -!/log/.keep -!/tmp/.keep - -# TODO Comment out this rule if you are OK with secrets being uploaded to the repo -config/initializers/secret_token.rb -config/master.key - -# Only include if you have production secrets in this file, which is no longer a Rails default -# config/secrets.yml - -# dotenv, dotenv-rails -# TODO Comment out these rules if environment variables can be committed -.env -.env.* - -## Environment normalization: -/.bundle -/vendor/bundle - -# these should all be checked in to normalize the environment: -# Gemfile.lock, .ruby-version, .ruby-gemset - -# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: -.rvmrc - -# if using bower-rails ignore default bower_components path bower.json files -/vendor/assets/bower_components -*.bowerrc -bower.json - -# Ignore pow environment settings -.powenv - -# Ignore Byebug command history file. -.byebug_history - -# Ignore node_modules -node_modules/ - -# Ignore precompiled javascript packs -/public/packs -/public/packs-test -/public/assets - -# Ignore yarn files -/yarn-error.log -yarn-debug.log* -.yarn-integrity - -# Ignore uploaded files in development -/storage/* -!/storage/.keep -/public/uploads - -### Unity template -# This .gitignore file should be placed at the root of your Unity project directory -# -# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore -# -/[Ll]ibrary/ -/[Tt]emp/ -/[Oo]bj/ -/[Bb]uild/ -/[Bb]uilds/ -/[Ll]ogs/ -/[Uu]ser[Ss]ettings/ - -# MemoryCaptures can get excessive in size. -# They also could contain extremely sensitive data -/[Mm]emoryCaptures/ - -# Asset meta data should only be ignored when the corresponding asset is also ignored -!/[Aa]ssets/**/*.meta - -# Uncomment this line if you wish to ignore the asset store tools plugin -# /[Aa]ssets/AssetStoreTools* - -# Autogenerated Jetbrains Rider plugin -/[Aa]ssets/Plugins/Editor/JetBrains* - -# Visual Studio cache directory -.vs/ - -# Gradle cache directory -.gradle/ - -# Autogenerated VS/MD/Consulo solution and project files -ExportedObj/ -.consulo/ -*.csproj -*.unityproj -*.sln -*.suo -*.tmp -*.user -*.userprefs -*.pidb -*.booproj -*.svd -*.pdb -*.mdb -*.opendb -*.VC.db - -# Unity3D generated meta files -*.pidb.meta -*.pdb.meta -*.mdb.meta - -# Unity3D generated file on crash reports -sysinfo.txt - -# Builds -*.apk -*.aab -*.unitypackage - -# Crashlytics generated file -crashlytics-build.properties - -# Packed Addressables -/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin* - -# Temporary auto-generated Android Assets -/[Aa]ssets/[Ss]treamingAssets/aa.meta -/[Aa]ssets/[Ss]treamingAssets/aa/* - -### SymphonyCMS template -manifest/cache/ -manifest/logs/ -manifest/tmp/ -symphony/ -workspace/uploads/ -install-log.txt - -### XilinxISE template -# intermediate build files -*.bgn -*.bit -*.bld -*.cmd_log -*.drc -*.ll -*.lso -*.msd -*.msk -*.ncd -*.ngc -*.ngd -*.ngr -*.pad -*.par -*.pcf -*.prj -*.ptwx -*.rbb -*.rbd -*.stx -*.syr -*.twr -*.twx -*.unroutes -*.ut -*.xpi -*.xst -*_bitgen.xwbt -*_envsettings.html -*_map.map -*_map.mrp -*_map.ngm -*_map.xrpt -*_ngdbuild.xrpt -*_pad.csv -*_pad.txt -*_par.xrpt -*_summary.html -*_summary.xml -*_usage.xml -*_xst.xrpt - -# iMPACT generated files -_impactbatch.log -impact.xsl -impact_impact.xwbt -ise_impact.cmd -webtalk_impact.xml - -# Core Generator generated files -xaw2verilog.log - -# project-wide generated files -*.gise -par_usage_statistics.html -usage_statistics_webtalk.html -webtalk.log -webtalk_pn.xml - -# generated folders -iseconfig/ -xlnx_auto_0_xdb/ -xst/ -_ngo/ -_xmsgs/ - -### ROS template -devel/ -logs/ -build/ -bin/ -lib/ -msg_gen/ -srv_gen/ -msg/*Action.msg -msg/*ActionFeedback.msg -msg/*ActionGoal.msg -msg/*ActionResult.msg -msg/*Feedback.msg -msg/*Goal.msg -msg/*Result.msg -msg/_*.py -build_isolated/ -devel_isolated/ - -# Generated by dynamic reconfigure -*.cfgc -/cfg/cpp/ -/cfg/*.py - -# Ignore generated docs -*.dox -*.wikidoc - -# eclipse stuff -.project -.cproject - -# qcreator stuff -CMakeLists.txt.user - -srv/_*.py -*.pcd -*.pyc -qtcreator-* -*.user - -/planning/cfg -/planning/docs -/planning/src - -*~ - -# Emacs -.#* - -# Catkin custom files -CATKIN_IGNORE - -### Ansible template -*.retry - -### Kohana template -application/cache/* -application/logs/* - -### Zephir template -# Cache files, generates by Zephir -.temp/ -.libs/ - -# Object files, generates by linker -*.lo -*.la -*.o -*.loT - -# Files generated by configure and Zephir, -# not required for extension compilation. -ext/build/ -ext/modules/ -ext/Makefile* -ext/config* -ext/acinclude.m4 -ext/aclocal.m4 -ext/autom4te* -ext/install-sh -ext/ltmain.sh -ext/missing -ext/mkinstalldirs -ext/run-tests.php -ext/.deps -ext/libtool - -### SAM template -# gitignore template for AWS Serverless Application Model project -# website: https://docs.aws.amazon.com/serverless-application-model - -# Ignore build folder -.aws-sam/ - -### Dart template -# See https://www.dartlang.org/guides/libraries/private-files - -# Files and directories created by pub -.dart_tool/ -.packages -build/ -# If you're building an application, you may want to check-in your pubspec.lock -pubspec.lock - -# Directory created by dartdoc -# If you don't generate documentation locally you can remove this line. -doc/api/ - -# Avoid committing generated Javascript files: -*.dart.js -*.info.json # Produced by the --dump-info flag. -*.js # When generated by dart2js. Don't specify *.js if your - # project includes source files written in JavaScript. -*.js_ -*.js.deps -*.js.map - -.flutter-plugins -.flutter-plugins-dependencies - -### MetaProgrammingSystem template -workspace.xml -junitvmwatcher*.properties -build.properties - -# generated java classes and java source files -# manually add any custom artifacts that can't be generated from the models -# http://confluence.jetbrains.com/display/MPSD25/HowTo+--+MPS+and+Git -classes_gen -source_gen -source_gen.caches - -# generated test code and test results -test_gen -test_gen.caches -TEST-*.xml -junit*.properties - -### Gcov template -# gcc coverage testing tool files - -*.gcno -*.gcda -*.gcov - -### Kentico template -# gitignore template for using Kentico CMS -# website: http://www.kentico.com/ -# -# Recommended template: VisualStudio.gitignore - -# Include some Kentico folders excluded by Visual Studio rules -!CMS/CMSAdminControls/*/ -!CMS/CMSModules/System/*/ -!CMS/App_Data/CIRepository/** - -# Kentico temporary/environment files -CMS/App_Data/AzureCache -CMS/App_Data/AzureTemp -CMS/App_Data/CMSModules/DeviceProfile/logFiftyOne.txt -CMS/App_Data/CMSModules/DeviceProfiles/logFiftyOne.txt -CMS/App_Data/CMSModules/WebFarm/webfarm.sync -CMS/App_Data/CMSTemp -CMS/App_Data/Persistent -CMS/CMSSiteUtils/Export -CMS/CMSSiteUtils/Import - -# Ignore all smart search indexes, but not the other system folder contents -CMS/App_Data/CMSModules/SmartSearch/** -!CMS/App_Data/CMSModules/SmartSearch/*/ -!CMS/App_Data/CMSModules/SmartSearch/_StopWords/** -!CMS/App_Data/CMSModules/SmartSearch/_Synonyms/** - -## Kentico Starter Sites -# Starter site resource Files -CMS/App_Data/DancingGoat - -# Starter site web templates -CMS/App_Data/Templates/CommunitySite -CMS/App_Data/Templates/CorporateSite -CMS/App_Data/Templates/DancingGoat -CMS/App_Data/Templates/EcommerceSite -CMS/App_Data/Templates/IntranetPortal -CMS/App_Data/Templates/PersonalSite - -# Starter site app themes -CMS/App_Themes/CommunitySite -CMS/App_Themes/CorporateSite -CMS/App_Themes/EcommerceSite -CMS/App_Themes/IntranetPortal* -CMS/App_Themes/PersonalSite - -# Starter site ASPX templates -CMS/CMSTemplates/CorporateSite - -# Starter site media libraries -CMS/CommunitySite -CMS/CorporateSite -CMS/DancingGoat -CMS/EcommerceSite -CMS/IntranetPortal -CMS/PersonalSite - -## Project specific ignores -# Sensitive settings -AppSettings.config -ConnectionStrings.config - -# Project media libraries (recommend shared file storage) -# e.g. CMS/{SiteCodeName} - -### InforCMS template -# gitignore template for InforCRM (formerly SalesLogix) -# website: https://www.infor.com/product-summary/cx/infor-crm/ -# -# Recommended: VisualStudio.gitignore - -# Ignore model files that are auto-generated -ModelIndex.xml -ExportedFiles.xml - -# Ignore deployment files -[Mm]odel/[Dd]eployment - -# Force include portal SupportFiles -!Model/Portal/*/SupportFiles/[Bb]in/ -!Model/Portal/PortalTemplates/*/SupportFiles/[Bb]in - -### Backup template -*.bak -*.gho -*.ori -*.orig -*.tmp - -### Windows template -# Windows thumbnail cache files -Thumbs.db -Thumbs.db:encryptable -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -### Snap template -# gitginore template for creating Snap packages -# website: https://snapcraft.io/ - -parts/ -prime/ -stage/ -*.snap - -# Snapcraft global state tracking data(automatically generated) -# https://forum.snapcraft.io/t/location-to-save-global-state/768 -/snap/.snapcraft/ - -# Source archive packed by `snapcraft cleanbuild` before pushing to the LXD container -/*_source.tar.bz2 - -### SublimeText template -# Cache files for Sublime Text -*.tmlanguage.cache -*.tmPreferences.cache -*.stTheme.cache - -# Workspace files are user-specific -*.sublime-workspace - -# Project files should be checked into the repository, unless a significant -# proportion of contributors will probably not be using Sublime Text -# *.sublime-project - -# SFTP configuration file -sftp-config.json -sftp-config-alt*.json - -# Package control specific files -Package Control.last-run -Package Control.ca-list -Package Control.ca-bundle -Package Control.system-ca-bundle -Package Control.cache/ -Package Control.ca-certs/ -Package Control.merged-ca-bundle -Package Control.user-ca-bundle -oscrypto-ca-bundle.crt -bh_unicode_properties.cache - -# Sublime-github package stores a github token in this file -# https://packagecontrol.io/packages/sublime-github -GitHub.sublime-settings - -### ChefCookbook template -.vagrant -/cookbooks - -# Bundler -bin/* -.bundle/* - -.kitchen/ -.kitchen.local.yml - -### Lua template -# Compiled Lua sources -luac.out - -# luarocks build files -*.src.rock -*.zip -*.tar.gz - -# Object files -*.o -*.os -*.ko -*.obj -*.elf - -# Precompiled Headers -*.gch -*.pch - -# Libraries -*.lib -*.a -*.la -*.lo -*.def -*.exp - -# Shared objects (inc. Windows DLLs) -*.dll -*.so -*.so.* -*.dylib - -# Executables -*.exe -*.out -*.app -*.i*86 -*.x86_64 -*.hex - - -### CakePHP template -# CakePHP 3 - -/vendor/* -/config/app.php - -/tmp/cache/models/* -!/tmp/cache/models/empty -/tmp/cache/persistent/* -!/tmp/cache/persistent/empty -/tmp/cache/views/* -!/tmp/cache/views/empty -/tmp/sessions/* -!/tmp/sessions/empty -/tmp/tests/* -!/tmp/tests/empty - -/logs/* -!/logs/empty - -# CakePHP 2 - -/app/tmp/* -/app/Config/core.php -/app/Config/database.php -/vendors/* - -### LibreOffice template -# LibreOffice locks -.~lock.*# - -### Ruby template -*.gem -*.rbc -/.config -/coverage/ -/InstalledFiles -/pkg/ -/spec/reports/ -/spec/examples.txt -/test/tmp/ -/test/version_tmp/ -/tmp/ - -# Used by dotenv library to load environment variables. -# .env - -# Ignore Byebug command history file. -.byebug_history - -## Specific to RubyMotion: -.dat* -.repl_history -build/ -*.bridgesupport -build-iPhoneOS/ -build-iPhoneSimulator/ - -## Specific to RubyMotion (use of CocoaPods): -# -# We recommend against adding the Pods directory to your .gitignore. However -# you should judge for yourself, the pros and cons are mentioned at: -# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control -# -# vendor/Pods/ - -## Documentation cache and generated files: -/.yardoc/ -/_yardoc/ -/doc/ -/rdoc/ - -## Environment normalization: -/.bundle/ -/vendor/bundle -/lib/bundler/man/ - -# for a library or gem, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# Gemfile.lock -# .ruby-version -# .ruby-gemset - -# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: -.rvmrc - -# Used by RuboCop. Remote config files pulled in from inherit_from directive. -# .rubocop-https?--* - -### Raku template -# Gitignore for Raku (https://raku.org) -# As part of https://github.com/github/gitignore - -# precompiled files -.precomp -lib/.precomp - - -### ExpressionEngine template -.DS_Store - -# Images -images/avatars/ -images/captchas/ -images/smileys/ -images/member_photos/ -images/signature_attachments/ -images/pm_attachments/ - -# For security do not publish the following files -system/expressionengine/config/database.php -system/expressionengine/config/config.php - -# Caches -sized/ -thumbs/ -_thumbs/ -*/expressionengine/cache/* - -### OracleForms template -# Compiled Form Modules -*.fmx - -# Compiled Menu Modules -*.mmx - -# Compiled Pre-Linked Libraries -*.plx - -### SBT template -# Simple Build Tool -# http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control - -dist/* -target/ -lib_managed/ -src_managed/ -project/boot/ -project/plugins/project/ -.history -.cache -.lib/ - -### Scala template -*.class -*.log - -### TeX template -## Core latex/pdflatex auxiliary files: -*.aux -*.lof -*.log -*.lot -*.fls -*.out -*.toc -*.fmt -*.fot -*.cb -*.cb2 -.*.lb - -## Intermediate documents: -*.dvi -*.xdv -*-converted-to.* -# these rules might exclude image files for figures etc. -# *.ps -# *.eps -# *.pdf - -## Generated if empty string is given at "Please type another file name for output:" -.pdf - -## Bibliography auxiliary files (bibtex/biblatex/biber): -*.bbl -*.bcf -*.blg -*-blx.aux -*-blx.bib -*.run.xml - -## Build tool auxiliary files: -*.fdb_latexmk -*.synctex -*.synctex(busy) -*.synctex.gz -*.synctex.gz(busy) -*.pdfsync - -## Build tool directories for auxiliary files -# latexrun -latex.out/ - -## Auxiliary and intermediate files from other packages: -# algorithms -*.alg -*.loa - -# achemso -acs-*.bib - -# amsthm -*.thm - -# beamer -*.nav -*.pre -*.snm -*.vrb - -# changes -*.soc - -# comment -*.cut - -# cprotect -*.cpt - -# elsarticle (documentclass of Elsevier journals) -*.spl - -# endnotes -*.ent - -# fixme -*.lox - -# feynmf/feynmp -*.mf -*.mp -*.t[1-9] -*.t[1-9][0-9] -*.tfm - -#(r)(e)ledmac/(r)(e)ledpar -*.end -*.?end -*.[1-9] -*.[1-9][0-9] -*.[1-9][0-9][0-9] -*.[1-9]R -*.[1-9][0-9]R -*.[1-9][0-9][0-9]R -*.eledsec[1-9] -*.eledsec[1-9]R -*.eledsec[1-9][0-9] -*.eledsec[1-9][0-9]R -*.eledsec[1-9][0-9][0-9] -*.eledsec[1-9][0-9][0-9]R - -# glossaries -*.acn -*.acr -*.glg -*.glo -*.gls -*.glsdefs -*.lzo -*.lzs - -# uncomment this for glossaries-extra (will ignore makeindex's style files!) -# *.ist - -# gnuplottex -*-gnuplottex-* - -# gregoriotex -*.gaux -*.gtex - -# htlatex -*.4ct -*.4tc -*.idv -*.lg -*.trc -*.xref - -# hyperref -*.brf - -# knitr -*-concordance.tex -# TODO Uncomment the next line if you use knitr and want to ignore its generated tikz files -# *.tikz -*-tikzDictionary - -# listings -*.lol - -# luatexja-ruby -*.ltjruby - -# makeidx -*.idx -*.ilg -*.ind - -# minitoc -*.maf -*.mlf -*.mlt -*.mtc[0-9]* -*.slf[0-9]* -*.slt[0-9]* -*.stc[0-9]* - -# minted -_minted* -*.pyg - -# morewrites -*.mw - -# nomencl -*.nlg -*.nlo -*.nls - -# pax -*.pax - -# pdfpcnotes -*.pdfpc - -# sagetex -*.sagetex.sage -*.sagetex.py -*.sagetex.scmd - -# scrwfile -*.wrt - -# sympy -*.sout -*.sympy -sympy-plots-for-*.tex/ - -# pdfcomment -*.upa -*.upb - -# pythontex -*.pytxcode -pythontex-files-*/ - -# tcolorbox -*.listing - -# thmtools -*.loe - -# TikZ & PGF -*.dpth -*.md5 -*.auxlock - -# todonotes -*.tdo - -# vhistory -*.hst -*.ver - -# easy-todo -*.lod - -# xcolor -*.xcp - -# xmpincl -*.xmpi - -# xindy -*.xdy - -# xypic precompiled matrices and outlines -*.xyc -*.xyd - -# endfloat -*.ttt -*.fff - -# Latexian -TSWLatexianTemp* - -## Editors: -# WinEdt -*.bak -*.sav - -# Texpad -.texpadtmp - -# LyX -*.lyx~ - -# Kile -*.backup - -# gummi -.*.swp - -# KBibTeX -*~[0-9]* - -# TeXnicCenter -*.tps - -# auto folder when using emacs and auctex -./auto/* -*.el - -# expex forward references with \gathertags -*-tags.tex - -# standalone packages -*.sta - -# Makeindex log files -*.lpz - -# xwatermark package -*.xwm - -# REVTeX puts footnotes in the bibliography by default, unless the nofootinbib -# option is specified. Footnotes are the stored in a file with suffix Notes.bib. -# Uncomment the next line to have this generated file ignored. -#*Notes.bib - -### Redis template -# Ignore redis binary dump (dump.rdb) files - -*.rdb - -### AppceleratorTitanium template -# Build folder and log file -build/ -build.log - -### Anjuta template -# Local configuration folder and symbol database -/.anjuta/ -/.anjuta_sym_db.db - -### Nim template -nimcache/ -nimblecache/ -htmldocs/ - -### TextMate template -*.tmproj -*.tmproject -tmtags - -### CFWheels template -# unpacked plugin folders -plugins/**/* - -# files directory where uploads go -files - -# DBMigrate plugin: generated SQL -db/sql - -# AssetBundler plugin: generated bundles -javascripts/bundles -stylesheets/bundles - -### ModelSim template -# ignore ModelSim generated files and directories (temp files and so on) -[_@]* - -# ignore compilation output of ModelSim -*.mti -*.dat -*.dbs -*.psm -*.bak -*.cmp -*.jpg -*.html -*.bsf - -# ignore simulation output of ModelSim -wlf* -*.wlf -*.vstf -*.ucdb -cov*/ -transcript* -sc_dpiheader.h -vsim.dbg - -### Actionscript template -# Build and Release Folders -bin-debug/ -bin-release/ -[Oo]bj/ -[Bb]in/ - -# Other files and folders -.settings/ - -# Executables -*.swf -*.air -*.ipa -*.apk - -# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties` -# should NOT be excluded as they contain compiler settings and other important -# information for Eclipse / Flash Builder. - -### Gradle template -.gradle -**/build/ -!src/**/build/ - -# Ignore Gradle GUI config -gradle-app.setting - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar - -# Cache of project -.gradletasknamecache - -# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 -# gradle/wrapper/gradle-wrapper.properties - -### Vim template -# Swap -[._]*.s[a-v][a-z] -!*.svg # comment out if you don't need vector files -[._]*.sw[a-p] -[._]s[a-rt-v][a-z] -[._]ss[a-gi-z] -[._]sw[a-p] - -# Session -Session.vim -Sessionx.vim - -# Temporary -.netrwhist -*~ -# Auto-generated tag files -tags -# Persistent undo -[._]*.un~ - +gen \ No newline at end of file From b678c2537744cfa404d1c5bece74121bf0614b22 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Wed, 9 Nov 2022 20:32:31 +0000 Subject: [PATCH 11/77] Added Base TurnBasedComabat System WIP --- .ignore | 1 - Source/the_twilight_abyss/TurnBaseCombat.cpp | 24 ++++++++++ Source/the_twilight_abyss/TurnBaseCombat.h | 46 ++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 Source/the_twilight_abyss/TurnBaseCombat.cpp create mode 100644 Source/the_twilight_abyss/TurnBaseCombat.h diff --git a/.ignore b/.ignore index 2c368e1..c85ee45 100644 --- a/.ignore +++ b/.ignore @@ -1,4 +1,3 @@ -.idea .git .vscode Content diff --git a/Source/the_twilight_abyss/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBaseCombat.cpp new file mode 100644 index 0000000..11409af --- /dev/null +++ b/Source/the_twilight_abyss/TurnBaseCombat.cpp @@ -0,0 +1,24 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "TurnBaseCombat.h" + +void ATurnBaseCombat::BeginPlay() +{ + Super::BeginPlay(); + + activeActionPoints = defaultActionPoints; + +} + +void ATurnBaseCombat::useActionPoint() +{ + activeActionPoints -= 1; +} + +void ATurnBaseCombat::revertActionPoints() +{ + activeActionPoints = defaultActionPoints; +} + + diff --git a/Source/the_twilight_abyss/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBaseCombat.h new file mode 100644 index 0000000..3416810 --- /dev/null +++ b/Source/the_twilight_abyss/TurnBaseCombat.h @@ -0,0 +1,46 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/GameStateBase.h" +#include "TurnBaseCombat.generated.h" + +/** + * + */ +UCLASS() +class THE_TWILIGHT_ABYSS_API ATurnBaseCombat : public AGameStateBase +{ + GENERATED_BODY() + +public: + ATurnBaseCombat() = default; + + UPROPERTY(EditDefaultsOnly) + int playerHealth = 100; + UPROPERTY(EditDefaultsOnly) + int enemyHealth = 100; + UPROPERTY(EditDefaultsOnly) + int defaultActionPoints = 3; + int activeActionPoints = 0; + + AActor* playerActor; + AActor* enemyActor; + + /* + TODO: + Reference Blueprint HUD + Reference Action Library + Reference Player Inventory + */ + +protected: + virtual void BeginPlay() override; + void useActionPoint(); + void revertActionPoints(); + +private: + UPROPERTY(EditDefaultsOnly) + bool isPlayerTurn = true; +}; From 5907d5dbe8d08bc61bdfe9f1a2b3db52efa3f398 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Wed, 9 Nov 2022 21:03:47 +0000 Subject: [PATCH 12/77] Updated TurnBaseCombat for Switching Active Roles Added Switching Active Roles and Constrained Active Action Points --- Source/the_twilight_abyss/TurnBaseCombat.cpp | 12 ++++++++++++ Source/the_twilight_abyss/TurnBaseCombat.h | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBaseCombat.cpp index 11409af..c28f852 100644 --- a/Source/the_twilight_abyss/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBaseCombat.cpp @@ -14,6 +14,13 @@ void ATurnBaseCombat::BeginPlay() void ATurnBaseCombat::useActionPoint() { activeActionPoints -= 1; + activeActionPoints = FMath::Clamp(activeActionPoints, 0, defaultActionPoints); +} + +void ATurnBaseCombat::reuseActionPoint() +{ + activeActionPoints += 1; + activeActionPoints = FMath::Clamp(activeActionPoints, 0, defaultActionPoints); } void ATurnBaseCombat::revertActionPoints() @@ -21,4 +28,9 @@ void ATurnBaseCombat::revertActionPoints() activeActionPoints = defaultActionPoints; } +void ATurnBaseCombat::switchTurn() +{ + activeActor = (isPlayerTurn) ? enemyActor : playerActor; +} + diff --git a/Source/the_twilight_abyss/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBaseCombat.h index 3416810..68a6284 100644 --- a/Source/the_twilight_abyss/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBaseCombat.h @@ -27,20 +27,24 @@ public: AActor* playerActor; AActor* enemyActor; + AActor* activeActor; /* TODO: Reference Blueprint HUD Reference Action Library - Reference Player Inventory + Reference Player Inventory + Reference Combat Logging System */ protected: virtual void BeginPlay() override; void useActionPoint(); + void reuseActionPoint(); void revertActionPoints(); private: UPROPERTY(EditDefaultsOnly) bool isPlayerTurn = true; + void switchTurn(); }; From bea0e1b73591fa28f7c1389f84a6ab4be251f27a Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Wed, 9 Nov 2022 21:24:36 +0000 Subject: [PATCH 13/77] Updated TurnBaseCombat to Reference Actors Grabs all actors active within scene --- Config/DefaultEngine.ini | 4 +-- Config/HoloLens/HoloLensEngine.ini | 31 ++++++++++++++++++++ Source/the_twilight_abyss/TurnBaseCombat.cpp | 5 ++-- 3 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 Config/HoloLens/HoloLensEngine.ini diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index c04c7eb..65e900d 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -17,7 +17,7 @@ ManualIPAddress= +ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Engine/Maps/Templates/OpenWorld.OpenWorld +EditorStartupMap=/Game/Levels/Main.Main LocalMapOptions= TransitionMap=None bUseSplitscreen=True @@ -26,7 +26,7 @@ ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Engine/Maps/Templates/OpenWorld.OpenWorld +GameDefaultMap=/Game/Levels/Main.Main ServerDefaultMap=/Engine/Maps/Entry.Entry GlobalDefaultGameMode=/Game/GameMode/MainGameMode.MainGameMode_C GlobalDefaultServerGameMode=None diff --git a/Config/HoloLens/HoloLensEngine.ini b/Config/HoloLens/HoloLensEngine.ini new file mode 100644 index 0000000..b87360b --- /dev/null +++ b/Config/HoloLens/HoloLensEngine.ini @@ -0,0 +1,31 @@ + + +[/Script/HoloLensPlatformEditor.HoloLensTargetSettings] +bBuildForEmulation=False +bBuildForDevice=True +bUseNameForLogo=True +bBuildForRetailWindowsStore=False +bAutoIncrementVersion=False +bShouldCreateAppInstaller=False +AppInstallerInstallationURL= +HoursBetweenUpdateChecks=0 +bEnablePIXProfiling=False +TileBackgroundColor=(B=64,G=0,R=0,A=255) +SplashScreenBackgroundColor=(B=64,G=0,R=0,A=255) ++PerCultureResources=(CultureId="",Strings=(PackageDisplayName="",PublisherDisplayName="",PackageDescription="",ApplicationDisplayName="",ApplicationDescription=""),Images=()) +TargetDeviceFamily=Windows.Holographic +MinimumPlatformVersion= +MaximumPlatformVersionTested=10.0.22000.0 +MaxTrianglesPerCubicMeter=500.000000 +SpatialMeshingVolumeSize=20.000000 +CompilerVersion=Default +Windows10SDKVersion=10.0.18362.0 ++CapabilityList=internetClientServer ++CapabilityList=privateNetworkClientServer ++Uap2CapabilityList=spatialPerception +bSetDefaultCapabilities=False +SpatializationPlugin= +ReverbPlugin= +OcclusionPlugin= +SoundCueCookQualityIndex=-1 + diff --git a/Source/the_twilight_abyss/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBaseCombat.cpp index c28f852..747dc99 100644 --- a/Source/the_twilight_abyss/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBaseCombat.cpp @@ -2,13 +2,14 @@ #include "TurnBaseCombat.h" +#include "Kismet/GameplayStatics.h" void ATurnBaseCombat::BeginPlay() { Super::BeginPlay(); - + TArray AllCharacterActorsInScene; + UGameplayStatics::GetAllActorsOfClassWithTag(GetWorld(), AActor::StaticClass(), FName("Character"), AllCharacterActorsInScene); activeActionPoints = defaultActionPoints; - } void ATurnBaseCombat::useActionPoint() From 96dd28f1b1260702e603bd72a1579b45a48a1e39 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Wed, 9 Nov 2022 23:27:39 +0000 Subject: [PATCH 14/77] Ignored just Plugins folder to avoid errors --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 402f5d5..66f0548 100644 --- a/.gitignore +++ b/.gitignore @@ -182,4 +182,6 @@ fabric.properties .idea *.iml out -gen \ No newline at end of file +gen + +Plugins/ \ No newline at end of file From 48ca84871023a5aea0cda10dd288ad0819be3831 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Wed, 9 Nov 2022 23:55:31 +0000 Subject: [PATCH 15/77] Specficially ignored Riderlink in .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 66f0548..7f918ee 100644 --- a/.gitignore +++ b/.gitignore @@ -184,4 +184,4 @@ fabric.properties out gen -Plugins/ \ No newline at end of file +RiderLink/ From bfe2de2d5d4f37dc12ff61f9771f03e65765c727 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 10 Nov 2022 00:03:09 +0000 Subject: [PATCH 16/77] Added interact input key E --- .gitignore | 1 - Config/DefaultInput.ini | 1 + Content/Levels/MerchantPrototype.umap | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Content/Levels/MerchantPrototype.umap diff --git a/.gitignore b/.gitignore index 7f918ee..f03af7b 100644 --- a/.gitignore +++ b/.gitignore @@ -99,7 +99,6 @@ Build/Android/res/*/* ### VisualStudioCode ### .git .vscode -Content DerivedDataCache Intermediate Saved diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index d3357e7..1be73f7 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -76,6 +76,7 @@ FOVScale=0.011110 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=SpaceBar) ++ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E) +AxisMappings=(AxisName="Look Up / Down Gamepad",Scale=1.000000,Key=Gamepad_RightY) +AxisMappings=(AxisName="Look Up / Down Mouse",Scale=-1.000000,Key=MouseY) +AxisMappings=(AxisName="Move Forward / Backward",Scale=1.000000,Key=Gamepad_LeftY) diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap new file mode 100644 index 0000000..75094ce --- /dev/null +++ b/Content/Levels/MerchantPrototype.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aecdc18df404bad9d38ab090802191cea88bd8cf37354b8d02f87242ce550a58 +size 21405 From 25fa3d3414f9dac09742d452e689e9b116eeee22 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 10 Nov 2022 01:09:02 +0000 Subject: [PATCH 17/77] Started working on Merchant Logic Started to create the base merchant trigger box to start making the interaction between player and merchant npc --- Config/DefaultEngine.ini | 2 +- Content/Levels/MerchantPrototype.umap | 4 +- .../MerchantRaw/MerchantTriggerBox.cpp | 39 +++++++++++++++++++ .../MerchantRaw/MerchantTriggerBox.h | 27 +++++++++++++ 4 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp create mode 100644 Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 65e900d..197fc84 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -28,6 +28,6 @@ bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance GameDefaultMap=/Game/Levels/Main.Main ServerDefaultMap=/Engine/Maps/Entry.Entry -GlobalDefaultGameMode=/Game/GameMode/MainGameMode.MainGameMode_C +GlobalDefaultGameMode=/Script/Engine.GameModeBase GlobalDefaultServerGameMode=None diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 75094ce..feb9ee1 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aecdc18df404bad9d38ab090802191cea88bd8cf37354b8d02f87242ce550a58 -size 21405 +oid sha256:54f56812a38b4d3aaa9242a60febf557b7cbff2f830efc20ceff6571a6270971 +size 23663 diff --git a/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp b/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp new file mode 100644 index 0000000..b519e46 --- /dev/null +++ b/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp @@ -0,0 +1,39 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "MerchantTriggerBox.h" + +//makes it so the component script is initialized when game starts +UMerchantTriggerBox::UMerchantTriggerBox() +{ + PrimaryComponentTick.bCanEverTick = true; +} + + + +void UMerchantTriggerBox::BeginPlay() +{ + Super::BeginPlay(); + UE_LOG(LogTemp, Warning, TEXT("TRIGGER SPAWNED")); +} + +void UMerchantTriggerBox::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) +{ + Super::TickComponent(DeltaTime, TickType, ThisTickFunction); + + +} + +void UMerchantTriggerBox::PlayerCheck() +{ + /* + TODO: + UNCOMMENT THE UPRIMITECOMPONENT OUT + FILL OUT THE COMPONENTOVERLAP FUNCTION SO IT DISPLAYS THE PLAYERS NAME WHEN THEY ENTER IT + */ + + //UPrimitiveComponent TriggerOverlap = BeginComponentOverlap(); +} + + + diff --git a/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h b/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h new file mode 100644 index 0000000..a68076c --- /dev/null +++ b/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h @@ -0,0 +1,27 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Components/BoxComponent.h" +#include "Components/PrimitiveComponent.h" +#include "MerchantTriggerBox.generated.h" + +/** + * + */ +UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) +class THE_TWILIGHT_ABYSS_API UMerchantTriggerBox : public UBoxComponent +{ + GENERATED_BODY() +protected: + virtual void BeginPlay() override; + +public: + UMerchantTriggerBox(); + virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; + +private: + void PlayerCheck(); + +}; From d96c540bcfb3c5e9753c7d05df7f9dce826a59f1 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 10 Nov 2022 10:15:43 +0000 Subject: [PATCH 18/77] Cleaned Up Project Deleted Old enemycollision script and deleted thirdperson content --- Source/the_twilight_abyss/EnemyCollision.cpp | 11 -- Source/the_twilight_abyss/EnemyCollision.h | 19 --- .../TP_ThirdPerson/TP_ThirdPerson.h | 5 - .../TP_ThirdPersonCharacter.cpp | 129 ------------------ .../TP_ThirdPerson/TP_ThirdPersonCharacter.h | 65 --------- .../TP_ThirdPerson/TP_ThirdPersonGameMode.cpp | 15 -- .../TP_ThirdPerson/TP_ThirdPersonGameMode.h | 19 --- 7 files changed, 263 deletions(-) delete mode 100644 Source/the_twilight_abyss/EnemyCollision.cpp delete mode 100644 Source/the_twilight_abyss/EnemyCollision.h delete mode 100644 Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPerson.h delete mode 100644 Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.cpp delete mode 100644 Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.h delete mode 100644 Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.cpp delete mode 100644 Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.h diff --git a/Source/the_twilight_abyss/EnemyCollision.cpp b/Source/the_twilight_abyss/EnemyCollision.cpp deleted file mode 100644 index d6ce825..0000000 --- a/Source/the_twilight_abyss/EnemyCollision.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "EnemyCollision.h" - -void UEnemyCollision::BeginPlay() -{ - Super::BeginPlay(); - - UE_LOG(LogTemp, Display, TEXT("TRIGGER COLLISION BOX SPAWNED IN")); -} \ No newline at end of file diff --git a/Source/the_twilight_abyss/EnemyCollision.h b/Source/the_twilight_abyss/EnemyCollision.h deleted file mode 100644 index 97b9357..0000000 --- a/Source/the_twilight_abyss/EnemyCollision.h +++ /dev/null @@ -1,19 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "Components/BoxComponent.h" -#include "EnemyCollision.generated.h" - -/** - * - */ -UCLASS(ClassGroup = (Custom), meta = (BlueprintSpawnableComponent)) -class THE_TWILIGHT_ABYSS_API UEnemyCollision : public UBoxComponent -{ - GENERATED_BODY() - - protected: - virtual void BeginPlay() override; -}; diff --git a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPerson.h b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPerson.h deleted file mode 100644 index ddbf2e2..0000000 --- a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPerson.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -#pragma once - -#include "CoreMinimal.h" diff --git a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.cpp b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.cpp deleted file mode 100644 index 9a21f9b..0000000 --- a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.cpp +++ /dev/null @@ -1,129 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -#include "TP_ThirdPersonCharacter.h" -#include "Camera/CameraComponent.h" -#include "Components/CapsuleComponent.h" -#include "Components/InputComponent.h" -#include "GameFramework/CharacterMovementComponent.h" -#include "GameFramework/Controller.h" -#include "GameFramework/SpringArmComponent.h" - -////////////////////////////////////////////////////////////////////////// -// ATP_ThirdPersonCharacter - -ATP_ThirdPersonCharacter::ATP_ThirdPersonCharacter() -{ - // Set size for collision capsule - GetCapsuleComponent()->InitCapsuleSize(42.f, 96.0f); - - // set our turn rate for input - TurnRateGamepad = 50.f; - - // Don't rotate when the controller rotates. Let that just affect the camera. - bUseControllerRotationPitch = false; - bUseControllerRotationYaw = false; - bUseControllerRotationRoll = false; - - // Configure character movement - GetCharacterMovement()->bOrientRotationToMovement = true; // Character moves in the direction of input... - GetCharacterMovement()->RotationRate = FRotator(0.0f, 500.0f, 0.0f); // ...at this rotation rate - - // Note: For faster iteration times these variables, and many more, can be tweaked in the Character Blueprint - // instead of recompiling to adjust them - GetCharacterMovement()->JumpZVelocity = 700.f; - GetCharacterMovement()->AirControl = 0.35f; - GetCharacterMovement()->MaxWalkSpeed = 500.f; - GetCharacterMovement()->MinAnalogWalkSpeed = 20.f; - GetCharacterMovement()->BrakingDecelerationWalking = 2000.f; - - // Create a camera boom (pulls in towards the player if there is a collision) - CameraBoom = CreateDefaultSubobject(TEXT("CameraBoom")); - CameraBoom->SetupAttachment(RootComponent); - CameraBoom->TargetArmLength = 400.0f; // The camera follows at this distance behind the character - CameraBoom->bUsePawnControlRotation = true; // Rotate the arm based on the controller - - // Create a follow camera - FollowCamera = CreateDefaultSubobject(TEXT("FollowCamera")); - FollowCamera->SetupAttachment(CameraBoom, USpringArmComponent::SocketName); // Attach the camera to the end of the boom and let the boom adjust to match the controller orientation - FollowCamera->bUsePawnControlRotation = false; // Camera does not rotate relative to arm - - // Note: The skeletal mesh and anim blueprint references on the Mesh component (inherited from Character) - // are set in the derived blueprint asset named ThirdPersonCharacter (to avoid direct content references in C++) -} - -////////////////////////////////////////////////////////////////////////// -// Input - -void ATP_ThirdPersonCharacter::SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) -{ - // Set up gameplay key bindings - check(PlayerInputComponent); - PlayerInputComponent->BindAction("Jump", IE_Pressed, this, &ACharacter::Jump); - PlayerInputComponent->BindAction("Jump", IE_Released, this, &ACharacter::StopJumping); - - PlayerInputComponent->BindAxis("Move Forward / Backward", this, &ATP_ThirdPersonCharacter::MoveForward); - PlayerInputComponent->BindAxis("Move Right / Left", this, &ATP_ThirdPersonCharacter::MoveRight); - - // We have 2 versions of the rotation bindings to handle different kinds of devices differently - // "turn" handles devices that provide an absolute delta, such as a mouse. - // "turnrate" is for devices that we choose to treat as a rate of change, such as an analog joystick - PlayerInputComponent->BindAxis("Turn Right / Left Mouse", this, &APawn::AddControllerYawInput); - PlayerInputComponent->BindAxis("Turn Right / Left Gamepad", this, &ATP_ThirdPersonCharacter::TurnAtRate); - PlayerInputComponent->BindAxis("Look Up / Down Mouse", this, &APawn::AddControllerPitchInput); - PlayerInputComponent->BindAxis("Look Up / Down Gamepad", this, &ATP_ThirdPersonCharacter::LookUpAtRate); - - // handle touch devices - PlayerInputComponent->BindTouch(IE_Pressed, this, &ATP_ThirdPersonCharacter::TouchStarted); - PlayerInputComponent->BindTouch(IE_Released, this, &ATP_ThirdPersonCharacter::TouchStopped); -} - -void ATP_ThirdPersonCharacter::TouchStarted(ETouchIndex::Type FingerIndex, FVector Location) -{ - Jump(); -} - -void ATP_ThirdPersonCharacter::TouchStopped(ETouchIndex::Type FingerIndex, FVector Location) -{ - StopJumping(); -} - -void ATP_ThirdPersonCharacter::TurnAtRate(float Rate) -{ - // calculate delta for this frame from the rate information - AddControllerYawInput(Rate * TurnRateGamepad * GetWorld()->GetDeltaSeconds()); -} - -void ATP_ThirdPersonCharacter::LookUpAtRate(float Rate) -{ - // calculate delta for this frame from the rate information - AddControllerPitchInput(Rate * TurnRateGamepad * GetWorld()->GetDeltaSeconds()); -} - -void ATP_ThirdPersonCharacter::MoveForward(float Value) -{ - if ((Controller != nullptr) && (Value != 0.0f)) - { - // find out which way is forward - const FRotator Rotation = Controller->GetControlRotation(); - const FRotator YawRotation(0, Rotation.Yaw, 0); - - // get forward vector - const FVector Direction = FRotationMatrix(YawRotation).GetUnitAxis(EAxis::X); - AddMovementInput(Direction, Value); - } -} - -void ATP_ThirdPersonCharacter::MoveRight(float Value) -{ - if ( (Controller != nullptr) && (Value != 0.0f) ) - { - // find out which way is right - const FRotator Rotation = Controller->GetControlRotation(); - const FRotator YawRotation(0, Rotation.Yaw, 0); - - // get right vector - const FVector Direction = FRotationMatrix(YawRotation).GetUnitAxis(EAxis::Y); - // add movement in that direction - AddMovementInput(Direction, Value); - } -} diff --git a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.h b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.h deleted file mode 100644 index 6be7f4e..0000000 --- a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonCharacter.h +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/Character.h" -#include "TP_ThirdPersonCharacter.generated.h" - -UCLASS(config=Game) -class ATP_ThirdPersonCharacter : public ACharacter -{ - GENERATED_BODY() - - /** Camera boom positioning the camera behind the character */ - UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true")) - class USpringArmComponent* CameraBoom; - - /** Follow camera */ - UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true")) - class UCameraComponent* FollowCamera; -public: - ATP_ThirdPersonCharacter(); - - /** Base turn rate, in deg/sec. Other scaling may affect final turn rate. */ - UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Input) - float TurnRateGamepad; - -protected: - - /** Called for forwards/backward input */ - void MoveForward(float Value); - - /** Called for side to side input */ - void MoveRight(float Value); - - /** - * Called via input to turn at a given rate. - * @param Rate This is a normalized rate, i.e. 1.0 means 100% of desired turn rate - */ - void TurnAtRate(float Rate); - - /** - * Called via input to turn look up/down at a given rate. - * @param Rate This is a normalized rate, i.e. 1.0 means 100% of desired turn rate - */ - void LookUpAtRate(float Rate); - - /** Handler for when a touch input begins. */ - void TouchStarted(ETouchIndex::Type FingerIndex, FVector Location); - - /** Handler for when a touch input stops. */ - void TouchStopped(ETouchIndex::Type FingerIndex, FVector Location); - -protected: - // APawn interface - virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; - // End of APawn interface - -public: - /** Returns CameraBoom subobject **/ - FORCEINLINE class USpringArmComponent* GetCameraBoom() const { return CameraBoom; } - /** Returns FollowCamera subobject **/ - FORCEINLINE class UCameraComponent* GetFollowCamera() const { return FollowCamera; } -}; - diff --git a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.cpp b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.cpp deleted file mode 100644 index aa7ce00..0000000 --- a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -#include "TP_ThirdPersonGameMode.h" -#include "TP_ThirdPersonCharacter.h" -#include "UObject/ConstructorHelpers.h" - -ATP_ThirdPersonGameMode::ATP_ThirdPersonGameMode() -{ - // set default pawn class to our Blueprinted character - static ConstructorHelpers::FClassFinder PlayerPawnBPClass(TEXT("/Game/ThirdPerson/Blueprints/BP_ThirdPersonCharacter")); - if (PlayerPawnBPClass.Class != NULL) - { - DefaultPawnClass = PlayerPawnBPClass.Class; - } -} diff --git a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.h b/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.h deleted file mode 100644 index bf3f690..0000000 --- a/Source/the_twilight_abyss/TP_ThirdPerson/TP_ThirdPersonGameMode.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/GameModeBase.h" -#include "TP_ThirdPersonGameMode.generated.h" - -UCLASS(minimalapi) -class ATP_ThirdPersonGameMode : public AGameModeBase -{ - GENERATED_BODY() - -public: - ATP_ThirdPersonGameMode(); -}; - - - From fb981ce2d6db60c4caf1984dd32f446d7eaa3c36 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 10 Nov 2022 11:52:10 +0000 Subject: [PATCH 19/77] Created Custom FP Character with custom Interact Created a Temp Character script and gave it functionallity, also gave it the custom keybind E so when pressed it displays a log message so I know it works. Also created a temporary gamemode for merchant level --- Config/DefaultEngine.ini | 2 +- Content/Blueprints/BP_MyTempCharacter.uasset | 3 ++ Content/Levels/MerchantPrototype.umap | 4 +- Content/Merchant/BP_MerchantGameMode.uasset | 3 ++ .../PlayerTemp/TempCharacter.cpp | 54 +++++++++++++++++++ .../PlayerTemp/TempCharacter.h | 33 ++++++++++++ 6 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 Content/Blueprints/BP_MyTempCharacter.uasset create mode 100644 Content/Merchant/BP_MerchantGameMode.uasset create mode 100644 Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp create mode 100644 Source/the_twilight_abyss/PlayerTemp/TempCharacter.h diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 197fc84..93b215a 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -28,6 +28,6 @@ bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance GameDefaultMap=/Game/Levels/Main.Main ServerDefaultMap=/Engine/Maps/Entry.Entry -GlobalDefaultGameMode=/Script/Engine.GameModeBase +GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C GlobalDefaultServerGameMode=None diff --git a/Content/Blueprints/BP_MyTempCharacter.uasset b/Content/Blueprints/BP_MyTempCharacter.uasset new file mode 100644 index 0000000..56f24b2 --- /dev/null +++ b/Content/Blueprints/BP_MyTempCharacter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e80b44e582d11e6ad42033c0a1a16231f6301999bae071ebfb5b4e873f21d127 +size 22069 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index feb9ee1..2aae519 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54f56812a38b4d3aaa9242a60febf557b7cbff2f830efc20ceff6571a6270971 -size 23663 +oid sha256:8754e6b425965184b0956fcfe7ebd1699d6733f6f44a1351ad6b9a44896afea0 +size 23754 diff --git a/Content/Merchant/BP_MerchantGameMode.uasset b/Content/Merchant/BP_MerchantGameMode.uasset new file mode 100644 index 0000000..191ec17 --- /dev/null +++ b/Content/Merchant/BP_MerchantGameMode.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a545be89d77a055ffcd3fcc1812d0c7bc90cfd0ff31e24e2d9cb4a33eb026df +size 19048 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp new file mode 100644 index 0000000..adbb10e --- /dev/null +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -0,0 +1,54 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "TempCharacter.h" + +#include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" + + +// Sets default values +ATempCharacter::ATempCharacter() +{ + // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; +} + +// Called when the game starts or when spawned +void ATempCharacter::BeginPlay() +{ + Super::BeginPlay(); + +} + +void ATempCharacter::ForwardInput(float Axis) +{ + AddMovementInput(GetActorForwardVector()* Axis); + +} + +void ATempCharacter::RightMoveInput(float Axis) +{ + AddMovementInput(GetActorRightVector()* Axis); +} + +// Called every frame +void ATempCharacter::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + +// Called to bind functionality to input +void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) +{ + Super::SetupPlayerInputComponent(PlayerInputComponent); + PlayerInputComponent->BindAxis(TEXT("Move Forward / Backward"), this, &ATempCharacter::ForwardInput); + PlayerInputComponent->BindAxis(TEXT("Move Right / Left"), this, &ATempCharacter::RightMoveInput); + PlayerInputComponent->BindAxis(TEXT("Turn Right / Left Mouse"), this, &ATempCharacter::AddControllerYawInput); + PlayerInputComponent->BindAxis(TEXT("Look Up / Down Mouse"), this, &ATempCharacter::AddControllerPitchInput); + PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); +} + +void ATempCharacter::KeyPressed(FKey Interact) +{ + UE_LOG(LogTemp, Display, TEXT("Interact key is being pressed")); +} diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h new file mode 100644 index 0000000..0c0a54f --- /dev/null +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -0,0 +1,33 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Character.h" +#include "TempCharacter.generated.h" + +UCLASS() +class THE_TWILIGHT_ABYSS_API ATempCharacter : public ACharacter +{ + GENERATED_BODY() + +public: + // Sets default values for this character's properties + ATempCharacter(); + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + + void ForwardInput(float Axis); + void RightMoveInput(float Axis); + +public: + // Called every frame + virtual void Tick(float DeltaTime) override; + + // Called to bind functionality to input + virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + void KeyPressed(FKey Interact); + +}; From 38ab588226d35e39f2c66515da6ea83b58370e20 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 10 Nov 2022 11:56:19 +0000 Subject: [PATCH 20/77] Added comments on what next to do for merchant --- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index adbb10e..af85bd7 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -48,6 +48,12 @@ void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); } +/* + TODO: + Make custom bool for pressed interact in trigger + Make custom bool for when player enters the trigger its set to true + Make if statement if both flags are true then dilouge box pops up + */ void ATempCharacter::KeyPressed(FKey Interact) { UE_LOG(LogTemp, Display, TEXT("Interact key is being pressed")); From ba713ddb2e42769dac1b956ccf09b5d94f28cda7 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 10 Nov 2022 12:57:31 +0000 Subject: [PATCH 21/77] Cleaned up scripts --- Content/Blueprints/BP_MyTempCharacter.uasset | 4 ++-- Content/Levels/MerchantPrototype.umap | 2 +- .../MerchantRaw/MerchantTriggerBox.cpp | 13 +++---------- .../MerchantRaw/MerchantTriggerBox.h | 4 ---- .../the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 8 ++++++-- .../the_twilight_abyss/PlayerTemp/TempCharacter.h | 2 ++ 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Content/Blueprints/BP_MyTempCharacter.uasset b/Content/Blueprints/BP_MyTempCharacter.uasset index 56f24b2..5c87a2d 100644 --- a/Content/Blueprints/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e80b44e582d11e6ad42033c0a1a16231f6301999bae071ebfb5b4e873f21d127 -size 22069 +oid sha256:ac2b6ffc86b65fe30fcc0358b8b0242d0b1aa0a2bf21b45f1c2030edc1383f4b +size 25526 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 2aae519..742f1a6 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8754e6b425965184b0956fcfe7ebd1699d6733f6f44a1351ad6b9a44896afea0 +oid sha256:f8ddf56cb9911f76fc53b56bce7f4d9b975536954fcca5b0645c7617b07deaed size 23754 diff --git a/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp b/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp index b519e46..79ebc12 100644 --- a/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp +++ b/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp @@ -3,6 +3,8 @@ #include "MerchantTriggerBox.h" +#include "the_twilight_abyss/PlayerTemp/TempCharacter.h" + //makes it so the component script is initialized when game starts UMerchantTriggerBox::UMerchantTriggerBox() { @@ -17,6 +19,7 @@ void UMerchantTriggerBox::BeginPlay() UE_LOG(LogTemp, Warning, TEXT("TRIGGER SPAWNED")); } + void UMerchantTriggerBox::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) { Super::TickComponent(DeltaTime, TickType, ThisTickFunction); @@ -24,16 +27,6 @@ void UMerchantTriggerBox::TickComponent(float DeltaTime, ELevelTick TickType, FA } -void UMerchantTriggerBox::PlayerCheck() -{ - /* - TODO: - UNCOMMENT THE UPRIMITECOMPONENT OUT - FILL OUT THE COMPONENTOVERLAP FUNCTION SO IT DISPLAYS THE PLAYERS NAME WHEN THEY ENTER IT - */ - - //UPrimitiveComponent TriggerOverlap = BeginComponentOverlap(); -} diff --git a/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h b/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h index a68076c..980a86e 100644 --- a/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h +++ b/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h @@ -20,8 +20,4 @@ protected: public: UMerchantTriggerBox(); virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; - -private: - void PlayerCheck(); - }; diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index af85bd7..a4f34e8 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -4,9 +4,10 @@ #include "TempCharacter.h" #include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" +#include "Components/SphereComponent.h" -// Sets default values +// CONSTRUCTOR ATempCharacter::ATempCharacter() { // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. @@ -20,17 +21,20 @@ void ATempCharacter::BeginPlay() } +//Binds the input we made in the setup player component to the forward vector void ATempCharacter::ForwardInput(float Axis) { AddMovementInput(GetActorForwardVector()* Axis); } +//Binds the input we made in the setup player component to the right vector void ATempCharacter::RightMoveInput(float Axis) { AddMovementInput(GetActorRightVector()* Axis); } + // Called every frame void ATempCharacter::Tick(float DeltaTime) { @@ -45,7 +49,7 @@ void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo PlayerInputComponent->BindAxis(TEXT("Move Right / Left"), this, &ATempCharacter::RightMoveInput); PlayerInputComponent->BindAxis(TEXT("Turn Right / Left Mouse"), this, &ATempCharacter::AddControllerYawInput); PlayerInputComponent->BindAxis(TEXT("Look Up / Down Mouse"), this, &ATempCharacter::AddControllerPitchInput); - PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); + PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); // custom keybind Interact } /* diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 0c0a54f..37d11a6 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "Components/BoxComponent.h" #include "GameFramework/Character.h" #include "TempCharacter.generated.h" @@ -28,6 +29,7 @@ public: // Called to bind functionality to input virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + void KeyPressed(FKey Interact); }; From ca90d5fc6eb6d9188194de7870c8e2c3241872e7 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 10 Nov 2022 16:38:38 +0000 Subject: [PATCH 22/77] Working on TraceChannel for merchant hit detect --- Config/DefaultEngine.ini | 57 +++++++++++++++++++ Content/Blueprints/BP_CrossHair.uasset | 3 + Content/Blueprints/BP_MyTempCharacter.uasset | 4 +- Content/Levels/MerchantPrototype.umap | 4 +- .../PlayerTemp/TempCharacter.cpp | 31 +++++++++- .../PlayerTemp/TempCharacter.h | 8 ++- 6 files changed, 99 insertions(+), 8 deletions(-) create mode 100644 Content/Blueprints/BP_CrossHair.uasset diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 93b215a..d91fe57 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -31,3 +31,60 @@ ServerDefaultMap=/Engine/Maps/Entry.Entry GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C GlobalDefaultServerGameMode=None +[/Script/Engine.CollisionProfile] +-Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False) +-Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="OverlapAll",CollisionEnabled=QueryOnly,ObjectTypeName="WorldStatic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="BlockAllDynamic",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldDynamic",CustomResponses=,HelpMessage="WorldDynamic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="OverlapAllDynamic",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="IgnoreOnlyPawn",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that ignores Pawn and Vehicle. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="OverlapOnlyPawn",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that overlaps Pawn, Camera, and Vehicle. All other channels will be set to default. ",bCanModify=False) +-Profiles=(Name="Pawn",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Pawn",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object. Can be used for capsule of any playerable character or AI. ",bCanModify=False) +-Profiles=(Name="Spectator",CollisionEnabled=QueryOnly,ObjectTypeName="Pawn",CustomResponses=((Channel="WorldStatic",Response=ECR_Block),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore)),HelpMessage="Pawn object that ignores all other actors except WorldStatic.",bCanModify=False) +-Profiles=(Name="CharacterMesh",CollisionEnabled=QueryOnly,ObjectTypeName="Pawn",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object that is used for Character Mesh. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="PhysicsActor",CollisionEnabled=QueryAndPhysics,ObjectTypeName="PhysicsBody",CustomResponses=,HelpMessage="Simulating actors",bCanModify=False) +-Profiles=(Name="Destructible",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Destructible",CustomResponses=,HelpMessage="Destructible actors",bCanModify=False) +-Profiles=(Name="InvisibleWall",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldStatic object that is invisible.",bCanModify=False) +-Profiles=(Name="InvisibleWallDynamic",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that is invisible.",bCanModify=False) +-Profiles=(Name="Trigger",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that is used for trigger. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="Ragdoll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="PhysicsBody",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Simulating Skeletal Mesh Component. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="UI",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Block),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) ++Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision") ++Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="OverlapAll",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="BlockAllDynamic",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=,HelpMessage="WorldDynamic object that blocks all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="OverlapAllDynamic",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="IgnoreOnlyPawn",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that ignores Pawn and Vehicle. All other channels will be set to default.") ++Profiles=(Name="OverlapOnlyPawn",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that overlaps Pawn, Camera, and Vehicle. All other channels will be set to default. ") ++Profiles=(Name="Pawn",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object. Can be used for capsule of any playerable character or AI. ") ++Profiles=(Name="Spectator",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="WorldStatic"),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore)),HelpMessage="Pawn object that ignores all other actors except WorldStatic.") ++Profiles=(Name="CharacterMesh",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object that is used for Character Mesh. All other channels will be set to default.") ++Profiles=(Name="PhysicsActor",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="PhysicsBody",CustomResponses=,HelpMessage="Simulating actors") ++Profiles=(Name="Destructible",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Destructible",CustomResponses=,HelpMessage="Destructible actors") ++Profiles=(Name="InvisibleWall",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldStatic object that is invisible.") ++Profiles=(Name="InvisibleWallDynamic",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that is invisible.") ++Profiles=(Name="Trigger",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that is used for trigger. All other channels will be set to default.") ++Profiles=(Name="Ragdoll",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="PhysicsBody",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Simulating Skeletal Mesh Component. All other channels will be set to default.") ++Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.") ++Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="Player") +-ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") +-ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") +-ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") +-ProfileRedirects=(OldName="SkeletalMeshActor",NewName="PhysicsActor") +-ProfileRedirects=(OldName="InvisibleActor",NewName="InvisibleWallDynamic") ++ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") ++ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") ++ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") ++ProfileRedirects=(OldName="SkeletalMeshActor",NewName="PhysicsActor") ++ProfileRedirects=(OldName="InvisibleActor",NewName="InvisibleWallDynamic") +-CollisionChannelRedirects=(OldName="Static",NewName="WorldStatic") +-CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") +-CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +-CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") ++CollisionChannelRedirects=(OldName="Static",NewName="WorldStatic") ++CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") ++CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") ++CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") + diff --git a/Content/Blueprints/BP_CrossHair.uasset b/Content/Blueprints/BP_CrossHair.uasset new file mode 100644 index 0000000..9f8931e --- /dev/null +++ b/Content/Blueprints/BP_CrossHair.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a280ea28495f581d57c633b55688d29b2deee4204a9d743b96deddb02a8bc1c +size 24157 diff --git a/Content/Blueprints/BP_MyTempCharacter.uasset b/Content/Blueprints/BP_MyTempCharacter.uasset index 5c87a2d..2511028 100644 --- a/Content/Blueprints/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac2b6ffc86b65fe30fcc0358b8b0242d0b1aa0a2bf21b45f1c2030edc1383f4b -size 25526 +oid sha256:191e50199b24a870f7a204a31859477a601a2f654c3f60091d0a8ef50a6315e2 +size 29434 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 742f1a6..fcd37b4 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8ddf56cb9911f76fc53b56bce7f4d9b975536954fcca5b0645c7617b07deaed -size 23754 +oid sha256:778b88f378fa880bd4f070863d6d6e2f130571b7c07d93a3aae4c4679a44a6bc +size 24169 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index a4f34e8..63a9a08 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -4,7 +4,7 @@ #include "TempCharacter.h" #include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" -#include "Components/SphereComponent.h" + // CONSTRUCTOR @@ -60,5 +60,32 @@ void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo */ void ATempCharacter::KeyPressed(FKey Interact) { - UE_LOG(LogTemp, Display, TEXT("Interact key is being pressed")); + //vars for LineTraceSingleByChannel + TraceDistance = 1000; + FHitResult Hit; + FRotator Rot; + FVector Location; + FVector Start = Location; + FVector End = Start + (Rot.Vector() * TraceDistance); + + GetController()->GetPlayerViewPoint(Location, Rot); // where the player is looking thats what we set the location/rotation too + + FCollisionQueryParams TraceParams; + bool bHit = GetWorld()->LineTraceSingleByChannel(Hit,Start,End,ECC_Visibility, TraceParams); + if(bHit) + { + DrawDebugLine(GetWorld(),Start, End, FColor::Green, false, 1.0f); + UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *Hit.GetActor()->GetName()); + //Hit.GetActor()->Destroy(); + } + else + { + UE_LOG(LogTemp, Display, TEXT("BHIT IS FALSE")); + } + + /* + TODO: + FIX IT SO THE TRACE IS NOT HITTING PLANE + ITS HITTING PLANE NO MATTER WHAT MAYBE FIX LOCATION OF WHERE ITS BEING SHOT FROM? + */ } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 37d11a6..c492c53 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -3,7 +3,8 @@ #pragma once #include "CoreMinimal.h" -#include "Components/BoxComponent.h" +#include "Engine/World.h" +#include "DrawDebugHelpers.h" #include "GameFramework/Character.h" #include "TempCharacter.generated.h" @@ -23,6 +24,8 @@ protected: void ForwardInput(float Axis); void RightMoveInput(float Axis); + float TraceDistance; + public: // Called every frame virtual void Tick(float DeltaTime) override; @@ -31,5 +34,6 @@ public: virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; void KeyPressed(FKey Interact); - + + }; From 8ee792226c0841643e1481da025d5b07cb3c7351 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Fri, 11 Nov 2022 20:21:44 +0000 Subject: [PATCH 23/77] LineTrace works and is detecting objects. LineTrace works and is detecting objects from the player using the interact button. Also cleaned up some scripts and deleted unused MerchantTriggerBox script. --- Content/Levels/Main.umap | 4 +-- Content/Levels/MerchantPrototype.umap | 4 +-- .../MerchantRaw/MerchantTriggerBox.cpp | 32 ------------------- .../MerchantRaw/MerchantTriggerBox.h | 23 ------------- .../PlayerTemp/TempCharacter.cpp | 21 ++++-------- .../PlayerTemp/TempCharacter.h | 4 +-- 6 files changed, 12 insertions(+), 76 deletions(-) delete mode 100644 Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp delete mode 100644 Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h diff --git a/Content/Levels/Main.umap b/Content/Levels/Main.umap index 41d596c..c222134 100644 --- a/Content/Levels/Main.umap +++ b/Content/Levels/Main.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebb3f05b577a887b28ac85a9ddaa08e24356d99ac9d62c3104fee7d581ad2295 -size 59332 +oid sha256:6bebf971694ff133b986b1161ef8fe37e829e7c2d709da17a7be9444ea35a6c0 +size 57923 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index fcd37b4..abef8df 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:778b88f378fa880bd4f070863d6d6e2f130571b7c07d93a3aae4c4679a44a6bc -size 24169 +oid sha256:71972a686580a51b5e39734fdadcbead9cab44f70aa423b1c2e684eb5c64d855 +size 23271 diff --git a/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp b/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp deleted file mode 100644 index 79ebc12..0000000 --- a/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "MerchantTriggerBox.h" - -#include "the_twilight_abyss/PlayerTemp/TempCharacter.h" - -//makes it so the component script is initialized when game starts -UMerchantTriggerBox::UMerchantTriggerBox() -{ - PrimaryComponentTick.bCanEverTick = true; -} - - - -void UMerchantTriggerBox::BeginPlay() -{ - Super::BeginPlay(); - UE_LOG(LogTemp, Warning, TEXT("TRIGGER SPAWNED")); -} - - -void UMerchantTriggerBox::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) -{ - Super::TickComponent(DeltaTime, TickType, ThisTickFunction); - - -} - - - - diff --git a/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h b/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h deleted file mode 100644 index 980a86e..0000000 --- a/Source/the_twilight_abyss/MerchantRaw/MerchantTriggerBox.h +++ /dev/null @@ -1,23 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "Components/BoxComponent.h" -#include "Components/PrimitiveComponent.h" -#include "MerchantTriggerBox.generated.h" - -/** - * - */ -UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) -class THE_TWILIGHT_ABYSS_API UMerchantTriggerBox : public UBoxComponent -{ - GENERATED_BODY() -protected: - virtual void BeginPlay() override; - -public: - UMerchantTriggerBox(); - virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; -}; diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 63a9a08..d3affc5 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -58,34 +58,27 @@ void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo Make custom bool for when player enters the trigger its set to true Make if statement if both flags are true then dilouge box pops up */ -void ATempCharacter::KeyPressed(FKey Interact) +void ATempCharacter::KeyPressed() { //vars for LineTraceSingleByChannel TraceDistance = 1000; FHitResult Hit; - FRotator Rot; - FVector Location; - FVector Start = Location; - FVector End = Start + (Rot.Vector() * TraceDistance); + FVector Start = GetActorLocation(); + FVector End = Start + TraceDistance * GetActorForwardVector(); - GetController()->GetPlayerViewPoint(Location, Rot); // where the player is looking thats what we set the location/rotation too - FCollisionQueryParams TraceParams; + TraceParams.AddIgnoredActor(this); + bool bHit = GetWorld()->LineTraceSingleByChannel(Hit,Start,End,ECC_Visibility, TraceParams); if(bHit) { + DrawDebugLine(GetWorld(),Start, End, FColor::Green, false, 1.0f); UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *Hit.GetActor()->GetName()); - //Hit.GetActor()->Destroy(); } else { UE_LOG(LogTemp, Display, TEXT("BHIT IS FALSE")); } - - /* - TODO: - FIX IT SO THE TRACE IS NOT HITTING PLANE - ITS HITTING PLANE NO MATTER WHAT MAYBE FIX LOCATION OF WHERE ITS BEING SHOT FROM? - */ } + diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index c492c53..f5df595 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -33,7 +33,5 @@ public: // Called to bind functionality to input virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; - void KeyPressed(FKey Interact); - - + void KeyPressed(); }; From 2c7a717617feb470d692ec0d815450ae04c8a763 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Fri, 11 Nov 2022 20:35:41 +0000 Subject: [PATCH 24/77] Interaction between player and merchant works. --- Content/Levels/MerchantPrototype.umap | 4 ++-- .../PlayerTemp/TempCharacter.cpp | 24 +++++++------------ .../PlayerTemp/TempCharacter.h | 2 -- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index abef8df..caea42f 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71972a686580a51b5e39734fdadcbead9cab44f70aa423b1c2e684eb5c64d855 -size 23271 +oid sha256:f4a37ec4a9d65f2b21c7e29d31fb9b9dd998e181aa264ca826aa1e6594da30ef +size 23329 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index d3affc5..a2d2355 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -18,14 +18,12 @@ ATempCharacter::ATempCharacter() void ATempCharacter::BeginPlay() { Super::BeginPlay(); - } //Binds the input we made in the setup player component to the forward vector void ATempCharacter::ForwardInput(float Axis) { AddMovementInput(GetActorForwardVector()* Axis); - } //Binds the input we made in the setup player component to the right vector @@ -51,13 +49,6 @@ void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo PlayerInputComponent->BindAxis(TEXT("Look Up / Down Mouse"), this, &ATempCharacter::AddControllerPitchInput); PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); // custom keybind Interact } - -/* - TODO: - Make custom bool for pressed interact in trigger - Make custom bool for when player enters the trigger its set to true - Make if statement if both flags are true then dilouge box pops up - */ void ATempCharacter::KeyPressed() { //vars for LineTraceSingleByChannel @@ -67,18 +58,19 @@ void ATempCharacter::KeyPressed() FVector End = Start + TraceDistance * GetActorForwardVector(); FCollisionQueryParams TraceParams; + TraceParams.AddIgnoredActor(this); bool bHit = GetWorld()->LineTraceSingleByChannel(Hit,Start,End,ECC_Visibility, TraceParams); if(bHit) { - - DrawDebugLine(GetWorld(),Start, End, FColor::Green, false, 1.0f); - UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *Hit.GetActor()->GetName()); - } - else - { - UE_LOG(LogTemp, Display, TEXT("BHIT IS FALSE")); + if(Hit.GetActor()->ActorHasTag("MerchantTag")) + { + DrawDebugLine(GetWorld(),Start, End, FColor::Green, false, 1.0f); + UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *Hit.GetActor()->GetName()); + } } + } + \ No newline at end of file diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index f5df595..5545325 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -3,8 +3,6 @@ #pragma once #include "CoreMinimal.h" -#include "Engine/World.h" -#include "DrawDebugHelpers.h" #include "GameFramework/Character.h" #include "TempCharacter.generated.h" From f632a010a45c3bbfefa033f4e33c7a5f19f78bcf Mon Sep 17 00:00:00 2001 From: MH261677 Date: Fri, 11 Nov 2022 22:21:10 +0000 Subject: [PATCH 25/77] Refactored TempCharacter code --- Content/Levels/MerchantPrototype.umap | 4 +- .../PlayerTemp/TempCharacter.cpp | 52 ++++++++++--------- .../PlayerTemp/TempCharacter.h | 8 ++- 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index caea42f..ae52d8b 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4a37ec4a9d65f2b21c7e29d31fb9b9dd998e181aa264ca826aa1e6594da30ef -size 23329 +oid sha256:1ef2465e4c7f6a5910df3ec5a3923c9a0f80eb17ddb1411de806275274b50ba1 +size 24707 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index a2d2355..f5f9681 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -6,7 +6,6 @@ #include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" - // CONSTRUCTOR ATempCharacter::ATempCharacter() { @@ -23,13 +22,13 @@ void ATempCharacter::BeginPlay() //Binds the input we made in the setup player component to the forward vector void ATempCharacter::ForwardInput(float Axis) { - AddMovementInput(GetActorForwardVector()* Axis); + AddMovementInput(GetActorForwardVector() * Axis); } //Binds the input we made in the setup player component to the right vector void ATempCharacter::RightMoveInput(float Axis) { - AddMovementInput(GetActorRightVector()* Axis); + AddMovementInput(GetActorRightVector() * Axis); } @@ -47,30 +46,33 @@ void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo PlayerInputComponent->BindAxis(TEXT("Move Right / Left"), this, &ATempCharacter::RightMoveInput); PlayerInputComponent->BindAxis(TEXT("Turn Right / Left Mouse"), this, &ATempCharacter::AddControllerYawInput); PlayerInputComponent->BindAxis(TEXT("Look Up / Down Mouse"), this, &ATempCharacter::AddControllerPitchInput); - PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); // custom keybind Interact + PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); + // custom keybind Interact } + void ATempCharacter::KeyPressed() { - //vars for LineTraceSingleByChannel - TraceDistance = 1000; - FHitResult Hit; - FVector Start = GetActorLocation(); - FVector End = Start + TraceDistance * GetActorForwardVector(); - - FCollisionQueryParams TraceParams; - - TraceParams.AddIgnoredActor(this); - - bool bHit = GetWorld()->LineTraceSingleByChannel(Hit,Start,End,ECC_Visibility, TraceParams); - if(bHit) - { - if(Hit.GetActor()->ActorHasTag("MerchantTag")) - { - DrawDebugLine(GetWorld(),Start, End, FColor::Green, false, 1.0f); - UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *Hit.GetActor()->GetName()); - } - } - + LineTraceLogic(); } - \ No newline at end of file +void ATempCharacter::LineTraceLogic() +{ + float GlobalTrace = TraceDistance; + FHitResult OutHit; + FVector Start = GetActorLocation(); + FVector End = Start + GlobalTrace * GetActorForwardVector(); + + FCollisionQueryParams TraceParams; + + TraceParams.AddIgnoredActor(this); + + bool bHit = GetWorld()->LineTraceSingleByChannel(OutHit, Start, End, ECC_Visibility, TraceParams); + if (bHit) + { + if (OutHit.GetActor()->ActorHasTag("MerchantTag")) + { + DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 1.0f); + UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); + } + } +} diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 5545325..6843434 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -22,8 +22,6 @@ protected: void ForwardInput(float Axis); void RightMoveInput(float Axis); - float TraceDistance; - public: // Called every frame virtual void Tick(float DeltaTime) override; @@ -32,4 +30,10 @@ public: virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; void KeyPressed(); + + UPROPERTY(EditAnyWhere) + float TraceDistance = 200; + + void LineTraceLogic(); + }; From cdab08dcdf9009c94157e8b013c09ae24dff2a82 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Fri, 11 Nov 2022 23:33:37 +0000 Subject: [PATCH 26/77] Added Dialouge box for Shop --- Content/Levels/MerchantPrototype.umap | 4 ++-- Content/Merchant/BP_MerchantGameMode.uasset | 4 ++-- Content/Merchant/BP_OPENDIAL.uasset | 3 +++ Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 3 +++ Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 Content/Merchant/BP_OPENDIAL.uasset diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index ae52d8b..4d2eef1 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ef2465e4c7f6a5910df3ec5a3923c9a0f80eb17ddb1411de806275274b50ba1 -size 24707 +oid sha256:ec29ba0db3dfe4058261d9534947c299b31f5b36d3a91ddfdd70f1606afd1b3d +size 23329 diff --git a/Content/Merchant/BP_MerchantGameMode.uasset b/Content/Merchant/BP_MerchantGameMode.uasset index 191ec17..f9bbf98 100644 --- a/Content/Merchant/BP_MerchantGameMode.uasset +++ b/Content/Merchant/BP_MerchantGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a545be89d77a055ffcd3fcc1812d0c7bc90cfd0ff31e24e2d9cb4a33eb026df -size 19048 +oid sha256:2d2407c9aeda28720c26b714c16034f1209ee213730b0931ebd93ead214b261c +size 27962 diff --git a/Content/Merchant/BP_OPENDIAL.uasset b/Content/Merchant/BP_OPENDIAL.uasset new file mode 100644 index 0000000..fd13ac9 --- /dev/null +++ b/Content/Merchant/BP_OPENDIAL.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3e50d88d0164a436cb9cc9eba8b4ffac17f428bf6b858db7a987a726d78ce6b +size 33581 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index f5f9681..ed9890a 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -75,4 +75,7 @@ void ATempCharacter::LineTraceLogic() UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); } } + + + } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 6843434..a726a8d 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -21,6 +21,8 @@ protected: void ForwardInput(float Axis); void RightMoveInput(float Axis); + + TSubclassOf WidgetClass; //defining the widget class public: // Called every frame @@ -35,5 +37,4 @@ public: float TraceDistance = 200; void LineTraceLogic(); - }; From 4d53a2cdda947012d35fee2bc41f038ab5c85698 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 12 Nov 2022 18:47:13 +0000 Subject: [PATCH 27/77] Cant even get a widget to open after 4 hours --- Content/Blueprints/BP_MyTempCharacter.uasset | 4 +- Content/Levels/MerchantPrototype.umap | 4 +- Content/Merchant/BP_MerchantGameMode.uasset | 4 +- Content/Merchant_Blueprint.uasset | 3 ++ .../PlayerTemp/TempCharacter.cpp | 40 ++++++++++++++++--- .../PlayerTemp/TempCharacter.h | 1 + .../the_twilight_abyss.Build.cs | 2 +- the_twilight_abyss.uproject | 3 +- 8 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 Content/Merchant_Blueprint.uasset diff --git a/Content/Blueprints/BP_MyTempCharacter.uasset b/Content/Blueprints/BP_MyTempCharacter.uasset index 2511028..269b1f1 100644 --- a/Content/Blueprints/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:191e50199b24a870f7a204a31859477a601a2f654c3f60091d0a8ef50a6315e2 -size 29434 +oid sha256:fb0a77b0f469d017557974965bdd05383d263fdb8e96bb7d176fd760f02c53f2 +size 30012 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 4d2eef1..218ee10 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec29ba0db3dfe4058261d9534947c299b31f5b36d3a91ddfdd70f1606afd1b3d -size 23329 +oid sha256:e11da137b25dda1d74cb3fcbcc1feaaa4fa3d8cffb13e8994b75a01e3691eed7 +size 23038 diff --git a/Content/Merchant/BP_MerchantGameMode.uasset b/Content/Merchant/BP_MerchantGameMode.uasset index f9bbf98..cc33181 100644 --- a/Content/Merchant/BP_MerchantGameMode.uasset +++ b/Content/Merchant/BP_MerchantGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d2407c9aeda28720c26b714c16034f1209ee213730b0931ebd93ead214b261c -size 27962 +oid sha256:cc549e8f57a466d4be83e0d4519404f3b2dd0186c70090e944c9089772a594b8 +size 20569 diff --git a/Content/Merchant_Blueprint.uasset b/Content/Merchant_Blueprint.uasset new file mode 100644 index 0000000..fb48a05 --- /dev/null +++ b/Content/Merchant_Blueprint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6417b56f9b2842d2ba70bedffc0f6ff3e8b428f5f84d5aa37e5cd7e8a77256d +size 30945 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index ed9890a..bde03dc 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -1,8 +1,10 @@ // Fill out your copyright notice in the Description page of Project Settings. - #include "TempCharacter.h" - +#include "UObject/SoftObjectPath.h" +#include "Dialogs/Dialogs.h" +#include "Engine/GameViewportClient.h" +#include "Blueprint/UserWidget.h" #include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" @@ -66,16 +68,44 @@ void ATempCharacter::LineTraceLogic() TraceParams.AddIgnoredActor(this); - bool bHit = GetWorld()->LineTraceSingleByChannel(OutHit, Start, End, ECC_Visibility, TraceParams); + /*bool bHit = GetWorld()->LineTraceSingleByChannel(OutHit, Start, End, ECC_Visibility, TraceParams); if (bHit) { if (OutHit.GetActor()->ActorHasTag("MerchantTag")) { + FStringClassReference WidgetRef(TEXT("WidgetBlueprint/Game/Merchant/BP_OPENDIAL.BP_OPENDIAL")); + TSubclassOf WidgetLoad = WidgetRef.TryLoadClass(); + + UUserWidget* TestWidget = CreateWidget(this, WidgetLoad, FName(TEXT("MyWidget"))); + if(TestWidget) + { + TestWidget->AddToViewport(0); + } DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 1.0f); UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); } } +*/ - - + // In a constructor + FStringClassReference MyWidgetClassRef(TEXT("/Game/Widgets/TestWidget.TestWidget_C")); + // Get the widget class + + TSubclassOf TestWidgetClass = MyWidgetClassRef.TryLoadClass(); + + // ... then to display you widget do + + // Check if class was found + if (TestWidgetClass ) + { + // Create the widget + UUserWidget* TestWidget= CreateWidget(this, TestWidgetClass, FName(TEXT("MyWidget"))); + // Check if widget was created + if (TestWidget) + { + TestWidget->AddToViewport(); + } + } + + // I GIVE UP LOL! } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index a726a8d..d264f59 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "GameFramework/Character.h" +#include "Blueprint/UserWidget.h" #include "TempCharacter.generated.h" UCLASS() diff --git a/Source/the_twilight_abyss/the_twilight_abyss.Build.cs b/Source/the_twilight_abyss/the_twilight_abyss.Build.cs index 9cb5741..b6dac8e 100644 --- a/Source/the_twilight_abyss/the_twilight_abyss.Build.cs +++ b/Source/the_twilight_abyss/the_twilight_abyss.Build.cs @@ -8,7 +8,7 @@ public class the_twilight_abyss : ModuleRules { PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "UMG" }); PrivateDependencyModuleNames.AddRange(new string[] { }); diff --git a/the_twilight_abyss.uproject b/the_twilight_abyss.uproject index 2387df4..4f33989 100644 --- a/the_twilight_abyss.uproject +++ b/the_twilight_abyss.uproject @@ -9,7 +9,8 @@ "Type": "Runtime", "LoadingPhase": "Default", "AdditionalDependencies": [ - "Engine" + "Engine", + "UMG" ] } ], From eeaf52df896751de9facb380cc008730cc46f11d Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 13 Nov 2022 03:00:21 +0000 Subject: [PATCH 28/77] Attempted to reference UserWidget --- Content/Blueprints/BP_MyTempCharacter.uasset | 4 +- Content/Levels/MerchantPrototype.umap | 2 +- Content/Merchant/BP_MerchantGameMode.uasset | 2 +- .../PlayerTemp/TempCharacter.cpp | 45 ++++++------------- .../PlayerTemp/TempCharacter.h | 8 ++++ 5 files changed, 25 insertions(+), 36 deletions(-) diff --git a/Content/Blueprints/BP_MyTempCharacter.uasset b/Content/Blueprints/BP_MyTempCharacter.uasset index 269b1f1..1f43a9e 100644 --- a/Content/Blueprints/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb0a77b0f469d017557974965bdd05383d263fdb8e96bb7d176fd760f02c53f2 -size 30012 +oid sha256:09a051db65cef4e2912e96de44ad4da440b1c6fcc0ca839236ec49dc0eb8b943 +size 29574 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 218ee10..1a2b7c2 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e11da137b25dda1d74cb3fcbcc1feaaa4fa3d8cffb13e8994b75a01e3691eed7 +oid sha256:9e83d7e34f1e94c19d2edbe7aa2755b6261c1c7ddb3628e668fd77a1356b59e0 size 23038 diff --git a/Content/Merchant/BP_MerchantGameMode.uasset b/Content/Merchant/BP_MerchantGameMode.uasset index cc33181..2e44159 100644 --- a/Content/Merchant/BP_MerchantGameMode.uasset +++ b/Content/Merchant/BP_MerchantGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc549e8f57a466d4be83e0d4519404f3b2dd0186c70090e944c9089772a594b8 +oid sha256:926719df7176f9678de65e93b192fe07cb79d5f1a3d5f8a49dd4ecb500bbd7b5 size 20569 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index bde03dc..c9c3d3e 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -13,12 +13,23 @@ ATempCharacter::ATempCharacter() { // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; + //WidgetRef = CreateDefaultSubobject(TEXT("Widget Reference")); + + //FStringClassReference WidgetClassRef(TEXT("/Game/Merchant/BP_OPENDIAL.BP_OPENDIAL")); + //WidgetClass = WidgetClassRef.TryLoadClass(); + + //WidgetClass = CreateWidget(GetWorld(),WidgetClass); + if(WidgetRef) + { + WidgetRef->AddToViewport(0); + } } // Called when the game starts or when spawned void ATempCharacter::BeginPlay() { Super::BeginPlay(); + } //Binds the input we made in the setup player component to the forward vector @@ -68,44 +79,14 @@ void ATempCharacter::LineTraceLogic() TraceParams.AddIgnoredActor(this); - /*bool bHit = GetWorld()->LineTraceSingleByChannel(OutHit, Start, End, ECC_Visibility, TraceParams); + bool bHit = GetWorld()->LineTraceSingleByChannel(OutHit, Start, End, ECC_Visibility, TraceParams); if (bHit) { if (OutHit.GetActor()->ActorHasTag("MerchantTag")) { - FStringClassReference WidgetRef(TEXT("WidgetBlueprint/Game/Merchant/BP_OPENDIAL.BP_OPENDIAL")); - TSubclassOf WidgetLoad = WidgetRef.TryLoadClass(); - - UUserWidget* TestWidget = CreateWidget(this, WidgetLoad, FName(TEXT("MyWidget"))); - if(TestWidget) - { - TestWidget->AddToViewport(0); - } + WidgetRef->AddToViewport(0); DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 1.0f); UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); } } -*/ - - // In a constructor - FStringClassReference MyWidgetClassRef(TEXT("/Game/Widgets/TestWidget.TestWidget_C")); - // Get the widget class - - TSubclassOf TestWidgetClass = MyWidgetClassRef.TryLoadClass(); - - // ... then to display you widget do - - // Check if class was found - if (TestWidgetClass ) - { - // Create the widget - UUserWidget* TestWidget= CreateWidget(this, TestWidgetClass, FName(TEXT("MyWidget"))); - // Check if widget was created - if (TestWidget) - { - TestWidget->AddToViewport(); - } - } - - // I GIVE UP LOL! } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index d264f59..0f3836c 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -38,4 +38,12 @@ public: float TraceDistance = 200; void LineTraceLogic(); + + UPROPERTY(EditBlueprintReadWrite, meta = (BindWidget)) + UUserWidget* WidgetRef; + +//private: + + //UPROPERTY(EditDefaultsOnly) + //TSubclassOf WidgetClass; }; From 846b21e4e9e7b429134a9806d0a6414db760c837 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 13 Nov 2022 16:43:01 +0000 Subject: [PATCH 29/77] Fixed Interaction Pop-Ups Interaction is now working with the merchant also added interaction class to setup this up. --- Content/Blueprints/BP_Interaction.uasset | 3 ++ Content/Blueprints/BP_MyTempCharacter.uasset | 4 +- Content/Levels/MerchantPrototype.umap | 4 +- .../MerchantInteraction/Interaction.cpp | 37 +++++++++++++++++++ .../MerchantInteraction/Interaction.h | 33 +++++++++++++++++ .../PlayerTemp/TempCharacter.cpp | 20 ++++------ .../PlayerTemp/TempCharacter.h | 11 ------ 7 files changed, 85 insertions(+), 27 deletions(-) create mode 100644 Content/Blueprints/BP_Interaction.uasset create mode 100644 Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp create mode 100644 Source/the_twilight_abyss/MerchantInteraction/Interaction.h diff --git a/Content/Blueprints/BP_Interaction.uasset b/Content/Blueprints/BP_Interaction.uasset new file mode 100644 index 0000000..024952c --- /dev/null +++ b/Content/Blueprints/BP_Interaction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14deaac2c8f6b6aa67592c8a806ed6059a566d3a767fbd18a092107b29913718 +size 27683 diff --git a/Content/Blueprints/BP_MyTempCharacter.uasset b/Content/Blueprints/BP_MyTempCharacter.uasset index 1f43a9e..0594c08 100644 --- a/Content/Blueprints/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09a051db65cef4e2912e96de44ad4da440b1c6fcc0ca839236ec49dc0eb8b943 -size 29574 +oid sha256:7ab40229553278ecf914c2fb5a78609d1bff1d3c451797bf175ecf6a8948d3d5 +size 29619 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 1a2b7c2..5e6ba54 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e83d7e34f1e94c19d2edbe7aa2755b6261c1c7ddb3628e668fd77a1356b59e0 -size 23038 +oid sha256:b452da02d420447c486ed947537ab3030dddf2942de6533b784f7ec131498696 +size 23264 diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp new file mode 100644 index 0000000..df5bad3 --- /dev/null +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -0,0 +1,37 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "Interaction.h" + +#include "Components/WidgetComponent.h" + + + +// Sets default values +AInteraction::AInteraction() +{ + // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; + WidgetBase = CreateDefaultSubobject(TEXT("Widget Base Class")); +} + +// Called when the game starts or when spawned +void AInteraction::BeginPlay() +{ + Super::BeginPlay(); + +} + +// Called every frame +void AInteraction::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); + +} + +void AInteraction::OnInteract() +{ + auto spawnedWidget = CreateWidget(GetWorld(), Widget); + spawnedWidget->AddToViewport(0); +} + diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h new file mode 100644 index 0000000..da9fd47 --- /dev/null +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h @@ -0,0 +1,33 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Actor.h" +#include "Interaction.generated.h" + +UCLASS() +class THE_TWILIGHT_ABYSS_API AInteraction : public AActor +{ + GENERATED_BODY() + +public: + // Sets default values for this actor's properties + AInteraction(); + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void Tick(float DeltaTime) override; + + UPROPERTY(VisibleAnywhere) + class UWidgetComponent* WidgetBase; + + UPROPERTY(EditAnywhere) + TSubclassOf Widget; + + virtual void OnInteract(); +}; diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index c9c3d3e..b1f86e8 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -6,6 +6,7 @@ #include "Engine/GameViewportClient.h" #include "Blueprint/UserWidget.h" #include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" +#include "the_twilight_abyss/MerchantInteraction/Interaction.h" // CONSTRUCTOR @@ -13,16 +14,6 @@ ATempCharacter::ATempCharacter() { // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; - //WidgetRef = CreateDefaultSubobject(TEXT("Widget Reference")); - - //FStringClassReference WidgetClassRef(TEXT("/Game/Merchant/BP_OPENDIAL.BP_OPENDIAL")); - //WidgetClass = WidgetClassRef.TryLoadClass(); - - //WidgetClass = CreateWidget(GetWorld(),WidgetClass); - if(WidgetRef) - { - WidgetRef->AddToViewport(0); - } } // Called when the game starts or when spawned @@ -82,10 +73,15 @@ void ATempCharacter::LineTraceLogic() bool bHit = GetWorld()->LineTraceSingleByChannel(OutHit, Start, End, ECC_Visibility, TraceParams); if (bHit) { - if (OutHit.GetActor()->ActorHasTag("MerchantTag")) + if(OutHit.GetActor() == nullptr) { - WidgetRef->AddToViewport(0); + return; + } + if (AInteraction* MyInteractable = Cast(OutHit.GetActor())) + { + DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 1.0f); + MyInteractable->OnInteract(); UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); } } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 0f3836c..3f170b4 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -4,7 +4,6 @@ #include "CoreMinimal.h" #include "GameFramework/Character.h" -#include "Blueprint/UserWidget.h" #include "TempCharacter.generated.h" UCLASS() @@ -22,8 +21,6 @@ protected: void ForwardInput(float Axis); void RightMoveInput(float Axis); - - TSubclassOf WidgetClass; //defining the widget class public: // Called every frame @@ -38,12 +35,4 @@ public: float TraceDistance = 200; void LineTraceLogic(); - - UPROPERTY(EditBlueprintReadWrite, meta = (BindWidget)) - UUserWidget* WidgetRef; - -//private: - - //UPROPERTY(EditDefaultsOnly) - //TSubclassOf WidgetClass; }; From 0ce1fd4a1dc3a0eab8ac16778e9cf126dc7cb185 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Sun, 13 Nov 2022 19:19:45 +0000 Subject: [PATCH 30/77] Added Combat Test Map --- Content/Levels/CombatTest.umap | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Levels/CombatTest.umap diff --git a/Content/Levels/CombatTest.umap b/Content/Levels/CombatTest.umap new file mode 100644 index 0000000..2b576e9 --- /dev/null +++ b/Content/Levels/CombatTest.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ce698071b4801de7fbf6a8a3d7df65db4d248e828ed681b3c8a281e09394fe0 +size 32037 From bf3b2e38377d3dc1f4b6238bb8a20459ce4f3426 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Sun, 13 Nov 2022 21:30:31 +0000 Subject: [PATCH 31/77] Added Combat Test Game Mode Base --- Content/Blueprints/Combat_UI/Combat_Test.uasset | 3 +++ .../{ => TurnBasedCombat}/TurnBaseCombat.cpp | 0 .../the_twilight_abyss/{ => TurnBasedCombat}/TurnBaseCombat.h | 0 3 files changed, 3 insertions(+) create mode 100644 Content/Blueprints/Combat_UI/Combat_Test.uasset rename Source/the_twilight_abyss/{ => TurnBasedCombat}/TurnBaseCombat.cpp (100%) rename Source/the_twilight_abyss/{ => TurnBasedCombat}/TurnBaseCombat.h (100%) diff --git a/Content/Blueprints/Combat_UI/Combat_Test.uasset b/Content/Blueprints/Combat_UI/Combat_Test.uasset new file mode 100644 index 0000000..3aa5bc1 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Combat_Test.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f938f16d09d6d2bbf199542472ecef6a306b0c8c4e34b2483c8fb2c5a576bea9 +size 18847 diff --git a/Source/the_twilight_abyss/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp similarity index 100% rename from Source/the_twilight_abyss/TurnBaseCombat.cpp rename to Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp diff --git a/Source/the_twilight_abyss/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h similarity index 100% rename from Source/the_twilight_abyss/TurnBaseCombat.h rename to Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h From c085aae1308315a6dbfd509ff18b1966877088d7 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Sun, 13 Nov 2022 21:31:25 +0000 Subject: [PATCH 32/77] Refactored Variable Naming Conventions to Unreal --- Config/DefaultEngine.ini | 13 ++++++++--- Content/Levels/CombatTest.umap | 4 ++-- .../TurnBasedCombat/TurnBaseCombat.h | 23 ++++++++++--------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index d91fe57..a4873a5 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -17,7 +17,7 @@ ManualIPAddress= +ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Levels/Main.Main +EditorStartupMap=/Game/Levels/CombatTest.CombatTest LocalMapOptions= TransitionMap=None bUseSplitscreen=True @@ -26,9 +26,9 @@ ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/Levels/Main.Main +GameDefaultMap=/Game/Levels/CombatTest.CombatTest ServerDefaultMap=/Engine/Maps/Entry.Entry -GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C +GlobalDefaultGameMode=/Game/Blueprints/Combat_UI/Combat_Test.Combat_Test_C GlobalDefaultServerGameMode=None [/Script/Engine.CollisionProfile] @@ -88,3 +88,10 @@ GlobalDefaultServerGameMode=None +CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") + +[CoreRedirects] ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.isPlayerTurn",NewName="/Script/the_twilight_abyss.TurnBaseCombat.bIsPlayerTurn") ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.playerHealth",NewName="/Script/the_twilight_abyss.TurnBaseCombat.PlayerHealth") ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.enemyHealth",NewName="/Script/the_twilight_abyss.TurnBaseCombat.EnemyHealth") ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.defaultActionPoints",NewName="/Script/the_twilight_abyss.TurnBaseCombat.DefaultActionPoints") + diff --git a/Content/Levels/CombatTest.umap b/Content/Levels/CombatTest.umap index 2b576e9..e06c4fc 100644 --- a/Content/Levels/CombatTest.umap +++ b/Content/Levels/CombatTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ce698071b4801de7fbf6a8a3d7df65db4d248e828ed681b3c8a281e09394fe0 -size 32037 +oid sha256:7a45176293213fb3ae41647e726fe97e62aa824cc05a55def9fae7bd2c79bf59 +size 35199 diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index 68a6284..798c76c 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -15,15 +15,15 @@ class THE_TWILIGHT_ABYSS_API ATurnBaseCombat : public AGameStateBase GENERATED_BODY() public: - ATurnBaseCombat() = default; + ATurnBaseCombat(); UPROPERTY(EditDefaultsOnly) - int playerHealth = 100; + int PlayerHealth = 100; UPROPERTY(EditDefaultsOnly) - int enemyHealth = 100; + int EnemyHealth = 100; UPROPERTY(EditDefaultsOnly) - int defaultActionPoints = 3; - int activeActionPoints = 0; + int DefaultActionPoints = 3; + int ActiveActionPoints = 0; AActor* playerActor; AActor* enemyActor; @@ -31,20 +31,21 @@ public: /* TODO: - Reference Blueprint HUD Reference Action Library Reference Player Inventory Reference Combat Logging System */ + UPROPERTY(EditAnywhere) + TSubclassOf HUDWidget; protected: virtual void BeginPlay() override; - void useActionPoint(); - void reuseActionPoint(); - void revertActionPoints(); + void UseActionPoint(); + void ReuseActionPoint(); + void RevertActionPoints(); private: UPROPERTY(EditDefaultsOnly) - bool isPlayerTurn = true; - void switchTurn(); + bool bIsPlayerTurn = true; + void SwitchTurn(); }; From 58db9e7459e6dc987018b8498cb74bd2c67bcfcf Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Sun, 13 Nov 2022 21:32:35 +0000 Subject: [PATCH 33/77] Updated TurnBaseCombat to Reference HUD Blueprint --- .../Blueprints/Combat_UI/Combat_Test.uasset | 4 +- Content/Blueprints/Combat_UI/Combat_UI.uasset | 3 ++ .../TurnBasedCombat/TurnBaseCombat.cpp | 43 +++++++++++++------ 3 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 Content/Blueprints/Combat_UI/Combat_UI.uasset diff --git a/Content/Blueprints/Combat_UI/Combat_Test.uasset b/Content/Blueprints/Combat_UI/Combat_Test.uasset index 3aa5bc1..46803a2 100644 --- a/Content/Blueprints/Combat_UI/Combat_Test.uasset +++ b/Content/Blueprints/Combat_UI/Combat_Test.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f938f16d09d6d2bbf199542472ecef6a306b0c8c4e34b2483c8fb2c5a576bea9 -size 18847 +oid sha256:d25a36b9b8090174a119ab26e78df62755b03f8ea1a6d8c099dcb996366939f7 +size 19282 diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset new file mode 100644 index 0000000..cd91a40 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:804c9a872307d3f611aac831315f1326d5a29ccadab39f0b7a38495000d912df +size 24359 diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index 747dc99..c67a361 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -2,36 +2,51 @@ #include "TurnBaseCombat.h" + +#include "Blueprint/UserWidget.h" #include "Kismet/GameplayStatics.h" +ATurnBaseCombat::ATurnBaseCombat() +{ + if (HUDWidget == nullptr) + { + // Load the HUD widget from the specified path + static ConstructorHelpers::FClassFinder HUDWidgetClass(TEXT("/Game/Blueprints/Combat_UI/Combat_UI")); + HUDWidget = HUDWidgetClass.Class; + } +} + void ATurnBaseCombat::BeginPlay() { Super::BeginPlay(); + TArray AllCharacterActorsInScene; - UGameplayStatics::GetAllActorsOfClassWithTag(GetWorld(), AActor::StaticClass(), FName("Character"), AllCharacterActorsInScene); - activeActionPoints = defaultActionPoints; + UGameplayStatics::GetAllActorsOfClassWithTag(GetWorld(), AActor::StaticClass(), FName("Character"), + AllCharacterActorsInScene); + ActiveActionPoints = DefaultActionPoints; + + UUserWidget* HUD = CreateWidget(GetWorld(), HUDWidget); + HUD->AddToViewport(); } -void ATurnBaseCombat::useActionPoint() +void ATurnBaseCombat::UseActionPoint() { - activeActionPoints -= 1; - activeActionPoints = FMath::Clamp(activeActionPoints, 0, defaultActionPoints); + ActiveActionPoints -= 1; + ActiveActionPoints = FMath::Clamp(ActiveActionPoints, 0, DefaultActionPoints); } -void ATurnBaseCombat::reuseActionPoint() +void ATurnBaseCombat::ReuseActionPoint() { - activeActionPoints += 1; - activeActionPoints = FMath::Clamp(activeActionPoints, 0, defaultActionPoints); + ActiveActionPoints += 1; + ActiveActionPoints = FMath::Clamp(ActiveActionPoints, 0, DefaultActionPoints); } -void ATurnBaseCombat::revertActionPoints() +void ATurnBaseCombat::RevertActionPoints() { - activeActionPoints = defaultActionPoints; + ActiveActionPoints = DefaultActionPoints; } -void ATurnBaseCombat::switchTurn() +void ATurnBaseCombat::SwitchTurn() { - activeActor = (isPlayerTurn) ? enemyActor : playerActor; + activeActor = bIsPlayerTurn ? enemyActor : playerActor; } - - From d29bb501c772730277436188e31d052a6aa125a6 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 13 Nov 2022 22:21:51 +0000 Subject: [PATCH 34/77] Updated Interaction,TempCharacter to cleanup I cleaned up and removed unused functions in both interaction and tempcharacter scripts. --- Content/Blueprints/BP_Interaction.uasset | 4 +- .../MerchantInteraction/Interaction.cpp | 3 +- .../MerchantInteraction/Interaction.h | 6 +- .../PlayerTemp/TempCharacter.cpp | 1 - .../PlayerTemp/TempCharacter.cpp~ | 87 +++++++++++++++++++ 5 files changed, 92 insertions(+), 9 deletions(-) create mode 100644 Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp~ diff --git a/Content/Blueprints/BP_Interaction.uasset b/Content/Blueprints/BP_Interaction.uasset index 024952c..36accd5 100644 --- a/Content/Blueprints/BP_Interaction.uasset +++ b/Content/Blueprints/BP_Interaction.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14deaac2c8f6b6aa67592c8a806ed6059a566d3a767fbd18a092107b29913718 -size 27683 +oid sha256:4c7a00cbf616d22eba20079c3f1640b3d1c3ef86aee1bcfa4335ca32a5390a80 +size 27630 diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index df5bad3..237d6ee 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -12,7 +12,6 @@ AInteraction::AInteraction() { // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; - WidgetBase = CreateDefaultSubobject(TEXT("Widget Base Class")); } // Called when the game starts or when spawned @@ -31,7 +30,7 @@ void AInteraction::Tick(float DeltaTime) void AInteraction::OnInteract() { - auto spawnedWidget = CreateWidget(GetWorld(), Widget); + UUserWidget* spawnedWidget = CreateWidget(GetWorld(), Widget); spawnedWidget->AddToViewport(0); } diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h index da9fd47..2fa21b1 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.h +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.h @@ -22,12 +22,10 @@ protected: public: // Called every frame virtual void Tick(float DeltaTime) override; - - UPROPERTY(VisibleAnywhere) - class UWidgetComponent* WidgetBase; - + UPROPERTY(EditAnywhere) TSubclassOf Widget; virtual void OnInteract(); }; + diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index b1f86e8..83bf10b 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -79,7 +79,6 @@ void ATempCharacter::LineTraceLogic() } if (AInteraction* MyInteractable = Cast(OutHit.GetActor())) { - DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 1.0f); MyInteractable->OnInteract(); UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp~ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp~ new file mode 100644 index 0000000..83bf10b --- /dev/null +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp~ @@ -0,0 +1,87 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "TempCharacter.h" +#include "UObject/SoftObjectPath.h" +#include "Dialogs/Dialogs.h" +#include "Engine/GameViewportClient.h" +#include "Blueprint/UserWidget.h" +#include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" +#include "the_twilight_abyss/MerchantInteraction/Interaction.h" + + +// CONSTRUCTOR +ATempCharacter::ATempCharacter() +{ + // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; +} + +// Called when the game starts or when spawned +void ATempCharacter::BeginPlay() +{ + Super::BeginPlay(); + +} + +//Binds the input we made in the setup player component to the forward vector +void ATempCharacter::ForwardInput(float Axis) +{ + AddMovementInput(GetActorForwardVector() * Axis); +} + +//Binds the input we made in the setup player component to the right vector +void ATempCharacter::RightMoveInput(float Axis) +{ + AddMovementInput(GetActorRightVector() * Axis); +} + + +// Called every frame +void ATempCharacter::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + +// Called to bind functionality to input +void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) +{ + Super::SetupPlayerInputComponent(PlayerInputComponent); + PlayerInputComponent->BindAxis(TEXT("Move Forward / Backward"), this, &ATempCharacter::ForwardInput); + PlayerInputComponent->BindAxis(TEXT("Move Right / Left"), this, &ATempCharacter::RightMoveInput); + PlayerInputComponent->BindAxis(TEXT("Turn Right / Left Mouse"), this, &ATempCharacter::AddControllerYawInput); + PlayerInputComponent->BindAxis(TEXT("Look Up / Down Mouse"), this, &ATempCharacter::AddControllerPitchInput); + PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); + // custom keybind Interact +} + +void ATempCharacter::KeyPressed() +{ + LineTraceLogic(); +} + +void ATempCharacter::LineTraceLogic() +{ + float GlobalTrace = TraceDistance; + FHitResult OutHit; + FVector Start = GetActorLocation(); + FVector End = Start + GlobalTrace * GetActorForwardVector(); + + FCollisionQueryParams TraceParams; + + TraceParams.AddIgnoredActor(this); + + bool bHit = GetWorld()->LineTraceSingleByChannel(OutHit, Start, End, ECC_Visibility, TraceParams); + if (bHit) + { + if(OutHit.GetActor() == nullptr) + { + return; + } + if (AInteraction* MyInteractable = Cast(OutHit.GetActor())) + { + DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 1.0f); + MyInteractable->OnInteract(); + UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); + } + } +} From c23bbb4f0828f11ca3801d79bd984286412fd784 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 00:02:46 +0000 Subject: [PATCH 35/77] Added Test Combat Player Character --- .../PlayerCharacterCombatTest.uasset | 3 ++ .../PlayerCharacterCombatTest.cpp | 34 +++++++++++++++++++ .../PlayerCharacterCombatTest.h | 29 ++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset create mode 100644 Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.cpp create mode 100644 Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.h diff --git a/Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset b/Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset new file mode 100644 index 0000000..1a35a36 --- /dev/null +++ b/Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0292f02e9a169f359bc4851d983fabb25cb905fe8877599fe07090b1ef59c30a +size 22873 diff --git a/Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.cpp b/Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.cpp new file mode 100644 index 0000000..252a758 --- /dev/null +++ b/Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.cpp @@ -0,0 +1,34 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "TurnBasedCombat/PlayerCharacterCombatTest.h" + +// Sets default values +APlayerCharacterCombatTest::APlayerCharacterCombatTest() +{ + // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; + +} + +// Called when the game starts or when spawned +void APlayerCharacterCombatTest::BeginPlay() +{ + Super::BeginPlay(); + +} + +// Called every frame +void APlayerCharacterCombatTest::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); + +} + +// Called to bind functionality to input +void APlayerCharacterCombatTest::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) +{ + Super::SetupPlayerInputComponent(PlayerInputComponent); + +} + diff --git a/Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.h b/Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.h new file mode 100644 index 0000000..ffffd26 --- /dev/null +++ b/Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.h @@ -0,0 +1,29 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Character.h" +#include "PlayerCharacterCombatTest.generated.h" + +UCLASS() +class THE_TWILIGHT_ABYSS_API APlayerCharacterCombatTest : public ACharacter +{ + GENERATED_BODY() + +public: + // Sets default values for this character's properties + APlayerCharacterCombatTest(); + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void Tick(float DeltaTime) override; + + // Called to bind functionality to input + virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + +}; From 19d43413ef419f6e30b7d8978fe2dd156289bf1c Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 00:03:24 +0000 Subject: [PATCH 36/77] Updated Combat UI for Progress Bars --- Config/DefaultEditor.ini | 1 + Content/Blueprints/Combat_UI/Combat_Test.uasset | 4 ++-- Content/Blueprints/Combat_UI/Combat_UI.uasset | 4 ++-- Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset | 4 ++-- Content/Levels/CombatTest.umap | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Config/DefaultEditor.ini diff --git a/Config/DefaultEditor.ini b/Config/DefaultEditor.ini new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Config/DefaultEditor.ini @@ -0,0 +1 @@ + diff --git a/Content/Blueprints/Combat_UI/Combat_Test.uasset b/Content/Blueprints/Combat_UI/Combat_Test.uasset index 46803a2..d4e8e8a 100644 --- a/Content/Blueprints/Combat_UI/Combat_Test.uasset +++ b/Content/Blueprints/Combat_UI/Combat_Test.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d25a36b9b8090174a119ab26e78df62755b03f8ea1a6d8c099dcb996366939f7 -size 19282 +oid sha256:6249b2c22fa16eb16e065443b9afb067829818495f428fbd4712205c0dde8a08 +size 19579 diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index cd91a40..f465f4f 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:804c9a872307d3f611aac831315f1326d5a29ccadab39f0b7a38495000d912df -size 24359 +oid sha256:0172359c9ddba57a87dfd81166e8466a68d43e72a775f0279d368a27cd02dc50 +size 29072 diff --git a/Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset b/Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset index 1a35a36..34d2bd0 100644 --- a/Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset +++ b/Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0292f02e9a169f359bc4851d983fabb25cb905fe8877599fe07090b1ef59c30a -size 22873 +oid sha256:7979693199bb1a063e7a07926dea06d8ba77a58bc5d5219ca1a243b4a3e0fa0b +size 29095 diff --git a/Content/Levels/CombatTest.umap b/Content/Levels/CombatTest.umap index e06c4fc..0851251 100644 --- a/Content/Levels/CombatTest.umap +++ b/Content/Levels/CombatTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a45176293213fb3ae41647e726fe97e62aa824cc05a55def9fae7bd2c79bf59 -size 35199 +oid sha256:8d379efe28d261d5316eb4cfdfed3b3b9cf9d5dc6d07254018318204c96ad25c +size 34591 From df51750a5eb90cfc9f8f4ed4f2e03ea2f9de79e2 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 00:03:59 +0000 Subject: [PATCH 37/77] Added Tag to Combat Test Character --- .../TurnBasedCombat/PlayerCharacterCombatTest.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.cpp b/Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.cpp index 252a758..99dbb55 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/PlayerCharacterCombatTest.cpp @@ -1,7 +1,7 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "TurnBasedCombat/PlayerCharacterCombatTest.h" +#include "PlayerCharacterCombatTest.h" // Sets default values APlayerCharacterCombatTest::APlayerCharacterCombatTest() @@ -9,13 +9,14 @@ APlayerCharacterCombatTest::APlayerCharacterCombatTest() // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; + Tags.Add(FName("Character")); } // Called when the game starts or when spawned void APlayerCharacterCombatTest::BeginPlay() { Super::BeginPlay(); - + } // Called every frame From 2a92b5577ffbbdd5757d508f617a109803f12828 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 00:04:44 +0000 Subject: [PATCH 38/77] Added Interfacing to Blueprint UI via Game State --- .../TurnBasedCombat/TurnBaseCombat.cpp | 55 ++++++++++++++++++- .../TurnBasedCombat/TurnBaseCombat.h | 30 ++++++++-- 2 files changed, 77 insertions(+), 8 deletions(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index c67a361..2c62004 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -2,8 +2,10 @@ #include "TurnBaseCombat.h" - +#include "CoreMinimal.h" #include "Blueprint/UserWidget.h" +#include "Components/TextBlock.h" +#include "Components/ProgressBar.h" #include "Kismet/GameplayStatics.h" ATurnBaseCombat::ATurnBaseCombat() @@ -21,12 +23,38 @@ void ATurnBaseCombat::BeginPlay() Super::BeginPlay(); TArray AllCharacterActorsInScene; - UGameplayStatics::GetAllActorsOfClassWithTag(GetWorld(), AActor::StaticClass(), FName("Character"), - AllCharacterActorsInScene); + UGameplayStatics::GetAllActorsOfClassWithTag(GetWorld(), AActor::StaticClass(), FName("Character"), AllCharacterActorsInScene); ActiveActionPoints = DefaultActionPoints; UUserWidget* HUD = CreateWidget(GetWorld(), HUDWidget); HUD->AddToViewport(); + + TurnIndicator = Cast(HUD->GetWidgetFromName("TurnIndicator")); + PlayerHealthBar = Cast(HUD->GetWidgetFromName("PlayerHealthBar")); + EnemyHealthBar = Cast(HUD->GetWidgetFromName("EnemyHealthBar")); +} + +void ATurnBaseCombat::ExecuteCast(FString Combo) +{ + if (!IsValidCombo(Combo)) + { + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("Invalid Combo")); + return; + } + + switch (bIsPlayerTurn) + { + case true: + // Player Turn + DamageEnemy(ValidCombos[Combo]); + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("Enemy Damaged %f"), ValidCombos[Combo]); + break; + case false: + // Enemy Turn + DamagePlayer(ValidCombos[Combo]); + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("Player Damaged %f"), ValidCombos[Combo]); + break; + } } void ATurnBaseCombat::UseActionPoint() @@ -46,6 +74,27 @@ void ATurnBaseCombat::RevertActionPoints() ActiveActionPoints = DefaultActionPoints; } +void ATurnBaseCombat::DamagePlayer(int Damage) +{ + PlayerHealth -= FMath::Clamp(Damage, 0, 100); +} + +void ATurnBaseCombat::DamageEnemy(int Damage) +{ + EnemyHealth -= FMath::Clamp(Damage, 0, 100); +} + +void ATurnBaseCombat::UpdateProgressBars() const +{ + PlayerHealthBar->SetPercent(PlayerHealth / 100); + EnemyHealthBar->SetPercent(EnemyHealth / 100); +} + +bool ATurnBaseCombat::IsValidCombo(FString Combo) const +{ + return ValidCombos.Contains(Combo); +} + void ATurnBaseCombat::SwitchTurn() { activeActor = bIsPlayerTurn ? enemyActor : playerActor; diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index 798c76c..45e7311 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -3,6 +3,8 @@ #pragma once #include "CoreMinimal.h" +#include "Components/ProgressBar.h" +#include "Components/TextBlock.h" #include "GameFramework/GameStateBase.h" #include "TurnBaseCombat.generated.h" @@ -18,11 +20,11 @@ public: ATurnBaseCombat(); UPROPERTY(EditDefaultsOnly) - int PlayerHealth = 100; + int PlayerHealth = 100; UPROPERTY(EditDefaultsOnly) - int EnemyHealth = 100; + int EnemyHealth = 100; UPROPERTY(EditDefaultsOnly) - int DefaultActionPoints = 3; + int DefaultActionPoints = 3; int ActiveActionPoints = 0; AActor* playerActor; @@ -37,15 +39,33 @@ public: */ UPROPERTY(EditAnywhere) TSubclassOf HUDWidget; + UPROPERTY(EditAnywhere) + TMap ValidCombos = + { + {"F", 10}, + {"W", 10}, + {"FW", 20} + }; protected: virtual void BeginPlay() override; + void ExecuteCast(FString Combo); void UseActionPoint(); void ReuseActionPoint(); void RevertActionPoints(); + void DamagePlayer(int Damage); + void DamageEnemy(int Damage); + void UpdateProgressBars() const; private: - UPROPERTY(EditDefaultsOnly) - bool bIsPlayerTurn = true; + bool IsValidCombo(FString Combo) const; + UPROPERTY(VisibleAnywhere) + bool bIsPlayerTurn = true; void SwitchTurn(); + UPROPERTY(VisibleAnywhere) + UTextBlock* TurnIndicator; + UPROPERTY(VisibleAnywhere) + UProgressBar* PlayerHealthBar; + UPROPERTY(VisibleAnywhere) + UProgressBar* EnemyHealthBar; }; From 38ab749ecc53bd5c069704258f208160ac038632 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 01:11:37 +0000 Subject: [PATCH 39/77] Updated TurnBaseCombat for Combo String Validation --- .../the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index 2c62004..2d5d103 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -46,13 +46,13 @@ void ATurnBaseCombat::ExecuteCast(FString Combo) { case true: // Player Turn - DamageEnemy(ValidCombos[Combo]); - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("Enemy Damaged %f"), ValidCombos[Combo]); + DamageEnemy(*ValidCombos.Find(Combo)); + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, FString::Printf(TEXT("Enemy Damaged %d"), *ValidCombos.Find(Combo))); break; case false: // Enemy Turn - DamagePlayer(ValidCombos[Combo]); - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("Player Damaged %f"), ValidCombos[Combo]); + DamagePlayer(*ValidCombos.Find(Combo)); + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); break; } } From 3b627518ca2f45c8d68c1b181fcda0c1776a01be Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 03:04:11 +0000 Subject: [PATCH 40/77] Updated Blueprint Combat UI for Prototype Buttons --- Content/Blueprints/Combat_UI/Combat_UI.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index f465f4f..8fd5f83 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0172359c9ddba57a87dfd81166e8466a68d43e72a775f0279d368a27cd02dc50 -size 29072 +oid sha256:57b261a7e611e3f659bd4a352777078d8e90725ab27e2b752545b9527bb7721f +size 45704 From 329cf183b9125069e46d450ab82c05f3d19d38ad Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 03:05:25 +0000 Subject: [PATCH 41/77] Updated TurnBaseCombat for Button Functionality --- Config/DefaultEngine.ini | 3 + .../TurnBasedCombat/TurnBaseCombat.cpp | 93 +++++++++++++++++-- .../TurnBasedCombat/TurnBaseCombat.h | 50 +++++++++- 3 files changed, 132 insertions(+), 14 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index a4873a5..a4ad8a7 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -94,4 +94,7 @@ GlobalDefaultServerGameMode=None +PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.playerHealth",NewName="/Script/the_twilight_abyss.TurnBaseCombat.PlayerHealth") +PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.enemyHealth",NewName="/Script/the_twilight_abyss.TurnBaseCombat.EnemyHealth") +PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.defaultActionPoints",NewName="/Script/the_twilight_abyss.TurnBaseCombat.DefaultActionPoints") ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.TestButton",NewName="/Script/the_twilight_abyss.TurnBaseCombat.CastButton") ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.CurrentCombo",NewName="/Script/the_twilight_abyss.TurnBaseCombat.CurrentComboTextBlock") ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.TurnIndicator",NewName="/Script/the_twilight_abyss.TurnBaseCombat.TurnIndicatorTextBlock") diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index 2d5d103..a01235b 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -24,14 +24,23 @@ void ATurnBaseCombat::BeginPlay() TArray AllCharacterActorsInScene; UGameplayStatics::GetAllActorsOfClassWithTag(GetWorld(), AActor::StaticClass(), FName("Character"), AllCharacterActorsInScene); - ActiveActionPoints = DefaultActionPoints; UUserWidget* HUD = CreateWidget(GetWorld(), HUDWidget); HUD->AddToViewport(); - TurnIndicator = Cast(HUD->GetWidgetFromName("TurnIndicator")); + TurnIndicatorTextBlock = Cast(HUD->GetWidgetFromName("TurnIndicator")); + CurrentComboTextBlock = Cast(HUD->GetWidgetFromName("CurrentCombo")); + ActionPointsTextBlock = Cast(HUD->GetWidgetFromName("ActionPoints")); PlayerHealthBar = Cast(HUD->GetWidgetFromName("PlayerHealthBar")); EnemyHealthBar = Cast(HUD->GetWidgetFromName("EnemyHealthBar")); + CastButton = Cast(HUD->GetWidgetFromName("CastButton")); + FButton = Cast(HUD->GetWidgetFromName("FButton")); + WButton = Cast(HUD->GetWidgetFromName("WButton")); + BackspaceButton = Cast(HUD->GetWidgetFromName("BackspaceButton")); + CastButton->OnClicked.AddDynamic(this, &ATurnBaseCombat::CastButtonOnClick); + FButton->OnClicked.AddDynamic(this, &ATurnBaseCombat::FButtonOnClick); + WButton->OnClicked.AddDynamic(this, &ATurnBaseCombat::WButtonOnClick); + BackspaceButton->OnClicked.AddDynamic(this, &ATurnBaseCombat::BackspaceButtonOnClick); } void ATurnBaseCombat::ExecuteCast(FString Combo) @@ -39,9 +48,18 @@ void ATurnBaseCombat::ExecuteCast(FString Combo) if (!IsValidCombo(Combo)) { GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("Invalid Combo")); + CurrentComboString = ""; + UpdateComboString(CurrentComboString); + RevertActionPoints(); + UpdateActionPoints(); return; } + CurrentComboString = ""; + UpdateComboString(CurrentComboString); + RevertActionPoints(); + UpdateActionPoints(); + switch (bIsPlayerTurn) { case true: @@ -59,35 +77,38 @@ void ATurnBaseCombat::ExecuteCast(FString Combo) void ATurnBaseCombat::UseActionPoint() { - ActiveActionPoints -= 1; - ActiveActionPoints = FMath::Clamp(ActiveActionPoints, 0, DefaultActionPoints); + ActiveActionPoints += 1; + UpdateActionPoints(); } void ATurnBaseCombat::ReuseActionPoint() { - ActiveActionPoints += 1; - ActiveActionPoints = FMath::Clamp(ActiveActionPoints, 0, DefaultActionPoints); + ActiveActionPoints -= 1; + UpdateActionPoints(); } void ATurnBaseCombat::RevertActionPoints() { - ActiveActionPoints = DefaultActionPoints; + ActiveActionPoints = 0; + UpdateActionPoints(); } void ATurnBaseCombat::DamagePlayer(int Damage) { PlayerHealth -= FMath::Clamp(Damage, 0, 100); + UpdateProgressBars(); } void ATurnBaseCombat::DamageEnemy(int Damage) { EnemyHealth -= FMath::Clamp(Damage, 0, 100); + UpdateProgressBars(); } void ATurnBaseCombat::UpdateProgressBars() const { - PlayerHealthBar->SetPercent(PlayerHealth / 100); - EnemyHealthBar->SetPercent(EnemyHealth / 100); + PlayerHealthBar->SetPercent(PlayerHealth / 100.0f); + EnemyHealthBar->SetPercent(EnemyHealth / 100.0f); } bool ATurnBaseCombat::IsValidCombo(FString Combo) const @@ -97,5 +118,57 @@ bool ATurnBaseCombat::IsValidCombo(FString Combo) const void ATurnBaseCombat::SwitchTurn() { - activeActor = bIsPlayerTurn ? enemyActor : playerActor; + TurnIndicatorTextBlock->SetText(FText::FromString(bIsPlayerTurn ? "Enemy Turn" : "Player Turn")); + //activeActor = bIsPlayerTurn ? enemyActor : playerActor; +} + +void ATurnBaseCombat::CastButtonOnClick() +{ + ExecuteCast(CurrentComboString); +} + +void ATurnBaseCombat::FButtonOnClick() +{ + if (ActiveActionPoints >= DefaultActionPoints) + { + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, TEXT("No More Action Points")); + return; + } + UseActionPoint(); + CurrentComboString.AppendChar('F'); + UpdateComboString(CurrentComboString); +} + +void ATurnBaseCombat::WButtonOnClick() +{ + if (ActiveActionPoints >= DefaultActionPoints) + { + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, TEXT("No More Action Points")); + return; + } + UseActionPoint(); + CurrentComboString.AppendChar('W'); + UpdateComboString(CurrentComboString); +} + +void ATurnBaseCombat::BackspaceButtonOnClick() +{ + if (CurrentComboString.Len() <= 0) + { + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, TEXT("Blank Combo")); + return; + } + ReuseActionPoint(); + CurrentComboString.RemoveAt(CurrentComboString.Len() - 1); + UpdateComboString(CurrentComboString); +} + +void ATurnBaseCombat::UpdateComboString(FString NewCombo) +{ + CurrentComboTextBlock->SetText(FText::FromString(NewCombo)); +} + +void ATurnBaseCombat::UpdateActionPoints() +{ + ActionPointsTextBlock->SetText(FText::FromString(FString::FromInt(ActiveActionPoints))); } diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index 45e7311..5c6fa1c 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "Components/Button.h" #include "Components/ProgressBar.h" #include "Components/TextBlock.h" #include "GameFramework/GameStateBase.h" @@ -25,6 +26,7 @@ public: int EnemyHealth = 100; UPROPERTY(EditDefaultsOnly) int DefaultActionPoints = 3; + UPROPERTY(EditDefaultsOnly) int ActiveActionPoints = 0; AActor* playerActor; @@ -33,7 +35,6 @@ public: /* TODO: - Reference Action Library Reference Player Inventory Reference Combat Logging System */ @@ -59,13 +60,54 @@ protected: private: bool IsValidCombo(FString Combo) const; + UPROPERTY(VisibleAnywhere) bool bIsPlayerTurn = true; - void SwitchTurn(); + UPROPERTY(VisibleAnywhere) - UTextBlock* TurnIndicator; + FString CurrentComboString = ""; + + void SwitchTurn(); + + UPROPERTY(VisibleAnywhere) + UTextBlock* TurnIndicatorTextBlock; + + UPROPERTY(VisibleAnywhere) + UTextBlock* CurrentComboTextBlock; + + UPROPERTY(VisibleAnywhere) + UTextBlock* ActionPointsTextBlock; + UPROPERTY(VisibleAnywhere) UProgressBar* PlayerHealthBar; + UPROPERTY(VisibleAnywhere) UProgressBar* EnemyHealthBar; -}; + + UPROPERTY(VisibleAnywhere) + UButton* CastButton; + + UPROPERTY(VisibleAnywhere) + UButton* FButton; + + UPROPERTY(VisibleAnywhere) + UButton* WButton; + + UPROPERTY(VisibleAnywhere) + UButton* BackspaceButton; + + UFUNCTION() + void CastButtonOnClick(); + + UFUNCTION() + void FButtonOnClick(); + + UFUNCTION() + void WButtonOnClick(); + + UFUNCTION() + void BackspaceButtonOnClick(); + + void UpdateComboString(FString NewCombo); + void UpdateActionPoints(); +}; \ No newline at end of file From ce4c2294c4e013d369e5b0fe30b77a794ed2c29b Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 03:15:26 +0000 Subject: [PATCH 42/77] Updated TurnBaseCombat for Simple Opponent AI --- .../the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index a01235b..dd5e341 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -73,6 +73,7 @@ void ATurnBaseCombat::ExecuteCast(FString Combo) GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); break; } + SwitchTurn(); } void ATurnBaseCombat::UseActionPoint() @@ -118,7 +119,11 @@ bool ATurnBaseCombat::IsValidCombo(FString Combo) const void ATurnBaseCombat::SwitchTurn() { - TurnIndicatorTextBlock->SetText(FText::FromString(bIsPlayerTurn ? "Enemy Turn" : "Player Turn")); + //TurnIndicatorTextBlock->SetText(FText::FromString(bIsPlayerTurn ? "Enemy Turn" : "Player Turn")); + //bIsPlayerTurn = !bIsPlayerTurn; + TurnIndicatorTextBlock->SetText(FText::FromString("Enemy Turn")); + DamagePlayer(10); + TurnIndicatorTextBlock->SetText(FText::FromString("Player Turn")); //activeActor = bIsPlayerTurn ? enemyActor : playerActor; } From 7fb9935e70a42ce57acd6caf522adae43ecc6937 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 03:18:50 +0000 Subject: [PATCH 43/77] Updated TurnBaseCombat to Show Cursor --- .../TurnBasedCombat/TurnBaseCombat.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index dd5e341..491473e 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -28,6 +28,15 @@ void ATurnBaseCombat::BeginPlay() UUserWidget* HUD = CreateWidget(GetWorld(), HUDWidget); HUD->AddToViewport(); + APlayerController* PC = Cast(GetWorld()->GetFirstPlayerController()); + + if (PC) + { + PC->bShowMouseCursor = true; + PC->bEnableClickEvents = true; + PC->bEnableMouseOverEvents = true; + } + TurnIndicatorTextBlock = Cast(HUD->GetWidgetFromName("TurnIndicator")); CurrentComboTextBlock = Cast(HUD->GetWidgetFromName("CurrentCombo")); ActionPointsTextBlock = Cast(HUD->GetWidgetFromName("ActionPoints")); From e5af4538eac8d4279a63c90cb534466cba20f062 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 03:22:05 +0000 Subject: [PATCH 44/77] Updated TurnBaseCombat for Code Cleanup --- .../TurnBasedCombat/TurnBaseCombat.cpp | 4 ++-- .../TurnBasedCombat/TurnBaseCombat.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index 491473e..e02484f 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -177,12 +177,12 @@ void ATurnBaseCombat::BackspaceButtonOnClick() UpdateComboString(CurrentComboString); } -void ATurnBaseCombat::UpdateComboString(FString NewCombo) +void ATurnBaseCombat::UpdateComboString(FString NewCombo) const { CurrentComboTextBlock->SetText(FText::FromString(NewCombo)); } -void ATurnBaseCombat::UpdateActionPoints() +void ATurnBaseCombat::UpdateActionPoints() const { ActionPointsTextBlock->SetText(FText::FromString(FString::FromInt(ActiveActionPoints))); } diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index 5c6fa1c..b703434 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -29,9 +29,9 @@ public: UPROPERTY(EditDefaultsOnly) int ActiveActionPoints = 0; - AActor* playerActor; - AActor* enemyActor; - AActor* activeActor; + AActor* PlayerActor; + AActor* EnemyActor; + AActor* ActiveActor; /* TODO: @@ -108,6 +108,6 @@ private: UFUNCTION() void BackspaceButtonOnClick(); - void UpdateComboString(FString NewCombo); - void UpdateActionPoints(); + void UpdateComboString(FString NewCombo) const; + void UpdateActionPoints() const; }; \ No newline at end of file From bb544d2f3512d8d0b5891ec8d40d741356452fb8 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 11:31:51 +0000 Subject: [PATCH 45/77] Updated TurnBaseCombat for Comabat Log --- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 2 +- .../the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp | 8 ++++++++ .../the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index b1f86e8..87a07a9 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -5,7 +5,7 @@ #include "Dialogs/Dialogs.h" #include "Engine/GameViewportClient.h" #include "Blueprint/UserWidget.h" -#include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" +//#include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index e02484f..fd5c08d 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -186,3 +186,11 @@ void ATurnBaseCombat::UpdateActionPoints() const { ActionPointsTextBlock->SetText(FText::FromString(FString::FromInt(ActiveActionPoints))); } + +void ATurnBaseCombat::AddBattleLogMessage(FString Message) +{ + FString* tempTextBlock; + BattleLog.Enqueue(Message); + tempTextBlock = BattleLog.Peek(); + +} diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index b703434..83073b7 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -48,6 +48,9 @@ public: {"FW", 20} }; + UPROPERTY(EditAnywhere) + TQueue BattleLog; + protected: virtual void BeginPlay() override; void ExecuteCast(FString Combo); @@ -110,4 +113,6 @@ private: void UpdateComboString(FString NewCombo) const; void UpdateActionPoints() const; + + void AddBattleLogMessage(FString Message); }; \ No newline at end of file From b765f633d6dd65b4cac12f739f1a6936c03903ca Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 11:55:11 +0000 Subject: [PATCH 46/77] Bugfix Unreal Compliation Workaround for TQueues --- Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index 83073b7..b511f8b 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -48,7 +48,6 @@ public: {"FW", 20} }; - UPROPERTY(EditAnywhere) TQueue BattleLog; protected: From e070b32f0e12808ad77c8393fad824f5f8c74262 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 14:57:02 +0000 Subject: [PATCH 47/77] Created BaseItem and InventoryComponent for Items Created both the baseitem and inventorycomponent class to start adding in the custom items to the game. --- Content/Levels/MerchantPrototype.umap | 4 +- .../BaseItems/InventoryComponent.cpp | 36 ++++++++++++++++ .../BaseItems/InventoryComponent.h | 27 ++++++++++++ .../BaseItems/Items/BaseItem.cpp | 4 ++ .../BaseItems/Items/BaseItem.h | 41 +++++++++++++++++++ 5 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp create mode 100644 Source/the_twilight_abyss/BaseItems/InventoryComponent.h create mode 100644 Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp create mode 100644 Source/the_twilight_abyss/BaseItems/Items/BaseItem.h diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 5e6ba54..433a8e5 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b452da02d420447c486ed947537ab3030dddf2942de6533b784f7ec131498696 -size 23264 +oid sha256:659d40d87576c276667484be63bcb818039f4f8ac40525cdcea92c90eee7aaec +size 23245 diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp new file mode 100644 index 0000000..d3e0cb0 --- /dev/null +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp @@ -0,0 +1,36 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "InventoryComponent.h" + + +// Sets default values for this component's properties +UInventoryComponent::UInventoryComponent() +{ + // Set this component to be initialized when the game starts, and to be ticked every frame. You can turn these features + // off to improve performance if you don't need them. + PrimaryComponentTick.bCanEverTick = true; + + // ... +} + + +// Called when the game starts +void UInventoryComponent::BeginPlay() +{ + Super::BeginPlay(); + + // ... + +} + + +// Called every frame +void UInventoryComponent::TickComponent(float DeltaTime, ELevelTick TickType, + FActorComponentTickFunction* ThisTickFunction) +{ + Super::TickComponent(DeltaTime, TickType, ThisTickFunction); + + // ... +} + diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h new file mode 100644 index 0000000..e4fbe77 --- /dev/null +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h @@ -0,0 +1,27 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Components/ActorComponent.h" +#include "InventoryComponent.generated.h" + + +UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) +class THE_TWILIGHT_ABYSS_API UInventoryComponent : public UActorComponent +{ + GENERATED_BODY() + +public: + // Sets default values for this component's properties + UInventoryComponent(); + +protected: + // Called when the game starts + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void TickComponent(float DeltaTime, ELevelTick TickType, + FActorComponentTickFunction* ThisTickFunction) override; +}; diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp new file mode 100644 index 0000000..62ba79f --- /dev/null +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp @@ -0,0 +1,4 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "BaseItem.h" diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h new file mode 100644 index 0000000..74a4e45 --- /dev/null +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -0,0 +1,41 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "UObject/Object.h" +#include "BaseItem.generated.h" + +/** + * + */ +UCLASS(Abstract, BlueprintType, Blueprintable, EditInlineNew, DefaultToInstanced) +class THE_TWILIGHT_ABYSS_API UBaseItem : public UObject +{ + GENERATED_BODY() + +public: + //The text that will be displayed for using the item (Equip, Eat) + UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + FText ItemUseAction; + + //The actual mesh of the item + UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + class UStaticMesh* ItemMesh; + + //The picture of the item icon + UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + class UTexture2D* ItemIcon; + + //The name of the item + UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + FText ItemDisplayName; + + //The description of the item + UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + FText ItemDescription; + + //reference to the UInventoryComponent script + UPROPERTY() + class UInventoryComponent* StoredItems; +}; From 7699a088ae5d7805781aa7ea35d288013977147b Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 15:53:50 +0000 Subject: [PATCH 48/77] Added Jelly1 and ItemPurchaseComponent class Jelly1 is the test item i am creating and i also added a health variable for the temp character --- .../BaseItems/InventoryComponent.h | 6 +- .../BaseItems/Items/BaseItem.h | 12 +++ .../BaseItems/Items/Jelly1.cpp | 14 +++ .../BaseItems/Items/Jelly1.h | 21 +++++ .../ItemPurchaseComponent.cpp | 35 ++++++++ .../ItemPurchaseComponent.h | 26 ++++++ .../PlayerTemp/TempCharacter.cpp | 3 +- .../PlayerTemp/TempCharacter.cpp~ | 87 ------------------- .../PlayerTemp/TempCharacter.h | 3 + 9 files changed, 116 insertions(+), 91 deletions(-) create mode 100644 Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp create mode 100644 Source/the_twilight_abyss/BaseItems/Items/Jelly1.h create mode 100644 Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.cpp create mode 100644 Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.h delete mode 100644 Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp~ diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h index e4fbe77..bb4b7d1 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h @@ -22,6 +22,8 @@ protected: public: // Called every frame - virtual void TickComponent(float DeltaTime, ELevelTick TickType, - FActorComponentTickFunction* ThisTickFunction) override; + virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; + + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite) + int32 GoldBalance = 500; }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 74a4e45..6f29afe 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -35,7 +35,19 @@ public: UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") FText ItemDescription; + //The cost of the item + UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + int32 ItemCostPrice; + + //ADD A HEALING ITEM VALUE? + //reference to the UInventoryComponent script UPROPERTY() class UInventoryComponent* StoredItems; + + //The buy class to purchase the item + virtual void Buy(class UItemPurchaseComponent* PurchaseItem) PURE_VIRTUAL(UBaseItem); + + //The use Item class to use the item in the player Inventory + virtual void Use(class ATempCharacter* Character) PURE_VIRTUAL(UBaseItem); }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp b/Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp new file mode 100644 index 0000000..0e68019 --- /dev/null +++ b/Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp @@ -0,0 +1,14 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "Jelly1.h" + +void UJelly1::Buy(UItemPurchaseComponent* PurchaseItem) +{ + Super::Buy(PurchaseItem); +} + +void UJelly1::Use(ATempCharacter* Character) +{ + Super::Use(Character); +} diff --git a/Source/the_twilight_abyss/BaseItems/Items/Jelly1.h b/Source/the_twilight_abyss/BaseItems/Items/Jelly1.h new file mode 100644 index 0000000..42a56b1 --- /dev/null +++ b/Source/the_twilight_abyss/BaseItems/Items/Jelly1.h @@ -0,0 +1,21 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "BaseItem.h" +#include "Jelly1.generated.h" + +/** + * + */ +UCLASS() +class THE_TWILIGHT_ABYSS_API UJelly1 : public UBaseItem +{ + GENERATED_BODY() + +protected: + virtual void Buy(class UItemPurchaseComponent* PurchaseItem) override; + + virtual void Use(class ATempCharacter* Character) override; +}; diff --git a/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.cpp b/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.cpp new file mode 100644 index 0000000..0f06d98 --- /dev/null +++ b/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.cpp @@ -0,0 +1,35 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "ItemPurchaseComponent.h" + + +// Sets default values for this component's properties +UItemPurchaseComponent::UItemPurchaseComponent() +{ + // Set this component to be initialized when the game starts, and to be ticked every frame. You can turn these features + // off to improve performance if you don't need them. + PrimaryComponentTick.bCanEverTick = true; + + // ... +} + + +// Called when the game starts +void UItemPurchaseComponent::BeginPlay() +{ + Super::BeginPlay(); + + // ... + +} + + +// Called every frame +void UItemPurchaseComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) +{ + Super::TickComponent(DeltaTime, TickType, ThisTickFunction); + + // ... +} + diff --git a/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.h b/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.h new file mode 100644 index 0000000..9b7bb90 --- /dev/null +++ b/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.h @@ -0,0 +1,26 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Components/ActorComponent.h" +#include "ItemPurchaseComponent.generated.h" + + +UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) +class THE_TWILIGHT_ABYSS_API UItemPurchaseComponent : public UActorComponent +{ + GENERATED_BODY() + +public: + // Sets default values for this component's properties + UItemPurchaseComponent(); + +protected: + // Called when the game starts + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; +}; diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 83bf10b..2b4919e 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -20,7 +20,7 @@ ATempCharacter::ATempCharacter() void ATempCharacter::BeginPlay() { Super::BeginPlay(); - + Health = 100; } //Binds the input we made in the setup player component to the forward vector @@ -28,7 +28,6 @@ void ATempCharacter::ForwardInput(float Axis) { AddMovementInput(GetActorForwardVector() * Axis); } - //Binds the input we made in the setup player component to the right vector void ATempCharacter::RightMoveInput(float Axis) { diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp~ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp~ deleted file mode 100644 index 83bf10b..0000000 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp~ +++ /dev/null @@ -1,87 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#include "TempCharacter.h" -#include "UObject/SoftObjectPath.h" -#include "Dialogs/Dialogs.h" -#include "Engine/GameViewportClient.h" -#include "Blueprint/UserWidget.h" -#include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" -#include "the_twilight_abyss/MerchantInteraction/Interaction.h" - - -// CONSTRUCTOR -ATempCharacter::ATempCharacter() -{ - // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. - PrimaryActorTick.bCanEverTick = true; -} - -// Called when the game starts or when spawned -void ATempCharacter::BeginPlay() -{ - Super::BeginPlay(); - -} - -//Binds the input we made in the setup player component to the forward vector -void ATempCharacter::ForwardInput(float Axis) -{ - AddMovementInput(GetActorForwardVector() * Axis); -} - -//Binds the input we made in the setup player component to the right vector -void ATempCharacter::RightMoveInput(float Axis) -{ - AddMovementInput(GetActorRightVector() * Axis); -} - - -// Called every frame -void ATempCharacter::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); -} - -// Called to bind functionality to input -void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) -{ - Super::SetupPlayerInputComponent(PlayerInputComponent); - PlayerInputComponent->BindAxis(TEXT("Move Forward / Backward"), this, &ATempCharacter::ForwardInput); - PlayerInputComponent->BindAxis(TEXT("Move Right / Left"), this, &ATempCharacter::RightMoveInput); - PlayerInputComponent->BindAxis(TEXT("Turn Right / Left Mouse"), this, &ATempCharacter::AddControllerYawInput); - PlayerInputComponent->BindAxis(TEXT("Look Up / Down Mouse"), this, &ATempCharacter::AddControllerPitchInput); - PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); - // custom keybind Interact -} - -void ATempCharacter::KeyPressed() -{ - LineTraceLogic(); -} - -void ATempCharacter::LineTraceLogic() -{ - float GlobalTrace = TraceDistance; - FHitResult OutHit; - FVector Start = GetActorLocation(); - FVector End = Start + GlobalTrace * GetActorForwardVector(); - - FCollisionQueryParams TraceParams; - - TraceParams.AddIgnoredActor(this); - - bool bHit = GetWorld()->LineTraceSingleByChannel(OutHit, Start, End, ECC_Visibility, TraceParams); - if (bHit) - { - if(OutHit.GetActor() == nullptr) - { - return; - } - if (AInteraction* MyInteractable = Cast(OutHit.GetActor())) - { - DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 1.0f); - MyInteractable->OnInteract(); - UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); - } - } -} diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 3f170b4..fd5924c 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -35,4 +35,7 @@ public: float TraceDistance = 200; void LineTraceLogic(); + + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category= "Health") + float Health; }; From 8f0a770bfb0705d7bcbdd6928fb4c3faba611746 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 16:52:04 +0000 Subject: [PATCH 49/77] Removed ItemPurchaseComponent script Removed the script as I am not using it for now and solely sticking to creating the inventory system and items currently. --- .../ItemPurchaseComponent.cpp | 35 ------------------- .../ItemPurchaseComponent.h | 26 -------------- 2 files changed, 61 deletions(-) delete mode 100644 Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.cpp delete mode 100644 Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.h diff --git a/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.cpp b/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.cpp deleted file mode 100644 index 0f06d98..0000000 --- a/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "ItemPurchaseComponent.h" - - -// Sets default values for this component's properties -UItemPurchaseComponent::UItemPurchaseComponent() -{ - // Set this component to be initialized when the game starts, and to be ticked every frame. You can turn these features - // off to improve performance if you don't need them. - PrimaryComponentTick.bCanEverTick = true; - - // ... -} - - -// Called when the game starts -void UItemPurchaseComponent::BeginPlay() -{ - Super::BeginPlay(); - - // ... - -} - - -// Called every frame -void UItemPurchaseComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) -{ - Super::TickComponent(DeltaTime, TickType, ThisTickFunction); - - // ... -} - diff --git a/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.h b/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.h deleted file mode 100644 index 9b7bb90..0000000 --- a/Source/the_twilight_abyss/MerchantInteraction/ItemPurchaseComponent.h +++ /dev/null @@ -1,26 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "Components/ActorComponent.h" -#include "ItemPurchaseComponent.generated.h" - - -UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) -class THE_TWILIGHT_ABYSS_API UItemPurchaseComponent : public UActorComponent -{ - GENERATED_BODY() - -public: - // Sets default values for this component's properties - UItemPurchaseComponent(); - -protected: - // Called when the game starts - virtual void BeginPlay() override; - -public: - // Called every frame - virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; -}; From 83d4d16588d65d3e97a3335b8c158b53782398d3 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 16:52:57 +0000 Subject: [PATCH 50/77] Updated BaseItem,Jelly1,Inventory Component,Temp Updated all the scripts adding more functionality, Currently just added a very basic Use item and it giving the character health. --- .../BaseItems/InventoryComponent.cpp | 3 +-- .../BaseItems/InventoryComponent.h | 3 --- .../BaseItems/Items/BaseItem.cpp | 7 +++++++ .../the_twilight_abyss/BaseItems/Items/BaseItem.h | 8 +++++++- .../the_twilight_abyss/BaseItems/Items/Jelly1.cpp | 11 ++++++----- .../the_twilight_abyss/BaseItems/Items/Jelly1.h | 3 +-- .../PlayerTemp/TempCharacter.cpp | 15 +++++++++++++-- .../the_twilight_abyss/PlayerTemp/TempCharacter.h | 4 ++++ 8 files changed, 39 insertions(+), 15 deletions(-) diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp index d3e0cb0..007c15a 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp @@ -26,8 +26,7 @@ void UInventoryComponent::BeginPlay() // Called every frame -void UInventoryComponent::TickComponent(float DeltaTime, ELevelTick TickType, - FActorComponentTickFunction* ThisTickFunction) +void UInventoryComponent::TickComponent(float DeltaTime, ELevelTick TickType,FActorComponentTickFunction* ThisTickFunction) { Super::TickComponent(DeltaTime, TickType, ThisTickFunction); diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h index bb4b7d1..f9ab60e 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h @@ -23,7 +23,4 @@ protected: public: // Called every frame virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; - - UPROPERTY(EditDefaultsOnly, BlueprintReadWrite) - int32 GoldBalance = 500; }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp index 62ba79f..1fd0d31 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp @@ -2,3 +2,10 @@ #include "BaseItem.h" + +//constructor +UBaseItem::UBaseItem() +{ + ItemDisplayName = FText::FromString("ItemName"); + ItemUseAction = FText::FromString("UseAction"); +} diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 6f29afe..0c308a5 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -15,6 +15,8 @@ class THE_TWILIGHT_ABYSS_API UBaseItem : public UObject GENERATED_BODY() public: + + UBaseItem(); //The text that will be displayed for using the item (Equip, Eat) UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") FText ItemUseAction; @@ -46,8 +48,12 @@ public: class UInventoryComponent* StoredItems; //The buy class to purchase the item - virtual void Buy(class UItemPurchaseComponent* PurchaseItem) PURE_VIRTUAL(UBaseItem); + virtual void Buy(class UItemPurchaseComponent* PurchaseItem) PURE_VIRTUAL(UBaseItem); // WILL SET THIS UP LATER //The use Item class to use the item in the player Inventory virtual void Use(class ATempCharacter* Character) PURE_VIRTUAL(UBaseItem); + + //This is the same as the use item class but its in BP instead + UFUNCTION(BlueprintImplementableEvent) + void OnUse (class ATempCharacter* Character); }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp b/Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp index 0e68019..b5d5506 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp @@ -3,12 +3,13 @@ #include "Jelly1.h" -void UJelly1::Buy(UItemPurchaseComponent* PurchaseItem) -{ - Super::Buy(PurchaseItem); -} +#include "the_twilight_abyss/PlayerTemp/TempCharacter.h" + void UJelly1::Use(ATempCharacter* Character) { - Super::Use(Character); + if(Character) + { + Character->Health += 10; + } } diff --git a/Source/the_twilight_abyss/BaseItems/Items/Jelly1.h b/Source/the_twilight_abyss/BaseItems/Items/Jelly1.h index 42a56b1..3b6c55f 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/Jelly1.h +++ b/Source/the_twilight_abyss/BaseItems/Items/Jelly1.h @@ -15,7 +15,6 @@ class THE_TWILIGHT_ABYSS_API UJelly1 : public UBaseItem GENERATED_BODY() protected: - virtual void Buy(class UItemPurchaseComponent* PurchaseItem) override; - + virtual void Use(class ATempCharacter* Character) override; }; diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 2b4919e..6e204db 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -6,6 +6,7 @@ #include "Engine/GameViewportClient.h" #include "Blueprint/UserWidget.h" #include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" +#include "the_twilight_abyss/BaseItems/Items/BaseItem.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" @@ -41,7 +42,7 @@ void ATempCharacter::Tick(float DeltaTime) Super::Tick(DeltaTime); } -// Called to bind functionality to input +// Gives the character the functionality void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) { Super::SetupPlayerInputComponent(PlayerInputComponent); @@ -50,14 +51,15 @@ void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo PlayerInputComponent->BindAxis(TEXT("Turn Right / Left Mouse"), this, &ATempCharacter::AddControllerYawInput); PlayerInputComponent->BindAxis(TEXT("Look Up / Down Mouse"), this, &ATempCharacter::AddControllerPitchInput); PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); - // custom keybind Interact } +// When the player presses the E key void ATempCharacter::KeyPressed() { LineTraceLogic(); } +// Line trace logic void ATempCharacter::LineTraceLogic() { float GlobalTrace = TraceDistance; @@ -84,3 +86,12 @@ void ATempCharacter::LineTraceLogic() } } } + +void ATempCharacter::UseItem(class UBaseItem* Item) +{ + if(Item) + { + Item->Use(this); + Item->OnUse(this); //Blueprint Version + } +} diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index fd5924c..11da9ba 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -38,4 +38,8 @@ public: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category= "Health") float Health; + + //Using the item in the inventory + UFUNCTION(BlueprintCallable, Category= "Items") + void UseItem(class UBaseItem* Item); }; From 785974e1697404a7180b8d441355e0264f0ed389 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 16:58:20 +0000 Subject: [PATCH 51/77] Updated TempCharacter Commented the headerFile for tempcharacter.h --- Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 11da9ba..7cafb29 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -11,6 +11,10 @@ class THE_TWILIGHT_ABYSS_API ATempCharacter : public ACharacter { GENERATED_BODY() + //Player inventory + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = "true")) + class UInventoryComponent* Inventory; //Using the InventoryComponent class + public: // Sets default values for this character's properties ATempCharacter(); @@ -41,5 +45,5 @@ public: //Using the item in the inventory UFUNCTION(BlueprintCallable, Category= "Items") - void UseItem(class UBaseItem* Item); + void UseItem(class UBaseItem* Item); // Overriding the BaseItem Class }; From a40aa57f70243e13c2e5d7346aee9f3beadc2001 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 17:42:26 +0000 Subject: [PATCH 52/77] Added all BP Items in the game and updated scripts All Items are added in BP with the values they are meant to have. Starting to now actually implement them into the inventory UI and creating the Inventory UI --- .../Blueprints/Items/BP_HealingSyringe.uasset | 3 ++ Content/Blueprints/Items/BP_Jelly1.uasset | 3 ++ Content/Blueprints/Items/BP_Jelly2.uasset | 3 ++ Content/Blueprints/Items/BP_Jelly3.uasset | 3 ++ .../BaseItems/InventoryComponent.cpp | 42 +++++++++++++++---- .../BaseItems/InventoryComponent.h | 19 ++++++++- .../BaseItems/Items/BaseItem.h | 26 +++++++----- .../Items/{Jelly1.cpp => EatableItems.cpp} | 4 +- .../Items/{Jelly1.h => EatableItems.h} | 4 +- .../PlayerTemp/TempCharacter.cpp | 6 +-- 10 files changed, 86 insertions(+), 27 deletions(-) create mode 100644 Content/Blueprints/Items/BP_HealingSyringe.uasset create mode 100644 Content/Blueprints/Items/BP_Jelly1.uasset create mode 100644 Content/Blueprints/Items/BP_Jelly2.uasset create mode 100644 Content/Blueprints/Items/BP_Jelly3.uasset rename Source/the_twilight_abyss/BaseItems/Items/{Jelly1.cpp => EatableItems.cpp} (71%) rename Source/the_twilight_abyss/BaseItems/Items/{Jelly1.h => EatableItems.h} (72%) diff --git a/Content/Blueprints/Items/BP_HealingSyringe.uasset b/Content/Blueprints/Items/BP_HealingSyringe.uasset new file mode 100644 index 0000000..95e16d9 --- /dev/null +++ b/Content/Blueprints/Items/BP_HealingSyringe.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e387511b72d482c0cef5dcaf48822ceba438b4bd0cc13ff7410220ca992f15c +size 6030 diff --git a/Content/Blueprints/Items/BP_Jelly1.uasset b/Content/Blueprints/Items/BP_Jelly1.uasset new file mode 100644 index 0000000..e947689 --- /dev/null +++ b/Content/Blueprints/Items/BP_Jelly1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d8d52b9430b52830e8488a07bdc388bb5a602828a0b898e727c18aeb583fffb +size 5894 diff --git a/Content/Blueprints/Items/BP_Jelly2.uasset b/Content/Blueprints/Items/BP_Jelly2.uasset new file mode 100644 index 0000000..bd7ba3a --- /dev/null +++ b/Content/Blueprints/Items/BP_Jelly2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:302db81a27f3921406ca175911dd01315a52040b80af2d5515e150f169383463 +size 5894 diff --git a/Content/Blueprints/Items/BP_Jelly3.uasset b/Content/Blueprints/Items/BP_Jelly3.uasset new file mode 100644 index 0000000..9941cf8 --- /dev/null +++ b/Content/Blueprints/Items/BP_Jelly3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b443f673bb208fa1d7dd5a10319aaf03d7173f4232adda4d9e692895c6c6ade +size 5894 diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp index 007c15a..30d29bd 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp @@ -2,6 +2,9 @@ #include "InventoryComponent.h" +#include "Items/BaseItem.h" + + // Sets default values for this component's properties @@ -11,7 +14,7 @@ UInventoryComponent::UInventoryComponent() // off to improve performance if you don't need them. PrimaryComponentTick.bCanEverTick = true; - // ... + MaxItemSlots = 10; } @@ -20,16 +23,39 @@ void UInventoryComponent::BeginPlay() { Super::BeginPlay(); - // ... - + for(auto & BaseItem : DefaultItems) + { + AddItem(BaseItem); + } } - -// Called every frame -void UInventoryComponent::TickComponent(float DeltaTime, ELevelTick TickType,FActorComponentTickFunction* ThisTickFunction) +bool UInventoryComponent::AddItem(class UBaseItem* BaseItem) { - Super::TickComponent(DeltaTime, TickType, ThisTickFunction); + //if the items is over the maxinventoryslots then it wont add the item + if (Items.Num() >= MaxItemSlots || !BaseItem) + { + return false; + } + BaseItem->StoredItems = this; + BaseItem->World = GetWorld(); + Items.Add(BaseItem); + + //Update UI + OnInventoryUpdated.Broadcast(); - // ... + return true; +} + +bool UInventoryComponent::Remove(UBaseItem* BaseItem) +{ + if(BaseItem) + { + BaseItem->StoredItems = nullptr; + BaseItem->World = nullptr; + Items.RemoveSingle(BaseItem); + OnInventoryUpdated.Broadcast(); // Updates UI + return true; + } + return false; } diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h index f9ab60e..d2fbb5a 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.h +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.h @@ -6,6 +6,8 @@ #include "Components/ActorComponent.h" #include "InventoryComponent.generated.h" +//OUR DELEGATE IS CALLED FONINVENTORYUPDATED +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnInventoryUpdated); UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) class THE_TWILIGHT_ABYSS_API UInventoryComponent : public UActorComponent @@ -21,6 +23,19 @@ protected: virtual void BeginPlay() override; public: - // Called every frame - virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; + bool AddItem(class UBaseItem* BaseItem); //adds the item to the player + + bool Remove(class UBaseItem* BaseItem); //removes the item from the player + + UPROPERTY(EditDefaultsOnly, Instanced) + TArray DefaultItems; //Items you start the game with IF YOU WANT YOU CAN JUST NOT USE THIS + + UPROPERTY(EditDefaultsOnly, Category= "Inventory") + int32 MaxItemSlots; + + UPROPERTY(BlueprintAssignable, Category= "Inventory") + FOnInventoryUpdated OnInventoryUpdated; //This is our delegate + + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category= "Items") + TArray Items; // The items currently in the inventory }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 0c308a5..639bc1b 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -6,6 +6,7 @@ #include "UObject/Object.h" #include "BaseItem.generated.h" + /** * */ @@ -15,45 +16,50 @@ class THE_TWILIGHT_ABYSS_API UBaseItem : public UObject GENERATED_BODY() public: - UBaseItem(); + + virtual class UWorld* GetWorld() const { return World; }; + + UPROPERTY(Transient) + class UWorld* World; + //The text that will be displayed for using the item (Equip, Eat) - UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") FText ItemUseAction; //The actual mesh of the item - UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") class UStaticMesh* ItemMesh; //The picture of the item icon - UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") class UTexture2D* ItemIcon; //The name of the item - UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") FText ItemDisplayName; //The description of the item - UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") FText ItemDescription; //The cost of the item - UPROPERTY(EditDefaultsOnly,BlueprintReadWrite, Category = "Item") + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") int32 ItemCostPrice; //ADD A HEALING ITEM VALUE? - + //reference to the UInventoryComponent script UPROPERTY() class UInventoryComponent* StoredItems; //The buy class to purchase the item - virtual void Buy(class UItemPurchaseComponent* PurchaseItem) PURE_VIRTUAL(UBaseItem); // WILL SET THIS UP LATER + virtual void Buy(class UItemPurchaseComponent* PurchaseItem) PURE_VIRTUAL(UBaseItem); // WILL SET THIS UP LATER //The use Item class to use the item in the player Inventory virtual void Use(class ATempCharacter* Character) PURE_VIRTUAL(UBaseItem); //This is the same as the use item class but its in BP instead UFUNCTION(BlueprintImplementableEvent) - void OnUse (class ATempCharacter* Character); + void OnUse(class ATempCharacter* Character); }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp similarity index 71% rename from Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp rename to Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index b5d5506..63956df 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/Jelly1.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -1,12 +1,12 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "Jelly1.h" +#include "EatableItems.h" #include "the_twilight_abyss/PlayerTemp/TempCharacter.h" -void UJelly1::Use(ATempCharacter* Character) +void UEatableItems::Use(ATempCharacter* Character) { if(Character) { diff --git a/Source/the_twilight_abyss/BaseItems/Items/Jelly1.h b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h similarity index 72% rename from Source/the_twilight_abyss/BaseItems/Items/Jelly1.h rename to Source/the_twilight_abyss/BaseItems/Items/EatableItems.h index 3b6c55f..127041f 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/Jelly1.h +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h @@ -4,13 +4,13 @@ #include "CoreMinimal.h" #include "BaseItem.h" -#include "Jelly1.generated.h" +#include "EatableItems.generated.h" /** * */ UCLASS() -class THE_TWILIGHT_ABYSS_API UJelly1 : public UBaseItem +class THE_TWILIGHT_ABYSS_API UEatableItems : public UBaseItem { GENERATED_BODY() diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 6e204db..092c3e6 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -1,11 +1,9 @@ // Fill out your copyright notice in the Description page of Project Settings. #include "TempCharacter.h" -#include "UObject/SoftObjectPath.h" -#include "Dialogs/Dialogs.h" -#include "Engine/GameViewportClient.h" #include "Blueprint/UserWidget.h" #include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" +#include "the_twilight_abyss/BaseItems/InventoryComponent.h" #include "the_twilight_abyss/BaseItems/Items/BaseItem.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" @@ -15,6 +13,8 @@ ATempCharacter::ATempCharacter() { // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; + Inventory = CreateDefaultSubobject("Inventory"); + Inventory->MaxItemSlots = 10; } // Called when the game starts or when spawned From 83da7265d598cbaf8f4fb68c83ea11278a897249 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 19:22:50 +0000 Subject: [PATCH 53/77] Added HealingJelly Item, Added PlayerInventory Added healing jelly item blueprint and started working on the playerinventory UI --- Content/Blueprints/Items/BP_HealingJelly.uasset | 3 +++ Content/Blueprints/Items/BP_HealingSyringe.uasset | 3 --- Content/Blueprints/Items/BP_Jelly1.uasset | 3 --- Content/Blueprints/Items/BP_Jelly2.uasset | 3 --- Content/Blueprints/Items/BP_Jelly3.uasset | 3 --- Content/Blueprints/WBP_PlayerInventory.uasset | 3 +++ Source/the_twilight_abyss/BaseItems/Items/BaseItem.h | 2 +- 7 files changed, 7 insertions(+), 13 deletions(-) create mode 100644 Content/Blueprints/Items/BP_HealingJelly.uasset delete mode 100644 Content/Blueprints/Items/BP_HealingSyringe.uasset delete mode 100644 Content/Blueprints/Items/BP_Jelly1.uasset delete mode 100644 Content/Blueprints/Items/BP_Jelly2.uasset delete mode 100644 Content/Blueprints/Items/BP_Jelly3.uasset create mode 100644 Content/Blueprints/WBP_PlayerInventory.uasset diff --git a/Content/Blueprints/Items/BP_HealingJelly.uasset b/Content/Blueprints/Items/BP_HealingJelly.uasset new file mode 100644 index 0000000..65677e7 --- /dev/null +++ b/Content/Blueprints/Items/BP_HealingJelly.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79844600695e0e7790cb68584c0c58f21af18a8872904ccd645f1ec3108da22d +size 6681 diff --git a/Content/Blueprints/Items/BP_HealingSyringe.uasset b/Content/Blueprints/Items/BP_HealingSyringe.uasset deleted file mode 100644 index 95e16d9..0000000 --- a/Content/Blueprints/Items/BP_HealingSyringe.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e387511b72d482c0cef5dcaf48822ceba438b4bd0cc13ff7410220ca992f15c -size 6030 diff --git a/Content/Blueprints/Items/BP_Jelly1.uasset b/Content/Blueprints/Items/BP_Jelly1.uasset deleted file mode 100644 index e947689..0000000 --- a/Content/Blueprints/Items/BP_Jelly1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d8d52b9430b52830e8488a07bdc388bb5a602828a0b898e727c18aeb583fffb -size 5894 diff --git a/Content/Blueprints/Items/BP_Jelly2.uasset b/Content/Blueprints/Items/BP_Jelly2.uasset deleted file mode 100644 index bd7ba3a..0000000 --- a/Content/Blueprints/Items/BP_Jelly2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:302db81a27f3921406ca175911dd01315a52040b80af2d5515e150f169383463 -size 5894 diff --git a/Content/Blueprints/Items/BP_Jelly3.uasset b/Content/Blueprints/Items/BP_Jelly3.uasset deleted file mode 100644 index 9941cf8..0000000 --- a/Content/Blueprints/Items/BP_Jelly3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b443f673bb208fa1d7dd5a10319aaf03d7173f4232adda4d9e692895c6c6ade -size 5894 diff --git a/Content/Blueprints/WBP_PlayerInventory.uasset b/Content/Blueprints/WBP_PlayerInventory.uasset new file mode 100644 index 0000000..d344783 --- /dev/null +++ b/Content/Blueprints/WBP_PlayerInventory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78538ab814d72cd06a99884f5656b4a37cd55ddb9116484f8301be5038323a9e +size 18699 diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 639bc1b..2782c63 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -58,7 +58,7 @@ public: //The use Item class to use the item in the player Inventory virtual void Use(class ATempCharacter* Character) PURE_VIRTUAL(UBaseItem); - + //This is the same as the use item class but its in BP instead UFUNCTION(BlueprintImplementableEvent) void OnUse(class ATempCharacter* Character); From 5ebf6a3431d7ac7b6a8ebc95e3b530808b3593be Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 19:47:17 +0000 Subject: [PATCH 54/77] Updated PlayerInventory->ItemDisplay Added a placeholder jelly image to the first item and finished blueprinting and creating the itemdisplay --- Content/Blueprints/WBP_ItemDisplay.uasset | 3 +++ Content/Blueprints/WBP_PlayerInventory.uasset | 3 --- Content/Images/testimage.uasset | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 Content/Blueprints/WBP_ItemDisplay.uasset delete mode 100644 Content/Blueprints/WBP_PlayerInventory.uasset create mode 100644 Content/Images/testimage.uasset diff --git a/Content/Blueprints/WBP_ItemDisplay.uasset b/Content/Blueprints/WBP_ItemDisplay.uasset new file mode 100644 index 0000000..afb5151 --- /dev/null +++ b/Content/Blueprints/WBP_ItemDisplay.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c70ffaf4738412537996db61c6620a7f49e7fe9c07108cff72ab3738fdfe5c78 +size 80902 diff --git a/Content/Blueprints/WBP_PlayerInventory.uasset b/Content/Blueprints/WBP_PlayerInventory.uasset deleted file mode 100644 index d344783..0000000 --- a/Content/Blueprints/WBP_PlayerInventory.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78538ab814d72cd06a99884f5656b4a37cd55ddb9116484f8301be5038323a9e -size 18699 diff --git a/Content/Images/testimage.uasset b/Content/Images/testimage.uasset new file mode 100644 index 0000000..8691ea4 --- /dev/null +++ b/Content/Images/testimage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:727645288d26ba910415d48a76aef277d0ba0840e5d5f859b58e11f0eaecbe0a +size 45103 From fe75a8c3881b188ce06b016bad5d6539e4f5844e Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 19:50:57 +0000 Subject: [PATCH 55/77] Created Inventory BP Created the Inventory UI --- Content/Blueprints/WBP_PlayerInventory.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Blueprints/WBP_PlayerInventory.uasset diff --git a/Content/Blueprints/WBP_PlayerInventory.uasset b/Content/Blueprints/WBP_PlayerInventory.uasset new file mode 100644 index 0000000..ce2f4e0 --- /dev/null +++ b/Content/Blueprints/WBP_PlayerInventory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47660a75d7b9806d0475c43f31f887d9f7266604ce09614b958b452fadbcd6f3 +size 29178 From 7a8dead59b1fbb2c45f1b9258a109e6213e53473 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 20:28:34 +0000 Subject: [PATCH 56/77] Added Default Item to test Added a default item to the inventory BP. --- Content/Blueprints/BP_MyTempCharacter.uasset | 4 ++-- Content/Blueprints/WBP_ItemDisplay.uasset | 4 ++-- Content/Blueprints/WBP_PlayerInventory.uasset | 4 ++-- Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp | 5 +++++ Source/the_twilight_abyss/BaseItems/Items/BaseItem.h | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Content/Blueprints/BP_MyTempCharacter.uasset b/Content/Blueprints/BP_MyTempCharacter.uasset index 0594c08..7085e97 100644 --- a/Content/Blueprints/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ab40229553278ecf914c2fb5a78609d1bff1d3c451797bf175ecf6a8948d3d5 -size 29619 +oid sha256:17cdf7f4c862e174899a1ef838d3e587abbb616a4e7d668ec440a0bfd0c250da +size 67817 diff --git a/Content/Blueprints/WBP_ItemDisplay.uasset b/Content/Blueprints/WBP_ItemDisplay.uasset index afb5151..aa0672a 100644 --- a/Content/Blueprints/WBP_ItemDisplay.uasset +++ b/Content/Blueprints/WBP_ItemDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c70ffaf4738412537996db61c6620a7f49e7fe9c07108cff72ab3738fdfe5c78 -size 80902 +oid sha256:394e6fd5c273948655cad58ad595dff0a3b24abc9279bfc1096997186314c7b8 +size 81622 diff --git a/Content/Blueprints/WBP_PlayerInventory.uasset b/Content/Blueprints/WBP_PlayerInventory.uasset index ce2f4e0..9d031ad 100644 --- a/Content/Blueprints/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47660a75d7b9806d0475c43f31f887d9f7266604ce09614b958b452fadbcd6f3 -size 29178 +oid sha256:d596c831e4baffe954feea4961e34e18072e026f907adbe7824d32d2db4e2e4a +size 89851 diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp index 1fd0d31..2fac2d1 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp @@ -9,3 +9,8 @@ UBaseItem::UBaseItem() ItemDisplayName = FText::FromString("ItemName"); ItemUseAction = FText::FromString("UseAction"); } + +void UBaseItem::Use(ATempCharacter* Character) +{ + +} diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 2782c63..47cdbcc 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -57,7 +57,7 @@ public: virtual void Buy(class UItemPurchaseComponent* PurchaseItem) PURE_VIRTUAL(UBaseItem); // WILL SET THIS UP LATER //The use Item class to use the item in the player Inventory - virtual void Use(class ATempCharacter* Character) PURE_VIRTUAL(UBaseItem); + virtual void Use(class ATempCharacter* Character); //This is the same as the use item class but its in BP instead UFUNCTION(BlueprintImplementableEvent) From f2857b3c5753af99f37be045c8a47ad3de503c4f Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 22:30:31 +0000 Subject: [PATCH 57/77] Updated Combat_UI for Battle Log --- Content/Blueprints/Combat_UI/Combat_UI.uasset | 4 +- .../TurnBasedCombat/TurnBaseCombat.cpp | 30 ++++++++++--- .../TurnBasedCombat/TurnBaseCombat.h | 43 +++++++++++-------- 3 files changed, 50 insertions(+), 27 deletions(-) diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index 8fd5f83..dc662dd 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57b261a7e611e3f659bd4a352777078d8e90725ab27e2b752545b9527bb7721f -size 45704 +oid sha256:d3d012afceb64edab767928d52e91c205b6377f99bf29b12bc25008919dd56a5 +size 48587 diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index fd5c08d..c89d182 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -32,14 +32,15 @@ void ATurnBaseCombat::BeginPlay() if (PC) { - PC->bShowMouseCursor = true; - PC->bEnableClickEvents = true; + PC->bShowMouseCursor = true; + PC->bEnableClickEvents = true; PC->bEnableMouseOverEvents = true; } TurnIndicatorTextBlock = Cast(HUD->GetWidgetFromName("TurnIndicator")); CurrentComboTextBlock = Cast(HUD->GetWidgetFromName("CurrentCombo")); ActionPointsTextBlock = Cast(HUD->GetWidgetFromName("ActionPoints")); + BattleLogTextBlock = Cast(HUD->GetWidgetFromName("BattleLog")); PlayerHealthBar = Cast(HUD->GetWidgetFromName("PlayerHealthBar")); EnemyHealthBar = Cast(HUD->GetWidgetFromName("EnemyHealthBar")); CastButton = Cast(HUD->GetWidgetFromName("CastButton")); @@ -107,12 +108,14 @@ void ATurnBaseCombat::DamagePlayer(int Damage) { PlayerHealth -= FMath::Clamp(Damage, 0, 100); UpdateProgressBars(); + AddBattleLogMessage("Player was damaged for " + FString::FromInt(Damage) + " damage."); } void ATurnBaseCombat::DamageEnemy(int Damage) { EnemyHealth -= FMath::Clamp(Damage, 0, 100); UpdateProgressBars(); + AddBattleLogMessage("Enemy was damaged for " + FString::FromInt(Damage) + " damage."); } void ATurnBaseCombat::UpdateProgressBars() const @@ -189,8 +192,23 @@ void ATurnBaseCombat::UpdateActionPoints() const void ATurnBaseCombat::AddBattleLogMessage(FString Message) { - FString* tempTextBlock; - BattleLog.Enqueue(Message); - tempTextBlock = BattleLog.Peek(); - + BattleLog.Append(Message + "\n"); + UpdateBattleLog(); +} + +void ATurnBaseCombat::ClearBattleLog() +{ + BattleLog = ""; +} + +void ATurnBaseCombat::UpdateBattleLog() +{ + TArray tempArray; + //Get the amount of lines in the battle log + int32 LineCount = BattleLog.ParseIntoArray(tempArray, TEXT("\n"), true); + if (LineCount > 10) //If there are more than 10 lines + { + ClearBattleLog(); + } + BattleLogTextBlock->SetText(FText::FromString(BattleLog)); } diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index b511f8b..996a03f 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -48,7 +48,7 @@ public: {"FW", 20} }; - TQueue BattleLog; + FString BattleLog; protected: virtual void BeginPlay() override; @@ -62,56 +62,61 @@ protected: private: bool IsValidCombo(FString Combo) const; - + UPROPERTY(VisibleAnywhere) bool bIsPlayerTurn = true; - + UPROPERTY(VisibleAnywhere) FString CurrentComboString = ""; - + void SwitchTurn(); - + UPROPERTY(VisibleAnywhere) UTextBlock* TurnIndicatorTextBlock; - + UPROPERTY(VisibleAnywhere) UTextBlock* CurrentComboTextBlock; - + + UPROPERTY(VisibleAnywhere) + UTextBlock* BattleLogTextBlock; + UPROPERTY(VisibleAnywhere) UTextBlock* ActionPointsTextBlock; - + UPROPERTY(VisibleAnywhere) UProgressBar* PlayerHealthBar; - + UPROPERTY(VisibleAnywhere) UProgressBar* EnemyHealthBar; - + UPROPERTY(VisibleAnywhere) UButton* CastButton; - + UPROPERTY(VisibleAnywhere) UButton* FButton; - + UPROPERTY(VisibleAnywhere) UButton* WButton; - + UPROPERTY(VisibleAnywhere) UButton* BackspaceButton; - + UFUNCTION() void CastButtonOnClick(); - + UFUNCTION() void FButtonOnClick(); - + UFUNCTION() void WButtonOnClick(); - + UFUNCTION() void BackspaceButtonOnClick(); - + void UpdateComboString(FString NewCombo) const; void UpdateActionPoints() const; void AddBattleLogMessage(FString Message); -}; \ No newline at end of file + void ClearBattleLog(); + void UpdateBattleLog(); +}; From 593badeca937b2a6b6f193e11ef1332a475751ee Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 22:40:09 +0000 Subject: [PATCH 58/77] Updated AllInventory BP's Updated all the blueprints --- Content/Blueprints/BP_MyTempCharacter.uasset | 4 ++-- Content/Blueprints/WBP_ItemDisplay.uasset | 4 ++-- Content/Blueprints/WBP_PlayerInventory.uasset | 4 ++-- Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp | 1 + Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 1 - 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Content/Blueprints/BP_MyTempCharacter.uasset b/Content/Blueprints/BP_MyTempCharacter.uasset index 7085e97..ed9200f 100644 --- a/Content/Blueprints/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17cdf7f4c862e174899a1ef838d3e587abbb616a4e7d668ec440a0bfd0c250da -size 67817 +oid sha256:83b78bc2c32ead48fb4b3986da18675ab1673013673104c5232b504978a0c1ad +size 68346 diff --git a/Content/Blueprints/WBP_ItemDisplay.uasset b/Content/Blueprints/WBP_ItemDisplay.uasset index aa0672a..748f45b 100644 --- a/Content/Blueprints/WBP_ItemDisplay.uasset +++ b/Content/Blueprints/WBP_ItemDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:394e6fd5c273948655cad58ad595dff0a3b24abc9279bfc1096997186314c7b8 -size 81622 +oid sha256:b3326b738a1a849cc33276c0a9c12c545dee4510e510848526cc225f939996d5 +size 81310 diff --git a/Content/Blueprints/WBP_PlayerInventory.uasset b/Content/Blueprints/WBP_PlayerInventory.uasset index 9d031ad..f05676b 100644 --- a/Content/Blueprints/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d596c831e4baffe954feea4961e34e18072e026f907adbe7824d32d2db4e2e4a -size 89851 +oid sha256:7df9350594b51cf2639b09ee43273d07e56f0328301b51d0c89b70c8edecf450 +size 90586 diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp index 30d29bd..8036177 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp @@ -36,6 +36,7 @@ bool UInventoryComponent::AddItem(class UBaseItem* BaseItem) { return false; } + BaseItem->StoredItems = this; BaseItem->World = GetWorld(); Items.Add(BaseItem); diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 092c3e6..d21da03 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -2,7 +2,6 @@ #include "TempCharacter.h" #include "Blueprint/UserWidget.h" -#include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" #include "the_twilight_abyss/BaseItems/InventoryComponent.h" #include "the_twilight_abyss/BaseItems/Items/BaseItem.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" From 7be90cc087da0c2cf6692ab044cc3d7a216fd999 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 22:40:22 +0000 Subject: [PATCH 59/77] Updated Combo List for New Combos --- Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index 996a03f..004a960 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -45,7 +45,9 @@ public: { {"F", 10}, {"W", 10}, - {"FW", 20} + {"WW", 15}, + {"FW", 20}, + {"FFW", 30} }; FString BattleLog; From 02c14525a549315a1081013525b5baa455bfc427 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 23:01:06 +0000 Subject: [PATCH 60/77] Added BungeeMan for Temp Enemy --- Content/Blueprints/Combat_UI/TestCombatCharacter.uasset | 3 +++ Content/Blueprints/Combat_UI/TestEnemy.uasset | 3 +++ Content/BungeeMan/CR_BungeeMan.uasset | 3 +++ Content/BungeeMan/LS_BungeeManCycle.uasset | 3 +++ Content/BungeeMan/LS_BungeeMan_Poses.uasset | 3 +++ Content/BungeeMan/Main.umap | 3 +++ Content/BungeeMan/Mat_BungeeMan_Body.uasset | 3 +++ Content/BungeeMan/Mat_BungeeMan_Rubber.uasset | 3 +++ Content/BungeeMan/SKM_BungeeMan.uasset | 3 +++ Content/BungeeMan/SK_BungeeMan.uasset | 3 +++ 10 files changed, 30 insertions(+) create mode 100644 Content/Blueprints/Combat_UI/TestCombatCharacter.uasset create mode 100644 Content/Blueprints/Combat_UI/TestEnemy.uasset create mode 100644 Content/BungeeMan/CR_BungeeMan.uasset create mode 100644 Content/BungeeMan/LS_BungeeManCycle.uasset create mode 100644 Content/BungeeMan/LS_BungeeMan_Poses.uasset create mode 100644 Content/BungeeMan/Main.umap create mode 100644 Content/BungeeMan/Mat_BungeeMan_Body.uasset create mode 100644 Content/BungeeMan/Mat_BungeeMan_Rubber.uasset create mode 100644 Content/BungeeMan/SKM_BungeeMan.uasset create mode 100644 Content/BungeeMan/SK_BungeeMan.uasset diff --git a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset new file mode 100644 index 0000000..1e6dd49 --- /dev/null +++ b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d33eddc532c7974415088d36a5f445c7177ce11de76e32d4d9908c656d9acd3f +size 66281 diff --git a/Content/Blueprints/Combat_UI/TestEnemy.uasset b/Content/Blueprints/Combat_UI/TestEnemy.uasset new file mode 100644 index 0000000..17e2669 --- /dev/null +++ b/Content/Blueprints/Combat_UI/TestEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:678d62c9403981ef1b6cdc3f0662097f25dc73ebe0873b2685ca13fd107d043b +size 33585 diff --git a/Content/BungeeMan/CR_BungeeMan.uasset b/Content/BungeeMan/CR_BungeeMan.uasset new file mode 100644 index 0000000..db83a3b --- /dev/null +++ b/Content/BungeeMan/CR_BungeeMan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93ac76db9451b3642a2784c9bf936c1f3900ca990b987bfea82a13bff00c3a5a +size 11666577 diff --git a/Content/BungeeMan/LS_BungeeManCycle.uasset b/Content/BungeeMan/LS_BungeeManCycle.uasset new file mode 100644 index 0000000..79f1b03 --- /dev/null +++ b/Content/BungeeMan/LS_BungeeManCycle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60bff95c1bdcc8588dfb8a9333fd5531e465968a0c007b134c95b1899ec27dd3 +size 168127 diff --git a/Content/BungeeMan/LS_BungeeMan_Poses.uasset b/Content/BungeeMan/LS_BungeeMan_Poses.uasset new file mode 100644 index 0000000..6ca9c58 --- /dev/null +++ b/Content/BungeeMan/LS_BungeeMan_Poses.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:980322fe6cfda3ce9f062dc5ffd47ea874cda58179897280c4c4b9012fca4815 +size 476726 diff --git a/Content/BungeeMan/Main.umap b/Content/BungeeMan/Main.umap new file mode 100644 index 0000000..64c4f2d --- /dev/null +++ b/Content/BungeeMan/Main.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b86611bf1dff9716001d330aefa68e97a92056692de08ca8852c07b628479947 +size 39330 diff --git a/Content/BungeeMan/Mat_BungeeMan_Body.uasset b/Content/BungeeMan/Mat_BungeeMan_Body.uasset new file mode 100644 index 0000000..8eed51e --- /dev/null +++ b/Content/BungeeMan/Mat_BungeeMan_Body.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a41cda36ea55d325e757f6f11eab9800009fb42cdfd8266db93ab0d72f17c49a +size 7494 diff --git a/Content/BungeeMan/Mat_BungeeMan_Rubber.uasset b/Content/BungeeMan/Mat_BungeeMan_Rubber.uasset new file mode 100644 index 0000000..d95d86c --- /dev/null +++ b/Content/BungeeMan/Mat_BungeeMan_Rubber.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:603e36c891890c2d263fbb621b4e95eacec250a0744a704fea5f3b1664ad542b +size 7502 diff --git a/Content/BungeeMan/SKM_BungeeMan.uasset b/Content/BungeeMan/SKM_BungeeMan.uasset new file mode 100644 index 0000000..a8dadc8 --- /dev/null +++ b/Content/BungeeMan/SKM_BungeeMan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f29bbe3ebc6bf1b93dc3aeb4ff6b45581f574bd3cc387485daf8a2e67f315f36 +size 3221902 diff --git a/Content/BungeeMan/SK_BungeeMan.uasset b/Content/BungeeMan/SK_BungeeMan.uasset new file mode 100644 index 0000000..5175a98 --- /dev/null +++ b/Content/BungeeMan/SK_BungeeMan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c0c76362f68a4093e228cd091e6ae23e61dfe3d2b79270f9e739fe76e238170 +size 48550 From c6e7dbca62f0815e62f28943a31aa449770666f0 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 23:05:35 +0000 Subject: [PATCH 61/77] Added Prototype Gun to Player Character --- Content/Blueprints/Combat_UI/Combat_Test.uasset | 4 ++-- Content/Blueprints/Combat_UI/Gun/Gun.uasset | 3 +++ Content/Blueprints/Combat_UI/Gun/GunProto.uasset | 3 +++ Content/Blueprints/Combat_UI/Gun/image__1_.uasset | 3 +++ Content/Blueprints/Combat_UI/TestCombatCharacter.uasset | 4 ++-- Content/Blueprints/Combat_UI/TestEnemy.uasset | 4 ++-- Content/Levels/CombatTest.umap | 4 ++-- 7 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 Content/Blueprints/Combat_UI/Gun/Gun.uasset create mode 100644 Content/Blueprints/Combat_UI/Gun/GunProto.uasset create mode 100644 Content/Blueprints/Combat_UI/Gun/image__1_.uasset diff --git a/Content/Blueprints/Combat_UI/Combat_Test.uasset b/Content/Blueprints/Combat_UI/Combat_Test.uasset index d4e8e8a..0bda715 100644 --- a/Content/Blueprints/Combat_UI/Combat_Test.uasset +++ b/Content/Blueprints/Combat_UI/Combat_Test.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6249b2c22fa16eb16e065443b9afb067829818495f428fbd4712205c0dde8a08 -size 19579 +oid sha256:c48f0350acc892517c4952a5d233ddf56b7a84589b5784526238c4bbd6e2d5b5 +size 19567 diff --git a/Content/Blueprints/Combat_UI/Gun/Gun.uasset b/Content/Blueprints/Combat_UI/Gun/Gun.uasset new file mode 100644 index 0000000..3862adc --- /dev/null +++ b/Content/Blueprints/Combat_UI/Gun/Gun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:205c885da03a3f5325b8cb4f8ddfcf02b809121ea9469ba5a619fa1597579d13 +size 9624 diff --git a/Content/Blueprints/Combat_UI/Gun/GunProto.uasset b/Content/Blueprints/Combat_UI/Gun/GunProto.uasset new file mode 100644 index 0000000..a93e70b --- /dev/null +++ b/Content/Blueprints/Combat_UI/Gun/GunProto.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f09f7bd05bd8416322accb926f6ce22c84e7c28a0cd3b4492aeb2825538586bf +size 88873 diff --git a/Content/Blueprints/Combat_UI/Gun/image__1_.uasset b/Content/Blueprints/Combat_UI/Gun/image__1_.uasset new file mode 100644 index 0000000..6399a64 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Gun/image__1_.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4174817eba7e47e1e7a180678e9b57397f6716c843dc156d58f42d292d97b5a0 +size 166238 diff --git a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset index 1e6dd49..26525f9 100644 --- a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d33eddc532c7974415088d36a5f445c7177ce11de76e32d4d9908c656d9acd3f -size 66281 +oid sha256:8d8a15505e76c4565b030eeec3812dec9ddea6dc9317a9fa854f9c28596a76f6 +size 68993 diff --git a/Content/Blueprints/Combat_UI/TestEnemy.uasset b/Content/Blueprints/Combat_UI/TestEnemy.uasset index 17e2669..c3218e2 100644 --- a/Content/Blueprints/Combat_UI/TestEnemy.uasset +++ b/Content/Blueprints/Combat_UI/TestEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:678d62c9403981ef1b6cdc3f0662097f25dc73ebe0873b2685ca13fd107d043b -size 33585 +oid sha256:e6b4fea5308fdb84b02f9295a3e764f5bec8045a868f600a36e9d61174e8bdc6 +size 33721 diff --git a/Content/Levels/CombatTest.umap b/Content/Levels/CombatTest.umap index 0851251..a1a8b59 100644 --- a/Content/Levels/CombatTest.umap +++ b/Content/Levels/CombatTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d379efe28d261d5316eb4cfdfed3b3b9cf9d5dc6d07254018318204c96ad25c -size 34591 +oid sha256:f9336348b2e1f84fb09314f0877836bec1973c977e1368b37276d5ab3db5344f +size 36124 From b20004e599b8abe37cb54e6c5e216d8edc3f7be9 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 23:24:37 +0000 Subject: [PATCH 62/77] Updated TurnBaseCombat to Start Combat onCollision --- .../Combat_UI/TestCombatCharacter.uasset | 4 +-- .../TurnBasedCombat/TurnBaseCombat.cpp | 25 +++++++++++++------ .../TurnBasedCombat/TurnBaseCombat.h | 6 +++++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset index 26525f9..e018216 100644 --- a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d8a15505e76c4565b030eeec3812dec9ddea6dc9317a9fa854f9c28596a76f6 -size 68993 +oid sha256:52c661eb9501db06a66485f2a9fd9a78cd3aa7a7a6d5e7144140d89fbcc74767 +size 92597 diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index c89d182..e7d7bdc 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -18,14 +18,9 @@ ATurnBaseCombat::ATurnBaseCombat() } } -void ATurnBaseCombat::BeginPlay() +void ATurnBaseCombat::StartCombat() { - Super::BeginPlay(); - - TArray AllCharacterActorsInScene; - UGameplayStatics::GetAllActorsOfClassWithTag(GetWorld(), AActor::StaticClass(), FName("Character"), AllCharacterActorsInScene); - - UUserWidget* HUD = CreateWidget(GetWorld(), HUDWidget); + if (HUD->IsInViewport()) return; HUD->AddToViewport(); APlayerController* PC = Cast(GetWorld()->GetFirstPlayerController()); @@ -36,6 +31,22 @@ void ATurnBaseCombat::BeginPlay() PC->bEnableClickEvents = true; PC->bEnableMouseOverEvents = true; } +} + +void ATurnBaseCombat::EndCombat() +{ + //Remove the HUD from the viewport + HUD->RemoveFromViewport(); +} + +void ATurnBaseCombat::BeginPlay() +{ + Super::BeginPlay(); + + TArray AllCharacterActorsInScene; + UGameplayStatics::GetAllActorsOfClassWithTag(GetWorld(), AActor::StaticClass(), FName("Character"), AllCharacterActorsInScene); + + HUD = CreateWidget(GetWorld(), HUDWidget); TurnIndicatorTextBlock = Cast(HUD->GetWidgetFromName("TurnIndicator")); CurrentComboTextBlock = Cast(HUD->GetWidgetFromName("CurrentCombo")); diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index 004a960..af1c25e 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -52,6 +52,11 @@ public: FString BattleLog; + UFUNCTION(BlueprintCallable) + void StartCombat(); + UFUNCTION(BlueprintCallable) + void EndCombat(); + protected: virtual void BeginPlay() override; void ExecuteCast(FString Combo); @@ -64,6 +69,7 @@ protected: private: bool IsValidCombo(FString Combo) const; + UUserWidget* HUD; UPROPERTY(VisibleAnywhere) bool bIsPlayerTurn = true; From 521ab6c0890b92889c50cef142ecb5d46379ceda Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 23:29:16 +0000 Subject: [PATCH 63/77] Updated TurnBaseCombat to End Combat onDeath --- .../TurnBasedCombat/TurnBaseCombat.cpp | 17 ++++++++++------- .../TurnBasedCombat/TurnBaseCombat.h | 7 +++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index e7d7bdc..e8c3d75 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -23,9 +23,7 @@ void ATurnBaseCombat::StartCombat() if (HUD->IsInViewport()) return; HUD->AddToViewport(); - APlayerController* PC = Cast(GetWorld()->GetFirstPlayerController()); - - if (PC) + if (APlayerController* PC = Cast(GetWorld()->GetFirstPlayerController())) { PC->bShowMouseCursor = true; PC->bEnableClickEvents = true; @@ -94,6 +92,13 @@ void ATurnBaseCombat::ExecuteCast(FString Combo) GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); break; } + //End Combat if either the player or enemy is dead + if (PlayerHealth <= 0 || EnemyHealth <= 0) + { + EndCombat(); + return; + } + SwitchTurn(); } @@ -214,10 +219,8 @@ void ATurnBaseCombat::ClearBattleLog() void ATurnBaseCombat::UpdateBattleLog() { - TArray tempArray; - //Get the amount of lines in the battle log - int32 LineCount = BattleLog.ParseIntoArray(tempArray, TEXT("\n"), true); - if (LineCount > 10) //If there are more than 10 lines + TArray TempArray; + if (const int32 LineCount = BattleLog.ParseIntoArray(TempArray, TEXT("\n"), true); LineCount > 10) { ClearBattleLog(); } diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index af1c25e..bbde3cf 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -29,14 +29,13 @@ public: UPROPERTY(EditDefaultsOnly) int ActiveActionPoints = 0; - AActor* PlayerActor; - AActor* EnemyActor; - AActor* ActiveActor; + // AActor* PlayerActor; + // AActor* EnemyActor; + // AActor* ActiveActor; /* TODO: Reference Player Inventory - Reference Combat Logging System */ UPROPERTY(EditAnywhere) TSubclassOf HUDWidget; From a976775e6189ab59b811e4a0f81ce006745244f4 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 14 Nov 2022 23:41:55 +0000 Subject: [PATCH 64/77] Updated TurnBaseCombat for Enemy Death onHealthZero --- .../Blueprints/Combat_UI/TestCombatCharacter.uasset | 4 ++-- .../TurnBasedCombat/TurnBaseCombat.cpp | 11 +++++++++-- .../TurnBasedCombat/TurnBaseCombat.h | 5 +++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset index e018216..1c221ce 100644 --- a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52c661eb9501db06a66485f2a9fd9a78cd3aa7a7a6d5e7144140d89fbcc74767 -size 92597 +oid sha256:9b15ccfde9f9f5a07cfdc24a16193ff5a3c6c46ed5c2644e340bc12666e3c0f6 +size 91832 diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index e8c3d75..01aa6ad 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -18,10 +18,11 @@ ATurnBaseCombat::ATurnBaseCombat() } } -void ATurnBaseCombat::StartCombat() +void ATurnBaseCombat::StartCombat(AActor* Enemy) { if (HUD->IsInViewport()) return; HUD->AddToViewport(); + EnemyActor = Enemy; if (APlayerController* PC = Cast(GetWorld()->GetFirstPlayerController())) { @@ -93,7 +94,13 @@ void ATurnBaseCombat::ExecuteCast(FString Combo) break; } //End Combat if either the player or enemy is dead - if (PlayerHealth <= 0 || EnemyHealth <= 0) + if (EnemyHealth <= 0) + { + EndCombat(); + EnemyActor->Destroy(); + return; + } + if (PlayerHealth <= 0) { EndCombat(); return; diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index bbde3cf..c94c185 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -30,7 +30,8 @@ public: int ActiveActionPoints = 0; // AActor* PlayerActor; - // AActor* EnemyActor; + UPROPERTY(VisibleAnywhere) + AActor* EnemyActor; // AActor* ActiveActor; /* @@ -52,7 +53,7 @@ public: FString BattleLog; UFUNCTION(BlueprintCallable) - void StartCombat(); + void StartCombat(AActor* Enemy); UFUNCTION(BlueprintCallable) void EndCombat(); From e602d83a31f61100d7fc40e162d8b97e87518815 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 15 Nov 2022 00:04:46 +0000 Subject: [PATCH 65/77] Updated Inventory system for Items in UI The Inventory System is working fully with the healing jelly working --- Content/Blueprints/BP_MyTempCharacter.uasset | 4 ++-- Content/Blueprints/WBP_ItemDisplay.uasset | 4 ++-- Content/Blueprints/WBP_PlayerInventory.uasset | 4 ++-- .../BaseItems/Items/EatableItems.cpp | 11 +++++++++++ .../the_twilight_abyss/BaseItems/Items/EatableItems.h | 2 ++ 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Content/Blueprints/BP_MyTempCharacter.uasset b/Content/Blueprints/BP_MyTempCharacter.uasset index ed9200f..f840bf5 100644 --- a/Content/Blueprints/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83b78bc2c32ead48fb4b3986da18675ab1673013673104c5232b504978a0c1ad -size 68346 +oid sha256:d49ff6579e47fa28aa35b87519939d733c3abfca7c388d4be2c900a85157f88e +size 68733 diff --git a/Content/Blueprints/WBP_ItemDisplay.uasset b/Content/Blueprints/WBP_ItemDisplay.uasset index 748f45b..1f2c632 100644 --- a/Content/Blueprints/WBP_ItemDisplay.uasset +++ b/Content/Blueprints/WBP_ItemDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3326b738a1a849cc33276c0a9c12c545dee4510e510848526cc225f939996d5 -size 81310 +oid sha256:4edd0dbf94c6d8cceab4ebfdc061238344833123d145ea292e4e8274d07ce760 +size 80407 diff --git a/Content/Blueprints/WBP_PlayerInventory.uasset b/Content/Blueprints/WBP_PlayerInventory.uasset index f05676b..810d0bf 100644 --- a/Content/Blueprints/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7df9350594b51cf2639b09ee43273d07e56f0328301b51d0c89b70c8edecf450 -size 90586 +oid sha256:0f8371e5880ea4dec24ea399529d04787ab66c9fbc72973cdc964d9bffd94db0 +size 98662 diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index 63956df..ccb756f 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -3,13 +3,24 @@ #include "EatableItems.h" +#include "the_twilight_abyss/BaseItems/InventoryComponent.h" #include "the_twilight_abyss/PlayerTemp/TempCharacter.h" +UEatableItems::UEatableItems() +{ + +} + void UEatableItems::Use(ATempCharacter* Character) { if(Character) { Character->Health += 10; + + if(StoredItems) + { + StoredItems->Remove(this); + } } } diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h index 127041f..d636bcd 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h @@ -13,6 +13,8 @@ UCLASS() class THE_TWILIGHT_ABYSS_API UEatableItems : public UBaseItem { GENERATED_BODY() + UEatableItems(); + protected: From bc090192f322a30dd46253ef73e4644284afef14 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 15 Nov 2022 00:12:14 +0000 Subject: [PATCH 66/77] Bugfix Player Inventory for Items Rendering --- Content/Blueprints/Combat_UI/TestCombatCharacter.uasset | 4 ++-- Content/Blueprints/WBP_PlayerInventory.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset index 1c221ce..226905e 100644 --- a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b15ccfde9f9f5a07cfdc24a16193ff5a3c6c46ed5c2644e340bc12666e3c0f6 -size 91832 +oid sha256:fe7a09837afe539c9a0038a01d8414d77d6c9e045652adba1f78882917bf4b6a +size 93269 diff --git a/Content/Blueprints/WBP_PlayerInventory.uasset b/Content/Blueprints/WBP_PlayerInventory.uasset index f05676b..df3b625 100644 --- a/Content/Blueprints/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7df9350594b51cf2639b09ee43273d07e56f0328301b51d0c89b70c8edecf450 -size 90586 +oid sha256:8491b7e5b9a3b541a679b848f6a1af86eecd3cd49bc14861973a694bfbbd6265 +size 93050 From 91667f89b2f9ff621abd4cba6891053e6051ee25 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 15 Nov 2022 00:16:26 +0000 Subject: [PATCH 67/77] Updated MerchantGameMode Added a print string to tell the player to press TAB to open the inventory --- Content/Merchant/BP_MerchantGameMode.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Merchant/BP_MerchantGameMode.uasset b/Content/Merchant/BP_MerchantGameMode.uasset index 2e44159..972a44a 100644 --- a/Content/Merchant/BP_MerchantGameMode.uasset +++ b/Content/Merchant/BP_MerchantGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:926719df7176f9678de65e93b192fe07cb79d5f1a3d5f8a49dd4ecb500bbd7b5 -size 20569 +oid sha256:fe64fcaee3f5da07e75c337764207dcdca5f2cdd0bd61681804d8178f703f0e3 +size 27684 From 189b6d25b8b530ceb354881999dcfb610c054bf0 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 15 Nov 2022 00:43:15 +0000 Subject: [PATCH 68/77] Updated Combat UI for Resource Bars --- Content/Blueprints/Combat_UI/Combat_UI.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index dc662dd..fa506ce 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3d012afceb64edab767928d52e91c205b6377f99bf29b12bc25008919dd56a5 -size 48587 +oid sha256:4fdf3d35b3617fe978aca3de1a70d9ee6ae78df938ccdf6f3a08111a8fb4c20e +size 56607 From 9d72f602088ba20b5af3c98c122ee2453d16e04a Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 15 Nov 2022 01:12:45 +0000 Subject: [PATCH 69/77] Updated TurnBaseCombat for ResourceBar Functionality --- Content/Blueprints/Combat_UI/Combat_UI.uasset | 4 +-- .../TurnBasedCombat/TurnBaseCombat.cpp | 36 ++++++++++++++++++- .../TurnBasedCombat/TurnBaseCombat.h | 11 ++++++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index fa506ce..aae01ca 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fdf3d35b3617fe978aca3de1a70d9ee6ae78df938ccdf6f3a08111a8fb4c20e -size 56607 +oid sha256:545b239dc38454f274d0f4ff5310ec6655a045999eb17764ed0e9bf31e17fa42 +size 56768 diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index 01aa6ad..70b1bc7 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -53,6 +53,8 @@ void ATurnBaseCombat::BeginPlay() BattleLogTextBlock = Cast(HUD->GetWidgetFromName("BattleLog")); PlayerHealthBar = Cast(HUD->GetWidgetFromName("PlayerHealthBar")); EnemyHealthBar = Cast(HUD->GetWidgetFromName("EnemyHealthBar")); + IronResourceBar = Cast(HUD->GetWidgetFromName("IronResourceBar")); + SulfurResourceBar = Cast(HUD->GetWidgetFromName("SulfurResourceBar")); CastButton = Cast(HUD->GetWidgetFromName("CastButton")); FButton = Cast(HUD->GetWidgetFromName("FButton")); WButton = Cast(HUD->GetWidgetFromName("WButton")); @@ -68,10 +70,23 @@ void ATurnBaseCombat::ExecuteCast(FString Combo) if (!IsValidCombo(Combo)) { GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("Invalid Combo")); + //For each character in the current combo add back the resource + for (int i = 0; i < Combo.Len(); i++) + { + if (Combo[i] == 'F') + { + IronResource += 1; + } + else if (Combo[i] == 'W') + { + SulfurResource += 1; + } + } CurrentComboString = ""; UpdateComboString(CurrentComboString); RevertActionPoints(); UpdateActionPoints(); + UpdateResourceBars(); return; } @@ -105,7 +120,7 @@ void ATurnBaseCombat::ExecuteCast(FString Combo) EndCombat(); return; } - + SwitchTurn(); } @@ -177,6 +192,8 @@ void ATurnBaseCombat::FButtonOnClick() UseActionPoint(); CurrentComboString.AppendChar('F'); UpdateComboString(CurrentComboString); + IronResource -= 1; + UpdateResourceBars(); } void ATurnBaseCombat::WButtonOnClick() @@ -189,6 +206,8 @@ void ATurnBaseCombat::WButtonOnClick() UseActionPoint(); CurrentComboString.AppendChar('W'); UpdateComboString(CurrentComboString); + SulfurResource -= 1; + UpdateResourceBars(); } void ATurnBaseCombat::BackspaceButtonOnClick() @@ -199,8 +218,17 @@ void ATurnBaseCombat::BackspaceButtonOnClick() return; } ReuseActionPoint(); + if (CurrentComboString.Right(1) == "F") + { + IronResource += 1; + } + else if (CurrentComboString.Right(1) == "W") + { + SulfurResource += 1; + } CurrentComboString.RemoveAt(CurrentComboString.Len() - 1); UpdateComboString(CurrentComboString); + UpdateResourceBars(); } void ATurnBaseCombat::UpdateComboString(FString NewCombo) const @@ -233,3 +261,9 @@ void ATurnBaseCombat::UpdateBattleLog() } BattleLogTextBlock->SetText(FText::FromString(BattleLog)); } + +void ATurnBaseCombat::UpdateResourceBars() const +{ + IronResourceBar->SetPercent(IronResource / 10.0f); + SulfurResourceBar->SetPercent(SulfurResource / 10.0f); +} diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index c94c185..ccde118 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -28,6 +28,10 @@ public: int DefaultActionPoints = 3; UPROPERTY(EditDefaultsOnly) int ActiveActionPoints = 0; + UPROPERTY(EditDefaultsOnly) + int IronResource = 10; // F + UPROPERTY(EditDefaultsOnly) + int SulfurResource = 10; // W // AActor* PlayerActor; UPROPERTY(VisibleAnywhere) @@ -97,6 +101,12 @@ private: UPROPERTY(VisibleAnywhere) UProgressBar* EnemyHealthBar; + UPROPERTY(VisibleAnywhere) + UProgressBar* IronResourceBar; + + UPROPERTY(VisibleAnywhere) + UProgressBar* SulfurResourceBar; + UPROPERTY(VisibleAnywhere) UButton* CastButton; @@ -127,4 +137,5 @@ private: void AddBattleLogMessage(FString Message); void ClearBattleLog(); void UpdateBattleLog(); + void UpdateResourceBars() const; }; From 181fcd010333e066a59c7e03b75b10ab84755590 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Tue, 15 Nov 2022 01:18:26 +0000 Subject: [PATCH 70/77] Added Environment assets I added some assets that could be used for the tutorial level --- Content/Environment/Material.uasset | 3 +++ Content/Environment/Prototype_level_Cube.uasset | 3 +++ Content/Environment/Prototype_level_Cube_001.uasset | 3 +++ Content/Environment/Prototype_level_Cube_002.uasset | 3 +++ Content/Environment/Prototype_level_Cube_003.uasset | 3 +++ Content/Environment/Prototype_level_Cube_004.uasset | 3 +++ Content/Environment/Prototype_level_Cube_005.uasset | 3 +++ Content/Environment/Prototype_level_Cube_006.uasset | 3 +++ Content/Environment/Prototype_level_Cube_007.uasset | 3 +++ Content/Environment/Prototype_level_Cube_008.uasset | 3 +++ Content/Environment/Prototype_level_Cube_009.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_001.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_002.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_004.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_005.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_006.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_007.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_008.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_009.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_010.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_011.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_012.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_013.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_014.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_015.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_016.uasset | 3 +++ Content/Environment/Prototype_level_Cylinder_017.uasset | 3 +++ Content/Environment/Prototype_level_Plane.uasset | 3 +++ Content/Environment/Prototype_level_Plane_001.uasset | 3 +++ Content/Environment/Prototype_level_Plane_002.uasset | 3 +++ Content/Environment/Prototype_level_Plane_003.uasset | 3 +++ Content/Environment/Prototype_level_Plane_004.uasset | 3 +++ Content/Environment/Prototype_level_Plane_005.uasset | 3 +++ 33 files changed, 99 insertions(+) create mode 100644 Content/Environment/Material.uasset create mode 100644 Content/Environment/Prototype_level_Cube.uasset create mode 100644 Content/Environment/Prototype_level_Cube_001.uasset create mode 100644 Content/Environment/Prototype_level_Cube_002.uasset create mode 100644 Content/Environment/Prototype_level_Cube_003.uasset create mode 100644 Content/Environment/Prototype_level_Cube_004.uasset create mode 100644 Content/Environment/Prototype_level_Cube_005.uasset create mode 100644 Content/Environment/Prototype_level_Cube_006.uasset create mode 100644 Content/Environment/Prototype_level_Cube_007.uasset create mode 100644 Content/Environment/Prototype_level_Cube_008.uasset create mode 100644 Content/Environment/Prototype_level_Cube_009.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_001.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_002.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_004.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_005.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_006.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_007.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_008.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_009.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_010.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_011.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_012.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_013.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_014.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_015.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_016.uasset create mode 100644 Content/Environment/Prototype_level_Cylinder_017.uasset create mode 100644 Content/Environment/Prototype_level_Plane.uasset create mode 100644 Content/Environment/Prototype_level_Plane_001.uasset create mode 100644 Content/Environment/Prototype_level_Plane_002.uasset create mode 100644 Content/Environment/Prototype_level_Plane_003.uasset create mode 100644 Content/Environment/Prototype_level_Plane_004.uasset create mode 100644 Content/Environment/Prototype_level_Plane_005.uasset diff --git a/Content/Environment/Material.uasset b/Content/Environment/Material.uasset new file mode 100644 index 0000000..dce3b2a --- /dev/null +++ b/Content/Environment/Material.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6b07d4df0b5b04d23b9ec4005c22dae81634f87f9110fca9a7a4775988fa2d4 +size 7506 diff --git a/Content/Environment/Prototype_level_Cube.uasset b/Content/Environment/Prototype_level_Cube.uasset new file mode 100644 index 0000000..c5753f6 --- /dev/null +++ b/Content/Environment/Prototype_level_Cube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32835ea8c3d93810833df9b085d4ea9d49c09310f739d1c0ecbc37cca8112f91 +size 329853 diff --git a/Content/Environment/Prototype_level_Cube_001.uasset b/Content/Environment/Prototype_level_Cube_001.uasset new file mode 100644 index 0000000..439fffd --- /dev/null +++ b/Content/Environment/Prototype_level_Cube_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7195c32af5418a61a0e0064d5e7334f981f4664f15a15dc2938dae7e95d1f3d1 +size 18436 diff --git a/Content/Environment/Prototype_level_Cube_002.uasset b/Content/Environment/Prototype_level_Cube_002.uasset new file mode 100644 index 0000000..8b9259a --- /dev/null +++ b/Content/Environment/Prototype_level_Cube_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a5d3864d08e3fb258f71be9ab23243b6cd8b5c027a7eb320ff49246e4b5600e +size 18320 diff --git a/Content/Environment/Prototype_level_Cube_003.uasset b/Content/Environment/Prototype_level_Cube_003.uasset new file mode 100644 index 0000000..5e9c821 --- /dev/null +++ b/Content/Environment/Prototype_level_Cube_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6c61c0058fcbd74005bb75b36c243b46748ae254b187e47380b87e145e12359 +size 18572 diff --git a/Content/Environment/Prototype_level_Cube_004.uasset b/Content/Environment/Prototype_level_Cube_004.uasset new file mode 100644 index 0000000..f7e2fe0 --- /dev/null +++ b/Content/Environment/Prototype_level_Cube_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f6a0bc903e2310f4d99626a72d794c63305ede670fbd345225bd3ced68a0225 +size 18402 diff --git a/Content/Environment/Prototype_level_Cube_005.uasset b/Content/Environment/Prototype_level_Cube_005.uasset new file mode 100644 index 0000000..86a490f --- /dev/null +++ b/Content/Environment/Prototype_level_Cube_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7ca6e3ff9cb3d869dee1be60b7d05dd1e6210f60ebe9e3bf0399cc13f7891bc +size 18468 diff --git a/Content/Environment/Prototype_level_Cube_006.uasset b/Content/Environment/Prototype_level_Cube_006.uasset new file mode 100644 index 0000000..855bb82 --- /dev/null +++ b/Content/Environment/Prototype_level_Cube_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5f4e73a7a6c163310aebacc140d65974e7b12c62d258b9b4a66a05d1852b3e0 +size 18736 diff --git a/Content/Environment/Prototype_level_Cube_007.uasset b/Content/Environment/Prototype_level_Cube_007.uasset new file mode 100644 index 0000000..afecd3e --- /dev/null +++ b/Content/Environment/Prototype_level_Cube_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16da5364293ec6d69151be3b7d497a86c6dde07d2c49b6ff90c991add2b9c047 +size 18985 diff --git a/Content/Environment/Prototype_level_Cube_008.uasset b/Content/Environment/Prototype_level_Cube_008.uasset new file mode 100644 index 0000000..b6c75e7 --- /dev/null +++ b/Content/Environment/Prototype_level_Cube_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00515ab1759e2417bab04d70b5c6e0e9e020d9a4019876ac16e9d739d4a7962b +size 18362 diff --git a/Content/Environment/Prototype_level_Cube_009.uasset b/Content/Environment/Prototype_level_Cube_009.uasset new file mode 100644 index 0000000..289e90d --- /dev/null +++ b/Content/Environment/Prototype_level_Cube_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f3f5b37c932908b282592954f5f6f8a7597dd1177b745c2d8304952b0cfb8de +size 19612 diff --git a/Content/Environment/Prototype_level_Cylinder_001.uasset b/Content/Environment/Prototype_level_Cylinder_001.uasset new file mode 100644 index 0000000..b5b4332 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d0b64c14cb396404b779fc7c7fa63073f034c8c450ce85b8af3b94115e1926b +size 19668 diff --git a/Content/Environment/Prototype_level_Cylinder_002.uasset b/Content/Environment/Prototype_level_Cylinder_002.uasset new file mode 100644 index 0000000..73f216c --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7f4d0d2eb55d7afa457980ca719e877c0a00b247dae5ede90ef8dd96e26bd80 +size 19625 diff --git a/Content/Environment/Prototype_level_Cylinder_004.uasset b/Content/Environment/Prototype_level_Cylinder_004.uasset new file mode 100644 index 0000000..7a0f8fc --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0db5a0047bf82952b71b46de04fc61d469e8e3275b0466cc5e4d5291ae3e55ae +size 18916 diff --git a/Content/Environment/Prototype_level_Cylinder_005.uasset b/Content/Environment/Prototype_level_Cylinder_005.uasset new file mode 100644 index 0000000..550b368 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8eb2873ae854ad669d0f4b896d912ccaea9be5862fee0a5bc6599887eeb35966 +size 18919 diff --git a/Content/Environment/Prototype_level_Cylinder_006.uasset b/Content/Environment/Prototype_level_Cylinder_006.uasset new file mode 100644 index 0000000..b6ce4d8 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99e50ccd1849d033d211758644fd316e8df93976a09f329e614ee46c1dabde8a +size 18919 diff --git a/Content/Environment/Prototype_level_Cylinder_007.uasset b/Content/Environment/Prototype_level_Cylinder_007.uasset new file mode 100644 index 0000000..6a2241c --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1f22b8ecefd888883419c99f014426d2c532cae815b1fc795f60ebdb186ba70 +size 18920 diff --git a/Content/Environment/Prototype_level_Cylinder_008.uasset b/Content/Environment/Prototype_level_Cylinder_008.uasset new file mode 100644 index 0000000..2439a5e --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3d9e399d14e01e7051d66eb735450240a4f24018bc84b45807b0d21ad26184d +size 19673 diff --git a/Content/Environment/Prototype_level_Cylinder_009.uasset b/Content/Environment/Prototype_level_Cylinder_009.uasset new file mode 100644 index 0000000..b5fd02c --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7abfb2dc54be26dd3cd15b5906d8b3126f180c8701522fbde4be529e0847abf7 +size 19617 diff --git a/Content/Environment/Prototype_level_Cylinder_010.uasset b/Content/Environment/Prototype_level_Cylinder_010.uasset new file mode 100644 index 0000000..5971533 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8c0f018491086271f21da2bfcefcb68e3a4e2917f26cf4586e0b7cc0cd932d9 +size 19653 diff --git a/Content/Environment/Prototype_level_Cylinder_011.uasset b/Content/Environment/Prototype_level_Cylinder_011.uasset new file mode 100644 index 0000000..b5128e6 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_011.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4a138c8cfa24653f841db7dae763989238880f2a7ba6c214f93c960c05b843e +size 19668 diff --git a/Content/Environment/Prototype_level_Cylinder_012.uasset b/Content/Environment/Prototype_level_Cylinder_012.uasset new file mode 100644 index 0000000..0406ed7 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_012.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6f76a0c472207dff70a60f36c166e0838b3ca5ebc08bf4ef9ca95d613261e8b +size 18923 diff --git a/Content/Environment/Prototype_level_Cylinder_013.uasset b/Content/Environment/Prototype_level_Cylinder_013.uasset new file mode 100644 index 0000000..23b75a3 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_013.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c738f8cb80f21366bda731f8f6ca862e0fd92437c14a514531ec8805d041285 +size 18917 diff --git a/Content/Environment/Prototype_level_Cylinder_014.uasset b/Content/Environment/Prototype_level_Cylinder_014.uasset new file mode 100644 index 0000000..777c122 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_014.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10fd2212d197d89967937d069436b523d7d86c355f519fae4c1bb5afb4b224e6 +size 18924 diff --git a/Content/Environment/Prototype_level_Cylinder_015.uasset b/Content/Environment/Prototype_level_Cylinder_015.uasset new file mode 100644 index 0000000..c37e760 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_015.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7812d51ddac775134dada8c24e394606ef49c48728cde4744c1957381f40d26c +size 18922 diff --git a/Content/Environment/Prototype_level_Cylinder_016.uasset b/Content/Environment/Prototype_level_Cylinder_016.uasset new file mode 100644 index 0000000..7d1b267 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_016.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56e73e8184e67320a577c1ab1fb8d1e20c45a014d00f40edb59617035647f942 +size 19595 diff --git a/Content/Environment/Prototype_level_Cylinder_017.uasset b/Content/Environment/Prototype_level_Cylinder_017.uasset new file mode 100644 index 0000000..23f8922 --- /dev/null +++ b/Content/Environment/Prototype_level_Cylinder_017.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df763f2361234e5065330de87eb7a51489fb79dea304deca2e0c1dfbeac53794 +size 19690 diff --git a/Content/Environment/Prototype_level_Plane.uasset b/Content/Environment/Prototype_level_Plane.uasset new file mode 100644 index 0000000..84994b8 --- /dev/null +++ b/Content/Environment/Prototype_level_Plane.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fa2a9601b10f4756e0b3f0ff393315cceb2d686ffe22602ddb73742404942a1 +size 60218 diff --git a/Content/Environment/Prototype_level_Plane_001.uasset b/Content/Environment/Prototype_level_Plane_001.uasset new file mode 100644 index 0000000..36b0f7b --- /dev/null +++ b/Content/Environment/Prototype_level_Plane_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abf2985737db5e576de51bdae148fb995b7b8e433635bde025e45f44aa596391 +size 14355 diff --git a/Content/Environment/Prototype_level_Plane_002.uasset b/Content/Environment/Prototype_level_Plane_002.uasset new file mode 100644 index 0000000..0e3af41 --- /dev/null +++ b/Content/Environment/Prototype_level_Plane_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0e37a84f02d1c61041aaa7e1048eda8d06226fd6e5bcbfc356fb150d58aea6a +size 17920 diff --git a/Content/Environment/Prototype_level_Plane_003.uasset b/Content/Environment/Prototype_level_Plane_003.uasset new file mode 100644 index 0000000..efee0c6 --- /dev/null +++ b/Content/Environment/Prototype_level_Plane_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d17f740aa59e96c636921788737961b3d544600358f1b2ca0924065d0b13365 +size 38037 diff --git a/Content/Environment/Prototype_level_Plane_004.uasset b/Content/Environment/Prototype_level_Plane_004.uasset new file mode 100644 index 0000000..273b163 --- /dev/null +++ b/Content/Environment/Prototype_level_Plane_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:076f9cb8252d6d0dbdd77164efec3f7aae36399c1b3ec47dd2a6e54115c8bf4a +size 14355 diff --git a/Content/Environment/Prototype_level_Plane_005.uasset b/Content/Environment/Prototype_level_Plane_005.uasset new file mode 100644 index 0000000..3a70db9 --- /dev/null +++ b/Content/Environment/Prototype_level_Plane_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55ab4607280ada9b31d0a2c798fdb618da7ee6977b2e43a7cc88ecacb52388c7 +size 16991 From f6c59adda0a8f06d2bcb89a785954be5ec15d0cc Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Tue, 15 Nov 2022 01:20:37 +0000 Subject: [PATCH 71/77] Added empty level "prototype" I added an empty level called prototype to wel.. prototype on --- Content/Levels/Prototype.umap | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Levels/Prototype.umap diff --git a/Content/Levels/Prototype.umap b/Content/Levels/Prototype.umap new file mode 100644 index 0000000..76a59e6 --- /dev/null +++ b/Content/Levels/Prototype.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68fe5e5d38e500f4e6c4c20bfef6f677b1a05ab3cd460438ce0f582321adb85c +size 32030 From e57c99d103daa56b6457de03ad02d94b72bd7d53 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 15 Nov 2022 01:21:47 +0000 Subject: [PATCH 72/77] Bugfix TurnBaseCombat Not Checking Resource Count --- .../TurnBasedCombat/TurnBaseCombat.cpp | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index 70b1bc7..1fa088c 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -100,12 +100,12 @@ void ATurnBaseCombat::ExecuteCast(FString Combo) case true: // Player Turn DamageEnemy(*ValidCombos.Find(Combo)); - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, FString::Printf(TEXT("Enemy Damaged %d"), *ValidCombos.Find(Combo))); + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Enemy Damaged %d"), *ValidCombos.Find(Combo))); break; case false: // Enemy Turn DamagePlayer(*ValidCombos.Find(Combo)); - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); break; } //End Combat if either the player or enemy is dead @@ -186,7 +186,12 @@ void ATurnBaseCombat::FButtonOnClick() { if (ActiveActionPoints >= DefaultActionPoints) { - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, TEXT("No More Action Points")); + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("No More Action Points")); + return; + } + if (IronResource <= 0) + { + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("No More Iron")); return; } UseActionPoint(); @@ -200,7 +205,12 @@ void ATurnBaseCombat::WButtonOnClick() { if (ActiveActionPoints >= DefaultActionPoints) { - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, TEXT("No More Action Points")); + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("No More Action Points")); + return; + } + if (SulfurResource <= 0) + { + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("No More Sulfur")); return; } UseActionPoint(); @@ -214,7 +224,7 @@ void ATurnBaseCombat::BackspaceButtonOnClick() { if (CurrentComboString.Len() <= 0) { - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, TEXT("Blank Combo")); + GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("Blank Combo")); return; } ReuseActionPoint(); From dbe213ef779a65938e2e9864facbb2494d8c7b93 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Tue, 15 Nov 2022 01:34:32 +0000 Subject: [PATCH 73/77] Updated Prototype level I have updated the prototype level to include the environment assets and added a small material to a big rock --- Content/Environment/Material.uasset | 4 ++-- Content/Levels/Prototype.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Environment/Material.uasset b/Content/Environment/Material.uasset index dce3b2a..7f667b7 100644 --- a/Content/Environment/Material.uasset +++ b/Content/Environment/Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6b07d4df0b5b04d23b9ec4005c22dae81634f87f9110fca9a7a4775988fa2d4 -size 7506 +oid sha256:31a95c596aebc9556a330604ccbcb7a94d0c9f265307edb92acfcaaa6e742fe0 +size 8860 diff --git a/Content/Levels/Prototype.umap b/Content/Levels/Prototype.umap index 76a59e6..589e9b7 100644 --- a/Content/Levels/Prototype.umap +++ b/Content/Levels/Prototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68fe5e5d38e500f4e6c4c20bfef6f677b1a05ab3cd460438ce0f582321adb85c -size 32030 +oid sha256:cba84faa22a08217164b7ea58cd2d8d9653d53bb03eb524e64d33c85bf057387 +size 49493 From 96273d16d97438b2c2298879817422ccef855d3b Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 15 Nov 2022 01:45:52 +0000 Subject: [PATCH 74/77] Updated Prototype Environment for TurnBaseCombat --- Config/DefaultEngine.ini | 2 +- Content/Environment/Prototype_level_Plane_001.uasset | 4 ++-- Content/Levels/Prototype.umap | 4 ++-- Content/Merchant/BP_MerchantGameMode.uasset | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index a4ad8a7..8b30120 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -28,7 +28,7 @@ bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance GameDefaultMap=/Game/Levels/CombatTest.CombatTest ServerDefaultMap=/Engine/Maps/Entry.Entry -GlobalDefaultGameMode=/Game/Blueprints/Combat_UI/Combat_Test.Combat_Test_C +GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C GlobalDefaultServerGameMode=None [/Script/Engine.CollisionProfile] diff --git a/Content/Environment/Prototype_level_Plane_001.uasset b/Content/Environment/Prototype_level_Plane_001.uasset index 36b0f7b..07e88b9 100644 --- a/Content/Environment/Prototype_level_Plane_001.uasset +++ b/Content/Environment/Prototype_level_Plane_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abf2985737db5e576de51bdae148fb995b7b8e433635bde025e45f44aa596391 -size 14355 +oid sha256:a3f96b505660017de2d929d6f8a7f3ba0bc943108ca57d4a40428afc3743ffb2 +size 15702 diff --git a/Content/Levels/Prototype.umap b/Content/Levels/Prototype.umap index 589e9b7..b655881 100644 --- a/Content/Levels/Prototype.umap +++ b/Content/Levels/Prototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cba84faa22a08217164b7ea58cd2d8d9653d53bb03eb524e64d33c85bf057387 -size 49493 +oid sha256:d041b3e775c998d7a63d1ec12fa237c219506249e0ae2970350a1729cea2af3b +size 54044 diff --git a/Content/Merchant/BP_MerchantGameMode.uasset b/Content/Merchant/BP_MerchantGameMode.uasset index 2e44159..bddbf7b 100644 --- a/Content/Merchant/BP_MerchantGameMode.uasset +++ b/Content/Merchant/BP_MerchantGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:926719df7176f9678de65e93b192fe07cb79d5f1a3d5f8a49dd4ecb500bbd7b5 -size 20569 +oid sha256:1ef090e9f92fa5848279b081a524b2c28609e6ad41301a6ef192d54eb3ea158b +size 20771 From c852de30ecd77ea595a905367428862a75b88914 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 15 Nov 2022 02:02:59 +0000 Subject: [PATCH 75/77] Updated TurnBaseCombat for Simple Combat AI --- Config/DefaultEngine.ini | 4 ++-- .../TurnBasedCombat/TurnBaseCombat.cpp | 22 +++++++++++++++++-- .../TurnBasedCombat/TurnBaseCombat.h | 2 ++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 8b30120..1fba0b6 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -17,7 +17,7 @@ ManualIPAddress= +ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Levels/CombatTest.CombatTest +EditorStartupMap=/Game/Levels/Prototype.Prototype LocalMapOptions= TransitionMap=None bUseSplitscreen=True @@ -26,7 +26,7 @@ ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/Levels/CombatTest.CombatTest +GameDefaultMap=/Game/Levels/Prototype.Prototype ServerDefaultMap=/Engine/Maps/Entry.Entry GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C GlobalDefaultServerGameMode=None diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index 1fa088c..8856b35 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -172,8 +172,11 @@ void ATurnBaseCombat::SwitchTurn() //TurnIndicatorTextBlock->SetText(FText::FromString(bIsPlayerTurn ? "Enemy Turn" : "Player Turn")); //bIsPlayerTurn = !bIsPlayerTurn; TurnIndicatorTextBlock->SetText(FText::FromString("Enemy Turn")); - DamagePlayer(10); - TurnIndicatorTextBlock->SetText(FText::FromString("Player Turn")); + ToggleButtons(); + //wait for 2 seconds + FTimerHandle UnusedHandle; + GetWorldTimerManager().SetTimer(UnusedHandle, this, &ATurnBaseCombat::EnemyTurn, 2.0f, false); + //activeActor = bIsPlayerTurn ? enemyActor : playerActor; } @@ -277,3 +280,18 @@ void ATurnBaseCombat::UpdateResourceBars() const IronResourceBar->SetPercent(IronResource / 10.0f); SulfurResourceBar->SetPercent(SulfurResource / 10.0f); } + +void ATurnBaseCombat::ToggleButtons() const +{ + FButton->SetIsEnabled(!FButton->bIsEnabled); + WButton->SetIsEnabled(!WButton->bIsEnabled); + BackspaceButton->SetIsEnabled(!BackspaceButton->bIsEnabled); + CastButton->SetIsEnabled(!CastButton->bIsEnabled); +} + +void ATurnBaseCombat::EnemyTurn() +{ + DamagePlayer(10); + TurnIndicatorTextBlock->SetText(FText::FromString("Player Turn")); + ToggleButtons(); +} diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index ccde118..bb755c9 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -138,4 +138,6 @@ private: void ClearBattleLog(); void UpdateBattleLog(); void UpdateResourceBars() const; + void ToggleButtons() const; + void EnemyTurn(); }; From 0c0876770bad1f2f867feaf57781e0046abb61bf Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 15 Nov 2022 03:27:44 +0000 Subject: [PATCH 76/77] Updated Inventory System Added BuffJelly --- Content/Blueprints/BP_HealingJellyItem.uasset | 3 +++ Content/Blueprints/BP_Interaction.uasset | 4 ++-- Content/Blueprints/BP_MyTempCharacter.uasset | 4 ++-- Content/Blueprints/Items/BP_BuffJelly.uasset | 3 +++ Content/Blueprints/WBP_ItemDisplay.uasset | 4 ++-- Content/Blueprints/WBP_PlayerInventory.uasset | 4 ++-- Content/Blueprints/WBP_Shop.uasset | 3 +++ ...0721c6d67f7486dab91235681c-1920-q70.uasset | 3 +++ Content/Levels/MerchantPrototype.umap | 4 ++-- .../BaseItems/InventoryComponent.cpp | 4 +--- .../BaseItems/Items/BaseItem.h | 11 +++++---- .../BaseItems/Items/EatableItems.cpp | 15 ++++++++++++ .../BaseItems/Items/EatableItems.h | 1 + .../BaseItems/Items/ShopItems.cpp | 19 +++++++++++++++ .../BaseItems/Items/ShopItems.h | 20 ++++++++++++++++ .../PlayerTemp/TempCharacter.cpp | 24 +++++++++++++++++++ .../PlayerTemp/TempCharacter.h | 12 +++++++++- 17 files changed, 119 insertions(+), 19 deletions(-) create mode 100644 Content/Blueprints/BP_HealingJellyItem.uasset create mode 100644 Content/Blueprints/Items/BP_BuffJelly.uasset create mode 100644 Content/Blueprints/WBP_Shop.uasset create mode 100644 Content/Images/butterfly-pea-jelly-on-a-plate-9e24c00721c6d67f7486dab91235681c-1920-q70.uasset create mode 100644 Source/the_twilight_abyss/BaseItems/Items/ShopItems.cpp create mode 100644 Source/the_twilight_abyss/BaseItems/Items/ShopItems.h diff --git a/Content/Blueprints/BP_HealingJellyItem.uasset b/Content/Blueprints/BP_HealingJellyItem.uasset new file mode 100644 index 0000000..f66b6a9 --- /dev/null +++ b/Content/Blueprints/BP_HealingJellyItem.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9bb81fd6a904d7139d83d81f2d8fbecf448eda7710959bfa2a32faf2e2eee72 +size 29888 diff --git a/Content/Blueprints/BP_Interaction.uasset b/Content/Blueprints/BP_Interaction.uasset index 36accd5..dcb91cb 100644 --- a/Content/Blueprints/BP_Interaction.uasset +++ b/Content/Blueprints/BP_Interaction.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c7a00cbf616d22eba20079c3f1640b3d1c3ef86aee1bcfa4335ca32a5390a80 -size 27630 +oid sha256:42db740853a281bd78c277e9281ab2af4bdf9d0ee834045782e066ee782e9e67 +size 27990 diff --git a/Content/Blueprints/BP_MyTempCharacter.uasset b/Content/Blueprints/BP_MyTempCharacter.uasset index f840bf5..585dc7f 100644 --- a/Content/Blueprints/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d49ff6579e47fa28aa35b87519939d733c3abfca7c388d4be2c900a85157f88e -size 68733 +oid sha256:c720b55a9e91e62f991279ef9d043ef8e41e3282b1b1c640ddb46dd4c8efc543 +size 53356 diff --git a/Content/Blueprints/Items/BP_BuffJelly.uasset b/Content/Blueprints/Items/BP_BuffJelly.uasset new file mode 100644 index 0000000..c1bc784 --- /dev/null +++ b/Content/Blueprints/Items/BP_BuffJelly.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:334fec1c48b0bb04fe272b83310d5211cd1c78feed1a2adbbd3d13dffdffa90f +size 6726 diff --git a/Content/Blueprints/WBP_ItemDisplay.uasset b/Content/Blueprints/WBP_ItemDisplay.uasset index 1f2c632..6337ca6 100644 --- a/Content/Blueprints/WBP_ItemDisplay.uasset +++ b/Content/Blueprints/WBP_ItemDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4edd0dbf94c6d8cceab4ebfdc061238344833123d145ea292e4e8274d07ce760 -size 80407 +oid sha256:7e54ac7119c349323ce6d57b3658300f982eed6ffe9922c47c13448aeb4173e8 +size 84619 diff --git a/Content/Blueprints/WBP_PlayerInventory.uasset b/Content/Blueprints/WBP_PlayerInventory.uasset index 810d0bf..1af5b3c 100644 --- a/Content/Blueprints/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f8371e5880ea4dec24ea399529d04787ab66c9fbc72973cdc964d9bffd94db0 -size 98662 +oid sha256:38c83f1bddcf376360f7860312744872858e4c43b3c14d5153ae35923d9a8faf +size 96657 diff --git a/Content/Blueprints/WBP_Shop.uasset b/Content/Blueprints/WBP_Shop.uasset new file mode 100644 index 0000000..548aa62 --- /dev/null +++ b/Content/Blueprints/WBP_Shop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a2f46e884f8c8bcd1bb029db2828769bdbd7a23296896f5a71bda84cd2626c7 +size 24782 diff --git a/Content/Images/butterfly-pea-jelly-on-a-plate-9e24c00721c6d67f7486dab91235681c-1920-q70.uasset b/Content/Images/butterfly-pea-jelly-on-a-plate-9e24c00721c6d67f7486dab91235681c-1920-q70.uasset new file mode 100644 index 0000000..f95b24d --- /dev/null +++ b/Content/Images/butterfly-pea-jelly-on-a-plate-9e24c00721c6d67f7486dab91235681c-1920-q70.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e6d67b2eacb8f089a90ec308158faa73f7c4d2ff319c2b01939517ee2c7d70e +size 225499 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index 433a8e5..6a6e864 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:659d40d87576c276667484be63bcb818039f4f8ac40525cdcea92c90eee7aaec -size 23245 +oid sha256:085eef600d9d08558738acea97402875c1b986649999de674e98be2749afe503 +size 24931 diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp index 8036177..30156e9 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp @@ -3,8 +3,7 @@ #include "InventoryComponent.h" #include "Items/BaseItem.h" - - +#include "the_twilight_abyss/PlayerTemp/TempCharacter.h" // Sets default values for this component's properties @@ -36,7 +35,6 @@ bool UInventoryComponent::AddItem(class UBaseItem* BaseItem) { return false; } - BaseItem->StoredItems = this; BaseItem->World = GetWorld(); Items.Add(BaseItem); diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 47cdbcc..1b18b3d 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -45,16 +45,14 @@ public: //The cost of the item UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") - int32 ItemCostPrice; - - //ADD A HEALING ITEM VALUE? - + int ItemCostPrice; + //reference to the UInventoryComponent script UPROPERTY() class UInventoryComponent* StoredItems; //The buy class to purchase the item - virtual void Buy(class UItemPurchaseComponent* PurchaseItem) PURE_VIRTUAL(UBaseItem); // WILL SET THIS UP LATER + virtual void Buy(class ATempCharacter* PurchaseItem) PURE_VIRTUAL(UBaseItem); // WILL SET THIS UP LATER //The use Item class to use the item in the player Inventory virtual void Use(class ATempCharacter* Character); @@ -62,4 +60,7 @@ public: //This is the same as the use item class but its in BP instead UFUNCTION(BlueprintImplementableEvent) void OnUse(class ATempCharacter* Character); + + UFUNCTION(BlueprintImplementableEvent) + void OnBuy(class ATempCharacter* PurchaseItem); }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index ccb756f..c2a88fb 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -24,3 +24,18 @@ void UEatableItems::Use(ATempCharacter* Character) } } } + +void UEatableItems::Buy(ATempCharacter* PurchaseItem) +{ + if(PurchaseItem) + { + if(PurchaseItem->GoldBalance <= 0) + { + UE_LOG(LogTemp, Display, TEXT("Not Enough Gold")); + } + else + { + PurchaseItem->GoldBalance -= ItemCostPrice; + } + } +} diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h index d636bcd..e189a6e 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h @@ -19,4 +19,5 @@ class THE_TWILIGHT_ABYSS_API UEatableItems : public UBaseItem protected: virtual void Use(class ATempCharacter* Character) override; + virtual void Buy(ATempCharacter* PurchaseItem) override; }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/ShopItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/ShopItems.cpp new file mode 100644 index 0000000..c28f0e3 --- /dev/null +++ b/Source/the_twilight_abyss/BaseItems/Items/ShopItems.cpp @@ -0,0 +1,19 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "ShopItems.h" + +#include "the_twilight_abyss/PlayerTemp/TempCharacter.h" + +UShopItems::UShopItems() +{ + +} + +// void UShopItems::Buy(ATempCharacter* PurchaseItem) +// { +// if(PurchaseItem) +// { +// PurchaseItem->GoldBalance -= ItemCostPrice; +// } +// } diff --git a/Source/the_twilight_abyss/BaseItems/Items/ShopItems.h b/Source/the_twilight_abyss/BaseItems/Items/ShopItems.h new file mode 100644 index 0000000..85cf445 --- /dev/null +++ b/Source/the_twilight_abyss/BaseItems/Items/ShopItems.h @@ -0,0 +1,20 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "BaseItem.h" +#include "ShopItems.generated.h" + +/** + * + */ +UCLASS() +class THE_TWILIGHT_ABYSS_API UShopItems : public UBaseItem +{ + GENERATED_BODY() + UShopItems(); + +// protected: +// virtual void Buy(ATempCharacter* PurchaseItem) override; +}; diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index d21da03..6171a59 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -77,6 +77,20 @@ void ATempCharacter::LineTraceLogic() { return; } + if(OutHit.GetActor()->ActorHasTag("HealingJelly")) + { + if(GoldBalance >= 100) + { + GoldBalance -= 100; + UE_LOG(LogTemp, Display, TEXT("Item Purchased")); + // UInventoryComponent* tempInventory = GetOwner()->FindComponentByClass(); + // tempInventory->AddItem(ItemToBuy); + } + if(GoldBalance <= 0) + { + UE_LOG(LogTemp, Display, TEXT("Not Enough Gold")); + } + } if (AInteraction* MyInteractable = Cast(OutHit.GetActor())) { DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 1.0f); @@ -94,3 +108,13 @@ void ATempCharacter::UseItem(class UBaseItem* Item) Item->OnUse(this); //Blueprint Version } } + +void ATempCharacter::BuyItem(UBaseItem* BuyItem) +{ + if(BuyItem) + { + BuyItem->Buy(this); + BuyItem->OnBuy(this); + } +} + diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 7cafb29..4760f2c 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "GameFramework/Character.h" +#include "the_twilight_abyss/BaseItems/Items/BaseItem.h" #include "TempCharacter.generated.h" UCLASS() @@ -43,7 +44,16 @@ public: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category= "Health") float Health; + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category= "Gold") + int GoldBalance; + //Using the item in the inventory UFUNCTION(BlueprintCallable, Category= "Items") - void UseItem(class UBaseItem* Item); // Overriding the BaseItem Class + void UseItem(class UBaseItem* Item); // Overriding the BaseItem Class + + UFUNCTION(BlueprintCallable, Category= "Items") + void BuyItem(class UBaseItem* BuyItem); + + // UPROPERTY(EditAnywhere, Category= "Items") + // UBaseItem ItemToBuy; }; From e5e24c848a4553bfa6c5bd28e0a5e50d5a7a0e37 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 15 Nov 2022 03:40:59 +0000 Subject: [PATCH 77/77] Updated Prototype Environment for Inventory --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 3 +++ Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset | 3 --- Content/Blueprints/Combat_UI/TestCombatCharacter.uasset | 3 --- Content/Levels/Prototype.umap | 4 ++-- Content/Merchant/BP_MerchantGameMode.uasset | 4 ++-- 5 files changed, 7 insertions(+), 10 deletions(-) create mode 100644 Content/Blueprints/Combat_UI/CombatCharacter.uasset delete mode 100644 Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset delete mode 100644 Content/Blueprints/Combat_UI/TestCombatCharacter.uasset diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset new file mode 100644 index 0000000..e4f2f48 --- /dev/null +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c31aac33ef5d0aa521d5f3d3e58b8f14a0d3fff128c14aa997250176c9f70a3 +size 58942 diff --git a/Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset b/Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset deleted file mode 100644 index 34d2bd0..0000000 --- a/Content/Blueprints/Combat_UI/PlayerCharacterCombatTest.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7979693199bb1a063e7a07926dea06d8ba77a58bc5d5219ca1a243b4a3e0fa0b -size 29095 diff --git a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset deleted file mode 100644 index 226905e..0000000 --- a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe7a09837afe539c9a0038a01d8414d77d6c9e045652adba1f78882917bf4b6a -size 93269 diff --git a/Content/Levels/Prototype.umap b/Content/Levels/Prototype.umap index b655881..2ac34dd 100644 --- a/Content/Levels/Prototype.umap +++ b/Content/Levels/Prototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d041b3e775c998d7a63d1ec12fa237c219506249e0ae2970350a1729cea2af3b -size 54044 +oid sha256:f2b7bffb5842056ae8df94b3c21e783acaaccaec1162a8cf40c2561a3a041755 +size 54116 diff --git a/Content/Merchant/BP_MerchantGameMode.uasset b/Content/Merchant/BP_MerchantGameMode.uasset index 972a44a..c974b1b 100644 --- a/Content/Merchant/BP_MerchantGameMode.uasset +++ b/Content/Merchant/BP_MerchantGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe64fcaee3f5da07e75c337764207dcdca5f2cdd0bd61681804d8178f703f0e3 -size 27684 +oid sha256:42528498febf08b71b6e27fce611f4f15415f5013e1cac461e13ca284a3a781f +size 27248