From 331cda6842c09216c8d7b65cd53a3f9a4d80b356 Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 2 Jun 2020 12:32:43 +0200 Subject: [PATCH] Add a note on where to add new effects. Update hash --- .gitlab-ci.yml | 2 +- qcsrc/common/effects/effectinfo.inc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1afb658bfd..93a461ff8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ test_sv_game: - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache - make - - EXPECT=905d184cd4c5c17605f58d153dae6ce7 + - EXPECT=9ad57788673e6a5aa1caad302eddb1ad - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg | tee /dev/stderr | grep '^:' diff --git a/qcsrc/common/effects/effectinfo.inc b/qcsrc/common/effects/effectinfo.inc index c96f247af5..80c6bbacf9 100644 --- a/qcsrc/common/effects/effectinfo.inc +++ b/qcsrc/common/effects/effectinfo.inc @@ -2,6 +2,7 @@ // use `cl_particles_reloadeffects` to reload effects without restarting engine // use `chase_active 1` and `cl_lockview 1` to see effects from different perspectives // `dumpeffectinfo` currently doesn't work so edit effectinfo.txt manually, just try to keep the files in sync +// always add new effects to the bottom of the list // `tex` are indices into particles/particlefont.tga (see particles/particlefont-template.tga for numbers) // the first index is inclusive, second exclusive (so `tex 0 8` will use images 0 though 7) @@ -9105,3 +9106,5 @@ SUB(RESPAWN_GHOST) { MY(originjitter) = '28 28 16'; MY(velocityjitter) = '0 0 256'; } + +// always add new effects to the bottom of the list. And keep this comment in the bottom line of this file! -- 2.39.2