mirror of
https://github.com/ConjureETS/Octogonia.git
synced 2026-03-24 03:21:11 +00:00
-Added attenuation sound for 3D sperical audio
-Added rumble feature for both the hands -When shooting friendly and enemy drones the corresponding color and damage is applied -Added sound for the drone whales -Added sound of the map
This commit is contained in:
parent
b5c710dd61
commit
163603f9a5
@ -63,7 +63,8 @@ bDefaultViewportMouseLock=True
|
|||||||
-ActionMappings=(ActionName="TriggerLeftHand",Key=MotionController_Left_Trigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
-ActionMappings=(ActionName="TriggerLeftHand",Key=MotionController_Left_Trigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
-ActionMappings=(ActionName="TriggerRightHand",Key=MotionController_Right_Trigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
-ActionMappings=(ActionName="TriggerRightHand",Key=MotionController_Right_Trigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
-ActionMappings=(ActionName="TriggerRightGrip1",Key=MotionController_Right_Grip1,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
-ActionMappings=(ActionName="TriggerRightGrip1",Key=MotionController_Right_Grip1,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
-ActionMappings=(ActionName="TriggerRightGrip1",Key=None,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
-ActionMappings=(ActionName="TriggerRightGrip1",Key=LeftShift,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
|
-ActionMappings=(ActionName="TriggerLeftHand",Key=None,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
+ActionMappings=(ActionName="Jump",Key=SpaceBar,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
+ActionMappings=(ActionName="Jump",Key=SpaceBar,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
+ActionMappings=(ActionName="TriggerLeftHand",Key=LeftMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
+ActionMappings=(ActionName="TriggerLeftHand",Key=LeftMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
+ActionMappings=(ActionName="TriggerRightHand",Key=RightMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
+ActionMappings=(ActionName="TriggerRightHand",Key=RightMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
@ -71,6 +72,7 @@ bDefaultViewportMouseLock=True
|
|||||||
+ActionMappings=(ActionName="TriggerRightHand",Key=MotionController_Right_Trigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
+ActionMappings=(ActionName="TriggerRightHand",Key=MotionController_Right_Trigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
+ActionMappings=(ActionName="TriggerRightGrip1",Key=MotionController_Right_Grip1,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
+ActionMappings=(ActionName="TriggerRightGrip1",Key=MotionController_Right_Grip1,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
+ActionMappings=(ActionName="TriggerRightGrip1",Key=LeftShift,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
+ActionMappings=(ActionName="TriggerRightGrip1",Key=LeftShift,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
|
+ActionMappings=(ActionName="TriggerLeftHand",Key=Gamepad_LeftShoulder,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
|
||||||
-AxisMappings=(AxisName="LookRight",Key=MouseX,Scale=1.000000)
|
-AxisMappings=(AxisName="LookRight",Key=MouseX,Scale=1.000000)
|
||||||
-AxisMappings=(AxisName="LookUp",Key=MouseY,Scale=1.000000)
|
-AxisMappings=(AxisName="LookUp",Key=MouseY,Scale=1.000000)
|
||||||
-AxisMappings=(AxisName="WalkForward",Key=W,Scale=1.000000)
|
-AxisMappings=(AxisName="WalkForward",Key=W,Scale=1.000000)
|
||||||
|
|||||||
BIN
Content/Audio/AttenuationWhaleScream.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Audio/AttenuationWhaleScream.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/RobotWhaleScream-001.wav
(Stored with Git LFS)
Normal file
BIN
Content/Audio/RobotWhaleScream-001.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/RobotWhaleScream-002.wav
(Stored with Git LFS)
Normal file
BIN
Content/Audio/RobotWhaleScream-002.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/RobotWhaleScream-003.wav
(Stored with Git LFS)
Normal file
BIN
Content/Audio/RobotWhaleScream-003.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/RobotWhaleScream-004.wav
(Stored with Git LFS)
Normal file
BIN
Content/Audio/RobotWhaleScream-004.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/RobotWhaleScream-005.wav
(Stored with Git LFS)
Normal file
BIN
Content/Audio/RobotWhaleScream-005.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/RobotWhaleScream-006.wav
(Stored with Git LFS)
Normal file
BIN
Content/Audio/RobotWhaleScream-006.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/RobotWhaleScream.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Audio/RobotWhaleScream.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/RobotWhaleScream.wav
(Stored with Git LFS)
Normal file
BIN
Content/Audio/RobotWhaleScream.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Audio/RobotWhaleScream.wv
Normal file
BIN
Content/Audio/RobotWhaleScream.wv
Normal file
Binary file not shown.
BIN
Content/Audio/RobotWhaleSoundEffect.wav
(Stored with Git LFS)
Normal file
BIN
Content/Audio/RobotWhaleSoundEffect.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Blueprints/BP_EnergyOrb.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/BP_EnergyOrb.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/BP_RailPod.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/BP_RailPod.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/Left_Controller_Rumble.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Blueprints/Left_Controller_Rumble.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Blueprints/NewForceFeedbackEffect.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Blueprints/NewForceFeedbackEffect.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Blueprints/Right_Controller_Rumble.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Blueprints/Right_Controller_Rumble.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Blueprints/SoundTrigger.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Blueprints/SoundTrigger.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Blueprints/SoundTriggrer.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Blueprints/SoundTriggrer.uasset
(Stored with Git LFS)
Normal file
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.
@ -133,6 +133,8 @@ void APlayerCharacter::TriggerRightHandPressed()
|
|||||||
if (EnergyLevel > 0) {
|
if (EnergyLevel > 0) {
|
||||||
isShooting = true;
|
isShooting = true;
|
||||||
IsShootingChange();
|
IsShootingChange();
|
||||||
|
//device.TriggerHapticPulse(10, Valve.VR.EVRButtonId.k_EButton_SteamVR_TouchPad);
|
||||||
|
//USteamVRFunctionLibrary::
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -190,57 +192,60 @@ void APlayerCharacter::ShootLaser(USceneComponent *handSocket, float DeltaTime)
|
|||||||
|
|
||||||
if (EnergyLevel > 0)
|
if (EnergyLevel > 0)
|
||||||
{
|
{
|
||||||
if (!isInHealingMode)
|
|
||||||
{
|
|
||||||
DrawDebugLine(GetWorld(), startLocation, endLocation, colorDamage, true, DeltaTime*1.1, 0, 2);
|
|
||||||
//ShootParticleEffect(startLocation,endLocation,colorDamage);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DrawDebugLine(GetWorld(), startLocation, endLocation, colorHealing, true, DeltaTime*1.1, 0, 2);
|
|
||||||
//ShootParticleEffect(startLocation,endLocation,colorHealing);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
isInHealingMode = false;
|
||||||
FHitResult hitResult;
|
FHitResult hitResult;
|
||||||
GetWorld()->LineTraceSingleByChannel(hitResult,
|
GetWorld()->LineTraceSingleByChannel(hitResult,
|
||||||
startLocation,
|
startLocation,
|
||||||
endLocation,
|
endLocation,
|
||||||
ECC_Visibility);
|
ECC_Visibility);
|
||||||
|
|
||||||
|
//0DrawDebugLine(GetWorld(), startLocation, endLocation, colorDamage, true, DeltaTime*1.1, 0, 2);
|
||||||
|
//ShootParticleEffect(startLocation,endLocation,colorDamage);
|
||||||
|
|
||||||
|
|
||||||
if (hitResult.GetActor() && hitResult.GetActor()->IsA(ADrone::StaticClass()))
|
if (hitResult.GetActor() && hitResult.GetActor()->IsA(ADrone::StaticClass()))
|
||||||
{
|
{
|
||||||
ADrone* Drone = Cast<ADrone>(hitResult.GetActor());
|
ADrone* Drone = Cast<ADrone>(hitResult.GetActor());
|
||||||
if (!isInHealingMode)
|
|
||||||
{
|
|
||||||
if (!Drone->IsFriendly)
|
if (!Drone->IsFriendly)
|
||||||
{
|
{
|
||||||
Drone->DamageDrone(LaserDPF*DeltaTime, hitResult.ImpactPoint, (endLocation - startLocation).GetSafeNormal(), 1000);
|
Drone->DamageDrone(LaserDPF*DeltaTime, hitResult.ImpactPoint, (endLocation - startLocation).GetSafeNormal(), 1000);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (Drone->IsFriendly)
|
|
||||||
{
|
isInHealingMode = true;
|
||||||
Drone->RestoreEnergy(LaserHPF*DeltaTime);
|
Drone->RestoreEnergy(LaserHPF*DeltaTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (hitResult.GetActor() && hitResult.GetActor()->IsA(ASeekerDrone::StaticClass()))
|
if (hitResult.GetActor() && hitResult.GetActor()->IsA(ASeekerDrone::StaticClass()))
|
||||||
{
|
{
|
||||||
ASeekerDrone* Seeker = Cast<ASeekerDrone>(hitResult.GetActor());
|
ASeekerDrone* Seeker = Cast<ASeekerDrone>(hitResult.GetActor());
|
||||||
if (!isInHealingMode)
|
|
||||||
{
|
|
||||||
Seeker->ApplyDamage(LaserDPF*DeltaTime);
|
Seeker->ApplyDamage(LaserDPF*DeltaTime);
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
if (hitResult.GetComponent() && hitResult.GetComponent()->IsA(UDestructibleComponent::StaticClass()))
|
if (hitResult.GetComponent() && hitResult.GetComponent()->IsA(UDestructibleComponent::StaticClass()))
|
||||||
{
|
{
|
||||||
UDestructibleComponent* Destructible = Cast<UDestructibleComponent>(hitResult.GetComponent());
|
UDestructibleComponent* Destructible = Cast<UDestructibleComponent>(hitResult.GetComponent());
|
||||||
Destructible->ApplyDamage(LaserDPF*DeltaTime, hitResult.ImpactPoint, (endLocation - startLocation).GetSafeNormal(), 1000);
|
Destructible->ApplyDamage(LaserDPF*DeltaTime, hitResult.ImpactPoint, (endLocation - startLocation).GetSafeNormal(), 1000);
|
||||||
}
|
|
||||||
|
|
||||||
|
}
|
||||||
|
if (!isInHealingMode)
|
||||||
|
{
|
||||||
|
ChangeGunMaterial();
|
||||||
|
ChangeEnergyTextColor();
|
||||||
|
DrawDebugLine(GetWorld(), startLocation, endLocation, colorDamage, true, DeltaTime*1.1, 0, 2);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ChangeGunMaterial();
|
||||||
|
ChangeEnergyTextColor();
|
||||||
|
DrawDebugLine(GetWorld(), startLocation, endLocation, colorHealing, true, DeltaTime*1.1, 0, 2);
|
||||||
|
}
|
||||||
ModifyEnergy(-LaserEnergyDrain);
|
ModifyEnergy(-LaserEnergyDrain);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user