Hard Light Productions Forums
Modding, Mission Design, and Coding => FS2 Open Coding - The Source Code Project (SCP) => Nightly Builds => Topic started by: SirKnightly on January 31, 2025, 12:47:36 am
-
Here is the nightly for 31 January 2025 - Revision 028a03748
Group: Linux
nightly_20250131_028a03748-builds-Linux.tar.gz (https://scp.indiegames.us/builds/nightly/20250131_028a03748/nightly_20250131_028a03748-builds-Linux.tar.gz) (Mirror (https://perses.feralhosting.com/datacorder/builds/nightly/20250131_028a03748/nightly_20250131_028a03748-builds-Linux.tar.gz))
Group: MacOSX-arm64
nightly_20250131_028a03748-builds-Mac-arm64.tar.gz (https://scp.indiegames.us/builds/nightly/20250131_028a03748/nightly_20250131_028a03748-builds-Mac-arm64.tar.gz) (Mirror (https://perses.feralhosting.com/datacorder/builds/nightly/20250131_028a03748/nightly_20250131_028a03748-builds-Mac-arm64.tar.gz))
Group: MacOSX-x86_64
nightly_20250131_028a03748-builds-Mac-x86_64.tar.gz (https://scp.indiegames.us/builds/nightly/20250131_028a03748/nightly_20250131_028a03748-builds-Mac-x86_64.tar.gz) (Mirror (https://perses.feralhosting.com/datacorder/builds/nightly/20250131_028a03748/nightly_20250131_028a03748-builds-Mac-x86_64.tar.gz))
Group: Win32-SSE2
nightly_20250131_028a03748-builds-Win32-SSE2.zip (https://scp.indiegames.us/builds/nightly/20250131_028a03748/nightly_20250131_028a03748-builds-Win32-SSE2.zip) (Mirror (https://perses.feralhosting.com/datacorder/builds/nightly/20250131_028a03748/nightly_20250131_028a03748-builds-Win32-SSE2.zip))
Group: Win64-SSE2
nightly_20250131_028a03748-builds-x64-SSE2.zip (https://scp.indiegames.us/builds/nightly/20250131_028a03748/nightly_20250131_028a03748-builds-x64-SSE2.zip) (Mirror (https://perses.feralhosting.com/datacorder/builds/nightly/20250131_028a03748/nightly_20250131_028a03748-builds-x64-SSE2.zip))
------------------------------------------------------------------------
commit b4905d111
Author: BMagnu
Commit: GitHub
Fix outputs being not passed along in input-only derive case (#6558)
code/utils/modular_curves.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit d9e859aac
Author: BMagnu
Commit: BMagnu
Remove Typo and fix volumetrics merge issue
code/globalincs/type_traits.h | 12 ++++++------
code/nebula/volumetrics.cpp | 2 +-
code/utils/modular_curves.h | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
------------------------------------------------------------------------
commit 88d7bbf57
Author: Goober5000
Commit: Goober5000
fix random sidethrust call
code/ai/aibig.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit 64bfc4a32
Author: BMagnu
Commit: BMagnu
Allow Submodel hosts for non-ship objects
code/particle/hosts/EffectHostSubmodel.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit 45c7ee1a4
Author: Birk Magnussen
Commit: Birk Magnussen
Get rid of cast warnings on MSVC
code/ship/ship.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit 284fb4a30
Author: Birk Magnussen
Commit: Birk Magnussen
Even More MSVC warnings
code/ship/ship.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit a2a191082
Author: Birk Magnussen
Commit: Birk Magnussen
More MSVC warnings + clang tidy
code/ship/ship.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 05259a5b6
Author: Birk Magnussen
Commit: Birk Magnussen
Make sure that clang does accept implicit random range copy constructors
code/utils/RandomRange.h | 1 -
1 file changed, 1 deletion(-)
------------------------------------------------------------------------
commit aecc2ab31
Author: Birk Magnussen
Commit: Birk Magnussen
Fix macos target
cmake/platform-darwin.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit 6ab3d5310
Author: Birk Magnussen
Commit: Birk Magnussen
Fix template deduction for GCC pre 14
code/utils/RandomRange.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
------------------------------------------------------------------------
commit 55bb2095b
Author: Birk Magnussen
Commit: Birk Magnussen
Clang tends to have weird behaviour for is_convertible apparently
code/utils/RandomRange.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
------------------------------------------------------------------------
commit d19f36a58
Author: Birk Magnussen
Commit: Birk Magnussen
Remove incorrect forward
code/utils/RandomRange.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit ec0e55d07
Author: Birk Magnussen
Commit: Birk Magnussen
De-movify random ranges
code/particle/ParticleEffect.cpp | 16 +++++++-------
code/particle/ParticleManager.cpp | 2 +-
code/particle/particle.cpp | 2 +-
code/particle/volumes/ConeVolume.cpp | 2 +-
code/ship/ship.cpp | 14 ++++++------
code/utils/RandomRange.h | 43 ++++++++++++++++++++++--------------
code/weapon/weapons.cpp | 12 +++++-----
7 files changed, 50 insertions(+), 41 deletions(-)
------------------------------------------------------------------------
commit ec027bde8
Author: Birk Magnussen
Commit: Birk Magnussen
Fix compile issues
code/globalincs/type_traits.h | 2 +-
code/particle/ParticleEffect.cpp | 4 ++--
code/weapon/weapons.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit 8323d9ed2
Author: Birk Magnussen
Commit: Birk Magnussen
Fix parsing
code/particle/ParticleParse.cpp | 8 ++++++--
code/particle/volumes/ConeVolume.cpp | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit b22716a4d
Author: Birk Magnussen
Commit: Birk Magnussen
remove no longer required delay restriction
code/particle/ParticleParse.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
------------------------------------------------------------------------
commit 783ebba5a
Author: Birk Magnussen
Commit: Birk Magnussen
Finish parsing
code/particle/ParticleParse.cpp | 51 +++++++++++++++++++++++++++++++++++++----
1 file changed, 46 insertions(+), 5 deletions(-)
------------------------------------------------------------------------
commit bcaac067f
Author: Birk Magnussen
Commit: Birk Magnussen
Modern basic particle parsing
code/particle/ParticleParse.cpp | 164 ++++++++++++++++++++++++----------------
1 file changed, 98 insertions(+), 66 deletions(-)
------------------------------------------------------------------------
commit 621d88e9b
Author: BMagnu
Commit: BMagnu
Make length a modular curve output
code/particle/ParticleEffect.cpp | 3 ++-
code/particle/ParticleEffect.h | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit 7390e686c
Author: BMagnu
Commit: BMagnu
Allow actual cones
code/particle/volumes/ConeVolume.cpp | 8 ++++----
code/particle/volumes/ConeVolume.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
------------------------------------------------------------------------
commit a2e14b058
Author: Birk Magnussen
Commit: Birk Magnussen
Add parser modules for everything
code/particle/ParticleParse.cpp | 84 +++++++++++++++++++++++++++++++++++++----
1 file changed, 76 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit df4c12330
Author: Birk Magnussen
Commit: Birk Magnussen
Volume Parsing
code/particle/ParticleParse.cpp | 28 +++++++++++++++++++++++++++-
code/particle/volumes/ConeVolume.cpp | 26 ++++++++++++++++++++++++++
code/particle/volumes/ConeVolume.h | 5 ++---
code/particle/volumes/SpheroidVolume.cpp | 14 ++++++++++++++
code/particle/volumes/SpheroidVolume.h | 5 ++---
5 files changed, 71 insertions(+), 7 deletions(-)
------------------------------------------------------------------------
commit 40312e741
Author: Birk Magnussen
Commit: Birk Magnussen
Add modular curve sets to volumes
code/particle/ParticleEffect.cpp | 24 ++++++++++++++----------
code/particle/ParticleEffect.h | 24 ++++++++++++++++++++----
code/particle/ParticleSource.cpp | 20 +++++++++++++-------
code/particle/ParticleSource.h | 12 +++++-------
code/particle/ParticleVolume.h | 2 +-
code/particle/volumes/ConeVolume.cpp | 11 ++++++-----
code/particle/volumes/ConeVolume.h | 12 ++++++++++--
code/particle/volumes/LegacyAACuboidVolume.cpp | 6 +++---
code/particle/volumes/LegacyAACuboidVolume.h | 10 +++++++++-
code/particle/volumes/SpheroidVolume.cpp | 19 +++++++++++--------
code/particle/volumes/SpheroidVolume.h | 12 +++++++++++-
code/ship/ship.cpp | 4 ++--
code/utils/modular_curves.h | 9 +++++++++
13 files changed, 114 insertions(+), 51 deletions(-)
------------------------------------------------------------------------
commit 5272604c8
Author: Birk Magnussen
Commit: Birk Magnussen
Integrate type_traits
code/globalincs/type_traits.h | 13 +++++++++++++
code/utils/RandomRange.h | 10 +---------
2 files changed, 14 insertions(+), 9 deletions(-)
------------------------------------------------------------------------
commit 7773b429d
Author: BMagnu
Commit: BMagnu
Typo
code/particle/volumes/LegacyAACuboidVolume.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit 2aac63e0a
Author: BMagnu
Commit: BMagnu
Allow particle volumes to have access to the source for modular curves
code/particle/ParticleEffect.cpp | 4 ++--
code/particle/ParticleEffect.h | 20 ++++++++++----------
code/particle/ParticleVolume.h | 3 ++-
code/particle/volumes/ConeVolume.cpp | 2 +-
code/particle/volumes/ConeVolume.h | 2 +-
code/particle/volumes/LegacyAACuboidVolume.cpp | 10 ++++++----
code/particle/volumes/LegacyAACuboidVolume.h | 13 ++++++++++++-
code/particle/volumes/SpheroidVolume.cpp | 2 +-
code/particle/volumes/SpheroidVolume.h | 2 +-
code/ship/ship.cpp | 12 ++++++++++--
code/utils/modular_curves.h | 10 ++++++++++
11 files changed, 56 insertions(+), 24 deletions(-)
------------------------------------------------------------------------
commit 2ed3b62e0
Author: BMagnu
Commit: BMagnu
Curvify thruster particles
code/model/modelrender.cpp | 14 +++-----------
code/particle/ParticleEffect.h | 25 +++++++++++--------------
code/particle/hosts/EffectHostVector.cpp | 21 ++++++++++++++++++---
code/particle/hosts/EffectHostVector.h | 9 ++++++++-
code/ship/ship.cpp | 19 ++++++++++++++++---
code/ship/shipfx.cpp | 4 +++-
6 files changed, 59 insertions(+), 33 deletions(-)
------------------------------------------------------------------------
commit 13e3f577e
Author: BMagnu
Commit: BMagnu
Deal with split particle velocity curves
code/particle/EffectHost.h | 2 +-
code/particle/hosts/EffectHostVector.cpp | 11 +++++++++--
code/particle/hosts/EffectHostVector.h | 6 +++++-
code/ship/ship.cpp | 18 +++++++++++++++++-
code/ship/shipfx.cpp | 8 +-------
5 files changed, 33 insertions(+), 12 deletions(-)
------------------------------------------------------------------------
commit c2051578d
Author: BMagnu
Commit: BMagnu
Basic modular curves for particles
code/model/modelread.cpp | 74 ------------
code/particle/EffectHost.h | 22 ++--
code/particle/ParticleEffect.cpp | 28 +++--
code/particle/ParticleEffect.h | 42 +++++--
code/particle/ParticleSource.cpp | 7 +-
code/particle/ParticleSource.h | 10 +-
code/particle/hosts/EffectHostBeam.cpp | 12 +-
code/particle/hosts/EffectHostBeam.h | 10 +-
code/particle/hosts/EffectHostObject.cpp | 12 +-
code/particle/hosts/EffectHostObject.h | 10 +-
code/particle/hosts/EffectHostParticle.cpp | 10 +-
code/particle/hosts/EffectHostParticle.h | 12 +-
code/particle/hosts/EffectHostSubmodel.cpp | 12 +-
code/particle/hosts/EffectHostSubmodel.h | 10 +-
code/particle/hosts/EffectHostTurret.cpp | 12 +-
code/particle/hosts/EffectHostTurret.h | 10 +-
code/particle/hosts/EffectHostVector.cpp | 4 +-
code/particle/hosts/EffectHostVector.h | 4 +-
code/ship/ship.cpp | 178 ++++++++++++++++++++---------
19 files changed, 266 insertions(+), 213 deletions(-)
------------------------------------------------------------------------
commit 605082134
Author: BMagnu
Commit: BMagnu
make modular_curves work with member funcs and smart pointers
code/globalincs/type_traits.h | 28 +++++++++++++++++++++++++++-
code/utils/modular_curves.h | 27 ++++++++++++++++++++-------
2 files changed, 47 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit 12ad35e10
Author: BMagnu
Commit: BMagnu
restore shield_impact_explosion_radius
code/particle/ParticleEffect.cpp | 2 +-
code/particle/ParticleEffect.h | 5 +++
code/utils/RandomRange.h | 95 +++++++++++++++++++++++++---------------
code/weapon/weapons.cpp | 14 ++++--
4 files changed, 76 insertions(+), 40 deletions(-)
------------------------------------------------------------------------
commit 50ac2b810
Author: Birk Magnussen
Commit: Birk Magnussen
remove redundant function
code/particle/particle.cpp | 11 -----------
1 file changed, 11 deletions(-)
------------------------------------------------------------------------
commit 189803a6a
Author: BMagnu
Commit: BMagnu
Allow modern particles for ship / thruster particles
code/ship/ship.cpp | 136 ++++++++++++++++++++++++++++-------------------------
code/ship/ship.h | 2 -
2 files changed, 73 insertions(+), 65 deletions(-)
------------------------------------------------------------------------
commit fe815f89c
Author: Birk Magnussen
Commit: Birk Magnussen
Set pre-curve lifetime for damage-spew and similar to 1
code/ship/ship.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 32835b06f
Author: Birk Magnussen
Commit: Birk Magnussen
Small cleanups
code/particle/ParticleEffect.cpp | 85 ++++++++++++++++++++++------------------
code/particle/ParticleEffect.h | 73 ++++++++++++++++------------------
code/particle/ParticleParse.cpp | 10 ++---
3 files changed, 85 insertions(+), 83 deletions(-)
------------------------------------------------------------------------
commit 1f7909112
Author: Birk Magnussen
Commit: Birk Magnussen
Remove particle properties
code/particle/ParticleEffect.cpp | 88 +++++++++++++----
code/particle/ParticleEffect.h | 26 ++++-
code/particle/ParticleParse.cpp | 77 ++++++++++++++-
code/particle/util/ParticleProperties.cpp | 159 ------------------------------
code/particle/util/ParticleProperties.h | 67 -------------
code/source_groups.cmake | 5 -
6 files changed, 163 insertions(+), 259 deletions(-)
------------------------------------------------------------------------
commit 3d171eb85
Author: Birk Magnussen
Commit: Birk Magnussen
Remove EffectTiming
code/particle/ParticleEffect.cpp | 20 +++++++++--
code/particle/ParticleEffect.h | 24 ++++++++++---
code/particle/ParticleParse.cpp | 34 ++++++++++++++++--
code/particle/ParticleSource.cpp | 13 ++-----
code/particle/hosts/EffectHostBeam.cpp | 2 +-
code/particle/util/EffectTiming.cpp | 50 ---------------------------
code/particle/util/EffectTiming.h | 63 ----------------------------------
code/source_groups.cmake | 2 --
8 files changed, 73 insertions(+), 135 deletions(-)
------------------------------------------------------------------------
commit e2dbb46b9
Author: Birk Magnussen
Commit: Birk Magnussen
Fold OmniEffect into ParticleEffect
code/actions/types/ParticleEffectAction.cpp | 1 +
code/actions/types/ParticleEffectAction.h | 1 -
code/debris/debris.cpp | 2 +-
.../{effects/OmniEffect.cpp => ParticleEffect.cpp} | 66 +++++-----
code/particle/ParticleEffect.h | 138 ++++++++++++++-------
code/particle/ParticleManager.cpp | 2 +-
code/particle/ParticleManager.h | 6 +-
code/particle/ParticleParse.cpp | 2 +-
code/particle/ParticleSource.h | 2 +-
code/particle/effects/OmniEffect.h | 103 ---------------
code/particle/util/EffectTiming.h | 3 +-
code/ship/ship.cpp | 2 +-
code/source_groups.cmake | 6 +-
code/starfield/supernova.cpp | 2 +-
code/weapon/weapons.cpp | 2 +-
15 files changed, 138 insertions(+), 200 deletions(-)
------------------------------------------------------------------------
commit 1aa67c934
Author: Birk Magnussen
Commit: Birk Magnussen
Properly use new effect host
code/actions/types/ParticleEffectAction.cpp | 11 +-
code/ai/aiturret.cpp | 11 +-
code/debris/debris.cpp | 8 +-
code/model/modelrender.cpp | 7 +-
code/particle/EffectHost.h | 4 +
code/particle/ParticleManager.cpp | 4 -
code/particle/ParticleManager.h | 9 +-
code/particle/ParticleParse.cpp | 1 -
code/particle/ParticleSource.cpp | 74 ++-----------
code/particle/ParticleSource.h | 154 +---------------------------
code/particle/effects/OmniEffect.cpp | 16 +--
code/particle/hosts/EffectHostBeam.cpp | 4 +
code/particle/hosts/EffectHostBeam.h | 1 +
code/particle/hosts/EffectHostObject.cpp | 16 ++-
code/particle/hosts/EffectHostObject.h | 1 +
code/particle/hosts/EffectHostParticle.cpp | 5 +
code/particle/hosts/EffectHostParticle.h | 1 +
code/particle/hosts/EffectHostSubmodel.cpp | 5 +-
code/particle/hosts/EffectHostSubmodel.h | 2 +
code/particle/hosts/EffectHostTurret.cpp | 5 +-
code/particle/hosts/EffectHostTurret.h | 2 +
code/particle/hosts/EffectHostVector.cpp | 3 +
code/particle/hosts/EffectHostVector.h | 2 +
code/ship/ship.cpp | 19 ++--
code/ship/shipfx.cpp | 33 ++----
code/starfield/supernova.cpp | 15 +--
code/weapon/beam.cpp | 74 +++++--------
code/weapon/weapons.cpp | 56 ++++------
28 files changed, 150 insertions(+), 393 deletions(-)
------------------------------------------------------------------------
commit 98ddb1500
Author: Birk Magnussen
Commit: Birk Magnussen
Add sensible particle host class
code/particle/EffectHost.h | 30 ++
code/particle/ParticleEffect.h | 6 +-
code/particle/ParticleManager.cpp | 8 +-
code/particle/ParticleManager.h | 2 +-
code/particle/ParticleSource.cpp | 480 +----------------------------
code/particle/ParticleSource.h | 65 +---
code/particle/ParticleSourceWrapper.cpp | 149 ---------
code/particle/ParticleSourceWrapper.h | 75 -----
code/particle/effects/OmniEffect.cpp | 81 ++---
code/particle/effects/OmniEffect.h | 4 +-
code/particle/hosts/EffectHostBeam.cpp | 54 ++++
code/particle/hosts/EffectHostBeam.h | 21 ++
code/particle/hosts/EffectHostObject.cpp | 90 ++++++
code/particle/hosts/EffectHostObject.h | 24 ++
code/particle/hosts/EffectHostParticle.cpp | 57 ++++
code/particle/hosts/EffectHostParticle.h | 21 ++
code/particle/hosts/EffectHostSubmodel.cpp | 65 ++++
code/particle/hosts/EffectHostSubmodel.h | 19 ++
code/particle/hosts/EffectHostTurret.cpp | 72 +++++
code/particle/hosts/EffectHostTurret.h | 17 +
code/particle/hosts/EffectHostVector.cpp | 22 ++
code/particle/hosts/EffectHostVector.h | 16 +
code/particle/util/ParticleProperties.cpp | 4 +-
code/particle/util/ParticleProperties.h | 2 +-
code/source_groups.cmake | 18 +-
25 files changed, 592 insertions(+), 810 deletions(-)
------------------------------------------------------------------------
commit e28671ff9
Author: Birk Magnussen
Commit: Birk Magnussen
Assign the correct flash particle variable
code/weapon/weapons.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit bb3e50832
Author: Birk Magnussen
Commit: Birk Magnussen
Fix particle end conditions and vector-based orientations for offset
code/particle/ParticleSource.cpp | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit c0f5b0ba8
Author: Birk Magnussen
Commit: Birk Magnussen
Properly deal with always-particle sources
code/particle/ParticleSource.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit c513ab5ad
Author: Birk Magnussen
Commit: Birk Magnussen
Fix legacy particle lifetime when built-in bitmap is used
code/debris/debris.cpp | 1 +
code/particle/effects/OmniEffect.cpp | 3 ++-
code/particle/effects/OmniEffect.h | 1 +
code/ship/ship.cpp | 3 +++
code/starfield/supernova.cpp | 1 +
code/weapon/weapons.cpp | 7 +++++++
6 files changed, 15 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit bd1792d77
Author: BMagnu
Commit: BMagnu
Move Effect timing into the ParticleSource.
code/particle/ParticleEffect.h | 22 ++----
code/particle/ParticleManager.cpp | 4 -
code/particle/ParticleSource.cpp | 121 +++++++++--------------------
code/particle/ParticleSource.h | 84 +-------------------
code/particle/ParticleSourceWrapper.cpp | 8 --
code/particle/ParticleSourceWrapper.h | 2 -
code/particle/effects/OmniEffect.cpp | 132 ++++++++++++++------------------
code/particle/effects/OmniEffect.h | 5 +-
code/particle/util/EffectTiming.cpp | 72 -----------------
code/particle/util/EffectTiming.h | 27 +------
10 files changed, 109 insertions(+), 368 deletions(-)
------------------------------------------------------------------------
commit c937bc6bb
Author: BMagnu
Commit: BMagnu
Actually get rid of particle emitters
code/particle/particle.cpp | 84 ----------------------------------------------
code/particle/particle.h | 24 -------------
code/weapon/weapons.cpp | 3 --
3 files changed, 111 deletions(-)
------------------------------------------------------------------------
commit a79c23be0
Author: BMagnu
Commit: BMagnu
Add orientation-based velocity inherit for beampiercingeffects
code/debris/debris.cpp | 1 +
code/particle/effects/OmniEffect.cpp | 7 +++++++
code/particle/effects/OmniEffect.h | 3 +++
code/ship/ship.cpp | 3 +++
code/starfield/supernova.cpp | 1 +
code/weapon/weapons.cpp | 15 +++++++++++----
6 files changed, 26 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit c16dfba84
Author: Birk Magnussen
Commit: Birk Magnussen
Fix directional scaling
code/particle/effects/OmniEffect.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit 9b2d069bf
Author: Birk Magnussen
Commit: Birk Magnussen
Actually apply rotation to the cone volume
code/particle/volumes/ConeVolume.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit 39c6dc788
Author: Birk Magnussen
Commit: Birk Magnussen
Fix default ship particle parameters
code/ship/ship.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit 2bba61a4b
Author: Birk Magnussen
Commit: Birk Magnussen
Account for negative velocities in particle setup for weapons, again
code/weapon/weapons.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 8e1474f01
Author: Birk Magnussen
Commit: Birk Magnussen
Account for negative velocities in particle setup for weapons
code/weapon/weapons.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 92473780d
Author: Birk Magnussen
Commit: Birk Magnussen
Fix correct random range constructor overlaod
code/utils/RandomRange.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit b9b7a1358
Author: Birk Magnussen
Commit: Birk Magnussen
Fix source bugs
code/particle/ParticleParse.cpp | 1 +
code/particle/ParticleSource.cpp | 10 +++++++---
code/particle/ParticleSource.h | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit 0ec845b4c
Author: Birk Magnussen
Commit: Birk Magnussen
Make builtin particle sources actually anonymous
code/debris/debris.cpp | 2 +-
code/particle/ParticleParse.cpp | 4 +++-
code/ship/ship.cpp | 23 ++++++++++-------------
code/starfield/supernova.cpp | 2 +-
code/weapon/weapons.cpp | 17 +++++------------
5 files changed, 20 insertions(+), 28 deletions(-)
------------------------------------------------------------------------
commit 562c39d8b
Author: Birk Magnussen
Commit: Birk Magnussen
fix parse
code/particle/ParticleParse.cpp | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
------------------------------------------------------------------------
commit 09d8ffe66
Author: Birk Magnussen
Commit: Birk Magnussen
Do legacy parsin
code/parse/parselo.h | 2 +-
code/particle/ParticleEffect.h | 26 ---
code/particle/ParticleManager.cpp | 346 +++------------------------------
code/particle/ParticleManager.h | 14 +-
code/particle/ParticleParse.cpp | 360 +++++++++++++++++++++++++++++++++++
code/particle/effects/OmniEffect.cpp | 13 +-
code/particle/effects/OmniEffect.h | 13 +-
code/particle/volumes/ConeVolume.cpp | 2 +
code/particle/volumes/ConeVolume.h | 5 +
code/source_groups.cmake | 1 +
10 files changed, 417 insertions(+), 365 deletions(-)
------------------------------------------------------------------------
commit db4ec11fd
Author: Birk Magnussen
Commit: Birk Magnussen
Remove redundant effects
code/debris/debris.cpp | 2 +-
code/model/modelread.cpp | 5 +-
code/particle/ParticleManager.cpp | 195 +++++++++++++++--
code/particle/effects/BeamPiercingEffect.cpp | 77 -------
code/particle/effects/BeamPiercingEffect.h | 37 ----
code/particle/effects/CompositeEffect.cpp | 43 ----
code/particle/effects/CompositeEffect.h | 37 ----
code/particle/effects/ConeShape.h | 66 ------
code/particle/effects/GenericShapeEffect.h | 264 ------------------------
code/particle/effects/ParticleEmitterEffect.cpp | 48 -----
code/particle/effects/ParticleEmitterEffect.h | 37 ----
code/particle/effects/SingleParticleEffect.cpp | 84 --------
code/particle/effects/SingleParticleEffect.h | 46 -----
code/particle/effects/SphereShape.h | 55 -----
code/particle/effects/VolumeEffect.cpp | 178 ----------------
code/particle/effects/VolumeEffect.h | 52 -----
code/source_groups.cmake | 13 --
17 files changed, 177 insertions(+), 1062 deletions(-)
------------------------------------------------------------------------
commit 53047638b
Author: Birk Magnussen
Commit: Birk Magnussen
Replace final legacy effect with omni effect
code/particle/effects/OmniEffect.cpp | 5 +
code/particle/volumes/SpheroidVolume.cpp | 2 +
code/particle/volumes/SpheroidVolume.h | 5 +
code/weapon/weapons.cpp | 231 +++++++++++++++++++++----------
4 files changed, 170 insertions(+), 73 deletions(-)
------------------------------------------------------------------------
commit 63a18b28f
Author: Birk Magnussen
Commit: Birk Magnussen
Update Ship and Supernova effects to Omni
code/debris/debris.cpp | 2 +-
code/particle/ParticleVolume.h | 2 +
code/particle/effects/OmniEffect.cpp | 10 +-
code/particle/effects/OmniEffect.h | 8 +-
code/ship/ship.cpp | 266 +++++++++++++++++------------------
code/ship/ship.h | 5 -
code/starfield/supernova.cpp | 35 +++--
7 files changed, 159 insertions(+), 169 deletions(-)
------------------------------------------------------------------------
commit 8503c8a06
Author: BMagnu
Commit: Birk Magnussen
Start replacing legacy effects with omnieffect
code/debris/debris.cpp | 33 ++++++++++++----------
code/model/modelread.cpp | 6 ++--
code/particle/ParticleEffect.h | 13 ++++++---
code/particle/ParticleManager.cpp | 37 +++++++++++++++----------
code/particle/ParticleManager.h | 18 ++++++++----
code/particle/ParticleSource.h | 1 -
code/particle/effects/BeamPiercingEffect.h | 4 +--
code/particle/effects/CompositeEffect.cpp | 2 +-
code/particle/effects/CompositeEffect.h | 2 +-
code/particle/effects/GenericShapeEffect.h | 4 +--
code/particle/effects/OmniEffect.cpp | 20 ++++++-------
code/particle/effects/OmniEffect.h | 9 ++----
code/particle/effects/ParticleEmitterEffect.cpp | 2 +-
code/particle/effects/ParticleEmitterEffect.h | 2 +-
code/particle/effects/SingleParticleEffect.cpp | 2 +-
code/particle/effects/SingleParticleEffect.h | 2 +-
code/particle/effects/VolumeEffect.cpp | 2 +-
code/particle/effects/VolumeEffect.h | 2 +-
code/particle/volumes/LegacyAACuboidVolume.cpp | 2 ++
code/particle/volumes/LegacyAACuboidVolume.h | 5 ++++
20 files changed, 100 insertions(+), 68 deletions(-)
------------------------------------------------------------------------
commit e0c2ba701
Author: Birk Magnussen
Commit: Birk Magnussen
Prepare for the removal of composite effects
code/actions/types/ParticleEffectAction.cpp | 2 +
code/ai/aiturret.cpp | 1 +
code/debris/debris.cpp | 1 +
code/lab/manager/lab_manager.cpp | 1 +
code/lab/renderer/lab_renderer.cpp | 1 +
code/model/modelread.cpp | 4 +-
code/model/modelrender.cpp | 1 +
code/particle/ParticleEffect.h | 2 +-
code/particle/ParticleManager.cpp | 77 ++++++-------------------
code/particle/ParticleManager.h | 15 ++---
code/particle/ParticleSource.cpp | 16 ++++-
code/particle/ParticleSource.h | 15 +++--
code/particle/effects/BeamPiercingEffect.cpp | 2 +-
code/particle/effects/BeamPiercingEffect.h | 2 +-
code/particle/effects/CompositeEffect.cpp | 7 ++-
code/particle/effects/CompositeEffect.h | 2 +-
code/particle/effects/ConeShape.h | 2 +-
code/particle/effects/GenericShapeEffect.h | 2 +-
code/particle/effects/OmniEffect.cpp | 4 +-
code/particle/effects/OmniEffect.h | 2 +-
code/particle/effects/ParticleEmitterEffect.cpp | 2 +-
code/particle/effects/ParticleEmitterEffect.h | 2 +-
code/particle/effects/SingleParticleEffect.cpp | 2 +-
code/particle/effects/SingleParticleEffect.h | 2 +-
code/particle/effects/SphereShape.h | 2 +-
code/particle/effects/VolumeEffect.cpp | 2 +-
code/particle/effects/VolumeEffect.h | 2 +-
code/particle/util/ParticleProperties.cpp | 6 +-
code/particle/util/ParticleProperties.h | 6 +-
code/ship/ship.cpp | 1 +
code/ship/shipfx.cpp | 3 +-
code/starfield/supernova.cpp | 1 +
code/weapon/beam.cpp | 1 +
code/weapon/weapons.cpp | 11 ++--
34 files changed, 93 insertions(+), 109 deletions(-)
------------------------------------------------------------------------
commit 989e21622
Author: BMagnu
Commit: Birk Magnussen
Allow creating of OmniParticleEffects as needed for the non-part-tbm effects
code/particle/effects/OmniEffect.cpp | 71 ++++++++++++++++++++++++++++---
code/particle/effects/OmniEffect.h | 39 +++++++++++++----
code/particle/util/ParticleProperties.cpp | 2 +-
code/particle/util/ParticleProperties.h | 1 +
4 files changed, 99 insertions(+), 14 deletions(-)
------------------------------------------------------------------------
commit efed4647a
Author: Birk Magnussen
Commit: Birk Magnussen
Code volumes
code/particle/volumes/ConeVolume.cpp | 23 ++++++++++++++++++-
code/particle/volumes/ConeVolume.h | 6 +++++
code/particle/volumes/LegacyAACuboidVolume.cpp | 19 +++++++++++++++-
code/particle/volumes/LegacyAACuboidVolume.h | 5 +++++
code/particle/volumes/SpheroidVolume.cpp | 31 +++++++++++++++++++++++++-
code/particle/volumes/SpheroidVolume.h | 5 +++++
6 files changed, 86 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit e5afc0482
Author: Birk Magnussen
Commit: Birk Magnussen
Add OmniEffect
code/particle/ParticleVolume.h | 13 ++
code/particle/effects/OmniEffect.cpp | 167 +++++++++++++++++++++++++
code/particle/effects/OmniEffect.h | 79 ++++++++++++
code/particle/volumes/ConeVolume.cpp | 1 +
code/particle/volumes/ConeVolume.h | 9 ++
code/particle/volumes/LegacyAACuboidVolume.cpp | 1 +
code/particle/volumes/LegacyAACuboidVolume.h | 9 ++
code/particle/volumes/SpheroidVolume.cpp | 1 +
code/particle/volumes/SpheroidVolume.h | 9 ++
code/source_groups.cmake | 12 ++
10 files changed, 301 insertions(+)
------------------------------------------------------------------------
commit 5dfc2108d
Author: Birk Magnussen
Commit: Birk Magnussen
Fix bugs from particle_emitter refactor
code/model/modelread.cpp | 11 +++++++++++
code/particle/ParticleManager.cpp | 3 +++
code/particle/effects/ParticleEmitterEffect.cpp | 2 --
3 files changed, 14 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 2f2e8b2e1
Author: BMagnu
Commit: Birk Magnussen
Remove particle_effect and ParticleType
code/particle/particle.cpp | 51 +++++++++++++-----------------------
code/particle/particle.h | 18 -------------
code/scripting/api/libs/graphics.cpp | 21 ++++++++-------
code/scripting/api/libs/testing.cpp | 15 ++++++-----
code/scripting/api/objs/particle.cpp | 22 ++--------------
code/ship/ship.h | 12 ---------
6 files changed, 39 insertions(+), 100 deletions(-)
------------------------------------------------------------------------
commit 97dbd2fa8
Author: BMagnu
Commit: Birk Magnussen
Removal of effects, pt. 2
code/asteroid/asteroid.cpp | 2 +-
code/debris/debris.cpp | 53 ++++----
code/fireball/fireballs.cpp | 2 +-
code/jumpnode/jumpnode.cpp | 4 +-
code/menuui/techmenu.cpp | 2 +-
code/mission/missionparse.cpp | 9 +-
code/missionui/missionbrief.cpp | 2 +-
code/missionui/missionweaponchoice.cpp | 8 +-
code/model/model.h | 2 +-
code/model/modelread.cpp | 76 ++++++++++-
code/model/modelrender.cpp | 54 ++++----
code/nebula/volumetrics.cpp | 2 +-
code/parse/sexp.cpp | 4 +-
code/particle/effects/ParticleEmitterEffect.cpp | 9 ++
code/particle/effects/ParticleEmitterEffect.h | 3 +
code/particle/particle.cpp | 49 -------
code/scripting/api/libs/graphics.cpp | 2 +-
code/scripting/api/objs/shipclass.cpp | 6 +-
code/scripting/api/objs/weaponclass.cpp | 4 +-
code/ship/ship.cpp | 68 +++++-----
code/ship/ship.h | 1 +
code/ship/shipfx.cpp | 169 +++---------------------
code/starfield/starfield.cpp | 10 +-
code/starfield/supernova.cpp | 61 ++++++---
code/weapon/shockwave.cpp | 6 +-
code/weapon/weapons.cpp | 14 +-
freespace2/freespace.cpp | 4 +-
27 files changed, 283 insertions(+), 343 deletions(-)
------------------------------------------------------------------------
commit 7d10ed44f
Author: Birk Magnussen
Commit: Birk Magnussen
Removal of effects, pt. 1
code/asteroid/asteroid.cpp | 2 +-
code/model/modelrender.cpp | 2 +-
code/particle/effects/BeamPiercingEffect.cpp | 7 +-
code/particle/effects/ParticleEmitterEffect.cpp | 6 +-
code/particle/effects/ParticleEmitterEffect.h | 3 +-
code/particle/particle.cpp | 135 ++++++++++---------
code/particle/particle.h | 21 ++-
code/particle/util/ParticleProperties.cpp | 6 +-
code/scripting/api/libs/graphics.cpp | 23 ++--
code/scripting/api/libs/testing.cpp | 4 +-
code/scripting/api/objs/particle.cpp | 2 +-
code/ship/ship.cpp | 164 +++++++++++-------------
code/ship/ship.h | 10 +-
code/ship/shipfx.cpp | 32 +++--
code/weapon/beam.cpp | 3 +-
code/weapon/muzzleflash.cpp | 6 +-
code/weapon/weapons.cpp | 74 ++++++-----
17 files changed, 256 insertions(+), 244 deletions(-)