mirror of
https://github.com/ConjureETS/Octogonia.git
synced 2026-03-24 03:21:11 +00:00
Yvan - Sons de déplacement, correction téléport joueur à la fin, divers
This commit is contained in:
parent
006571df11
commit
82b68985be
BIN
Content/Audio/AttenuationDrone.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Audio/AttenuationDrone.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/AttenuationFriendlyDrone.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Audio/AttenuationFriendlyDrone.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/AttenuationWhaleScream.uasset
(Stored with Git LFS)
BIN
Content/Audio/AttenuationWhaleScream.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/BP_PlayerCharacter.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/BP_PlayerCharacter.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Boss/Boss.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Boss/Boss.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Drone/Brutus.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Drone/Brutus.uasset
(Stored with Git LFS)
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:3f033fa7327606f847643ed182988c32d4efc424df31817b05f9e0a897560f9d
|
|
||||||
size 106759
|
|
||||||
BIN
Content/Blueprints/Drone/DroneBP.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Drone/DroneBP.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Drone/DroneBP_2.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Drone/DroneBP_2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Drone/DroneSeeker2.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Drone/DroneSeeker2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Drone/FlockingZoneBP.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Drone/FlockingZoneBP.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Drone/FriendlyDrone_BP.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Drone/FriendlyDrone_BP.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Drone/oldDroneBP.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Blueprints/Drone/oldDroneBP.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Blueprints/SoundTrigger.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/SoundTrigger.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Maps/OptimizedMap.umap
(Stored with Git LFS)
BIN
Content/Maps/OptimizedMap.umap
(Stored with Git LFS)
Binary file not shown.
@ -47,7 +47,7 @@ void ADrone::BeginPlay()
|
|||||||
Velocity *= MovementSpeed;
|
Velocity *= MovementSpeed;
|
||||||
startInterval = 0.f;
|
startInterval = 0.f;
|
||||||
SetSpeed(MaxSpeed);
|
SetSpeed(MaxSpeed);
|
||||||
SetEnergy(MaxEnergy);
|
SetEnergy(CurrentEnergy);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ADrone::DestroyDrone(const FVector& hit1, const FVector& hit2)
|
void ADrone::DestroyDrone(const FVector& hit1, const FVector& hit2)
|
||||||
|
|||||||
@ -57,7 +57,7 @@ public:
|
|||||||
float FoodValue = 10.0f;
|
float FoodValue = 10.0f;
|
||||||
// the remaining energy
|
// the remaining energy
|
||||||
UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (AllowPrivateAccess))
|
UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (AllowPrivateAccess))
|
||||||
int CurrentEnergy = 100;
|
int CurrentEnergy = 0;
|
||||||
UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (AllowPrivateAccess))
|
UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (AllowPrivateAccess))
|
||||||
float MaxSpeed = 200000;
|
float MaxSpeed = 200000;
|
||||||
// the actual speed
|
// the actual speed
|
||||||
|
|||||||
@ -281,7 +281,8 @@ void APlayerCharacter::ChangeRightHandOrientation(FRotator newRotation)
|
|||||||
|
|
||||||
void APlayerCharacter::ChangeRightHandPosition(FVector newPosition)
|
void APlayerCharacter::ChangeRightHandPosition(FVector newPosition)
|
||||||
{
|
{
|
||||||
RightHandContainer->SetRelativeLocation(newPosition);
|
if (RightHandContainer != nullptr)
|
||||||
|
RightHandContainer->SetRelativeLocation(newPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
void APlayerCharacter::ChangeEnergyTextColor()
|
void APlayerCharacter::ChangeEnergyTextColor()
|
||||||
|
|||||||
@ -108,6 +108,10 @@ void ARailWagon::UpdateWagonLocation()
|
|||||||
// If a RailSpline has been linked, we can safely position our wagon on it
|
// If a RailSpline has been linked, we can safely position our wagon on it
|
||||||
if (RailSpline)
|
if (RailSpline)
|
||||||
{
|
{
|
||||||
|
auto totalLength = RailSpline->GetSplineComponent()->GetSplineLength();
|
||||||
|
if (splineDistance > totalLength)
|
||||||
|
splineDistance = totalLength;
|
||||||
|
|
||||||
FVector location = RailSpline->GetSplineComponent()->GetLocationAtDistanceAlongSpline(splineDistance, ESplineCoordinateSpace::World);
|
FVector location = RailSpline->GetSplineComponent()->GetLocationAtDistanceAlongSpline(splineDistance, ESplineCoordinateSpace::World);
|
||||||
FVector direction = RailSpline->GetSplineComponent()->GetDirectionAtDistanceAlongSpline(splineDistance, ESplineCoordinateSpace::World);
|
FVector direction = RailSpline->GetSplineComponent()->GetDirectionAtDistanceAlongSpline(splineDistance, ESplineCoordinateSpace::World);
|
||||||
|
|
||||||
@ -116,7 +120,7 @@ void ARailWagon::UpdateWagonLocation()
|
|||||||
|
|
||||||
//Spawning Orbs
|
//Spawning Orbs
|
||||||
if((long)splineDistance % 100 == 0) {
|
if((long)splineDistance % 100 == 0) {
|
||||||
FVector orbLocation = RailSpline->GetSplineComponent()->GetLocationAtDistanceAlongSpline(splineDistance+5000, ESplineCoordinateSpace::World);
|
FVector orbLocation = RailSpline->GetSplineComponent()->GetLocationAtDistanceAlongSpline(splineDistance+8000, ESplineCoordinateSpace::World);
|
||||||
RailSpline->SpawnOrbs(orbLocation);
|
RailSpline->SpawnOrbs(orbLocation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user