Merge pull request #466 from aws-lumberyard-dev/MissingPopcornUpgrades

Adding popcorn particles that were upgraded to 2.17.2 to 2.17.3
o3de · Aug 30, 2023 · f00b303 · f00b303
2 parents 9554910 + 7772489
commit f00b303
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 27 deletions.
diff --git a/PopcornFX/Particles/BubbleGun/FX_BubbleGun_Blast.pkfx b/PopcornFX/Particles/BubbleGun/FX_BubbleGun_Blast.pkfx
diff --git a/PopcornFX/Particles/BubbleGun/FX_BubbleGun_Explosion.pkfx b/PopcornFX/Particles/BubbleGun/FX_BubbleGun_Explosion.pkfx
diff --git a/PopcornFX/Particles/BubbleGun/FX_BubbleGun_Projectile.pkfx b/PopcornFX/Particles/BubbleGun/FX_BubbleGun_Projectile.pkfx
diff --git a/PopcornFX/Particles/DefenseTurret/FX_DefenseTurret_Blast.pkfx b/PopcornFX/Particles/DefenseTurret/FX_DefenseTurret_Blast.pkfx
diff --git a/PopcornFX/Particles/DefenseTurret/FX_DefenseTurret_Explosion.pkfx b/PopcornFX/Particles/DefenseTurret/FX_DefenseTurret_Explosion.pkfx
diff --git a/PopcornFX/Particles/DefenseTurret/FX_DefenseTurret_Projectile.pkfx b/PopcornFX/Particles/DefenseTurret/FX_DefenseTurret_Projectile.pkfx
diff --git a/PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_BuildUp.pkfx b/PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_BuildUp.pkfx
diff --git a/PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_Explosion.pkfx b/PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_Explosion.pkfx
diff --git a/PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_Projectile.pkfx b/PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_Projectile.pkfx
diff --git a/PopcornFX/Particles/FX_JumpPad.pkfx b/PopcornFX/Particles/FX_JumpPad.pkfx
diff --git a/PopcornFX/Particles/LaserPistol/FX_LaserPistol.pkfx b/PopcornFX/Particles/LaserPistol/FX_LaserPistol.pkfx
diff --git a/PopcornFX/Particles/LaserPistol/FX_LaserPistol_Blast.pkfx b/PopcornFX/Particles/LaserPistol/FX_LaserPistol_Blast.pkfx
diff --git a/PopcornFX/Particles/LaserPistol/FX_LaserPistol_Display.pkfx b/PopcornFX/Particles/LaserPistol/FX_LaserPistol_Display.pkfx
diff --git a/PopcornFX/Particles/LaserPistol/FX_LaserPistol_Explosion.pkfx b/PopcornFX/Particles/LaserPistol/FX_LaserPistol_Explosion.pkfx
diff --git a/PopcornFX/Particles/LaserPistol/FX_LaserPistol_Ray.pkfx b/PopcornFX/Particles/LaserPistol/FX_LaserPistol_Ray.pkfx
diff --git a/PopcornFX/Particles/MalfunctionningShieldGenerator/FX_EnergyCollector.pkfx b/PopcornFX/Particles/MalfunctionningShieldGenerator/FX_EnergyCollector.pkfx
diff --git a/...X/Particles/MalfunctionningShieldGenerator/FX_MalfunctionningShieldGenerator_BuildUp.pkfx b/...X/Particles/MalfunctionningShieldGenerator/FX_MalfunctionningShieldGenerator_BuildUp.pkfx
diff --git a/...Particles/MalfunctionningShieldGenerator/FX_MalfunctionningShieldGenerator_Explosion.pkfx b/...Particles/MalfunctionningShieldGenerator/FX_MalfunctionningShieldGenerator_Explosion.pkfx
diff --git a/...rnFX/Particles/MalfunctionningShieldGenerator/FX_MalfunctionningShieldGenerator_Idle.pkfx b/...rnFX/Particles/MalfunctionningShieldGenerator/FX_MalfunctionningShieldGenerator_Idle.pkfx
diff --git a/PopcornFX/Particles/VFX_SpeedPowerUp.pkfx b/PopcornFX/Particles/VFX_SpeedPowerUp.pkfx