Christoph Oelckers
0cad0b9258
- reformatting the mess created by TortoiseMerge.
2021-08-25 08:46:31 +02:00
Christoph Oelckers
c288de920d
- Blood: don't abort the INI scanner if it finds a file with resource file index 0.
...
0 is also used for on-the-fly addition of data to the file system, so this must run through the entire directory to be safe.
2021-08-24 18:40:29 +02:00
Mitchell Richters
d5a4a17ced
- Blood: Amend shade issues in QAVs for KQAVFLARFIR2
(res_id: 43) and kQAVFLAR2FIR
(res_id: 48) now that we're interpolating shade.
2021-08-24 22:35:05 +10:00
Mitchell Richters
fd149e50ee
- Remove early return from GrpScan()
that was allowing addons to come through even if they weren't valid.
...
* Raze configured to only search $PROGDIR with a single `worldtour.grp` file would attempt to autoload even if its dependency CRC wasn't present. Attempted to re-arrange function but had mixed results. Removing this early return is what worked under all test cases.
2021-08-24 20:56:28 +10:00
Mitchell Richters
271eb16833
- Duke: Correctly mark Duke: Alien World Tour
as a Duke add-on.
2021-08-24 20:54:33 +10:00
Christoph Oelckers
68387cd59e
- fixed: List menus still allowed to select unselectable items with the mouse.
...
This was particularly noticable in SW's episode menu with the subtitles.
2021-08-24 10:08:25 +02:00
Christoph Oelckers
90b7524706
- SW: fixed episode indexing resulting in bad display on the automap.
2021-08-24 09:57:36 +02:00
Mitchell Richters
78b8f77850
- Remove duplicate grpinfo
definition for "BLOOD: One Unit Whole Blood".
2021-08-24 11:22:44 +10:00
Mitchell Richters
5a32000d1e
- Blood: Interpolate the alpha and shade values when interpolating QAVs.
2021-08-24 10:07:58 +10:00
Mitchell Richters
b1fa923f02
- Blood: Re-organise QAVInterpProps
struct so that when statically declaring forcedinterpdata
, only the required value needs passing.
2021-08-24 10:06:54 +10:00
Mitchell Richters
542f005565
- Blood: Fixed weapon switching while using Voodoo Doll playing its idle animation.
...
* Fixes #517 .
2021-08-24 07:25:52 +10:00
Christoph Oelckers
feb11a2f9a
- fixed one merge conflict that managed to slip through.
2021-08-23 19:24:56 +02:00
Christoph Oelckers
0e7c61dc33
- tabified code.
2021-08-23 19:21:41 +02:00
Christoph Oelckers
ac40e86ab2
- actSpawnSprite
...
# Conflicts:
# source/games/blood/src/actor.cpp
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:20:05 +02:00
Christoph Oelckers
ebdb4927cc
- got rid of a few sprite/xsprite references.
...
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:19:36 +02:00
Christoph Oelckers
2cfb4f908e
- actProcessSprites done.
...
# Conflicts:
# source/games/blood/src/actor.cpp
# Conflicts:
# source/games/blood/src/actor.cpp
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:18:22 +02:00
Christoph Oelckers
7faebdcbf1
- first two loops of actProcessSprites split off and redone.
...
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:15:18 +02:00
Christoph Oelckers
ddcb12a8b2
- MoveMissile + actExplodeSprite.
...
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:15:08 +02:00
Christoph Oelckers
29c2e68270
- tabified MoveDude
...
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:13:29 +02:00
Christoph Oelckers
8c01c363a9
- replaced remaining access to sprite[] and xsprite[] in processed code.
...
# Conflicts:
# source/games/blood/src/actor.cpp
# Conflicts:
# source/games/blood/src/actor.cpp
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:13:28 +02:00
Christoph Oelckers
c1d52f7393
- replaced all occurences of gDudeExtra and moved that struct into DBloodActor.
...
# Conflicts:
# source/games/blood/src/ai.cpp
2021-08-23 19:13:28 +02:00
Christoph Oelckers
4fed1debe4
- moveDude part 1.
2021-08-23 19:13:28 +02:00
Christoph Oelckers
3aa9d6f8be
- MoveThing.
...
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:12:58 +02:00
Christoph Oelckers
6d958135e0
- give TMap a proper move constructor and assignment operator.
2021-08-23 19:05:31 +02:00
carnivoroussociety
e74e581637
Fix issues with self collision on MoveMissile()
...
Only with new accurate clipmove() use
2021-08-23 18:40:38 +02:00
Mitchell Richters
4ffd02b1e1
- Blood: Declare qavGetInterpType()
as static within qav.cpp.
2021-08-23 21:00:45 +10:00
Mitchell Richters
276c000f9f
- Blood: Add mechanism to be able to force QAV interpolation based on picnum for testing purposes and not for end-user usage.
2021-08-23 20:54:30 +10:00
carnivoroussociety
2365be7c95
Add modern map kViewEffectSpotProgress support
...
Fix kViewEffectShowWeapon positional/angle offset for voodoo doll
2021-08-23 19:28:32 +10:00
Mitchell Richters
1d0924e45a
- Fix invocation name in FileSystem::GetLongName()
error output.
...
* Thanks to @Gaerzi for spotting this.
2021-08-23 18:55:42 +10:00
Mitchell Richters
a920fc5aef
- Add support for first
and last
keyword for defineqav
parser when process interpolate ignore
block.
2021-08-23 15:34:30 +10:00
Mitchell Richters
23be5ffe8c
- Add support for all
keyword for defineqav
parser when process interpolate ignore
block, and ensure the lowest value can't be below 0.
2021-08-23 15:06:04 +10:00
Mitchell Richters
e68b793852
- Add some extra safety to defineqav
parser to ensure some unsupported actions can't be performed.
2021-08-23 14:19:33 +10:00
Mitchell Richters
34042f842a
- Blood: Mark defineqav
for BDRIP.QAV
as loopable like it should have been.
2021-08-23 12:05:37 +10:00
Mitchell Richters
62e1fdf709
- Blood: Fix handling of QAVs defined as loopable while interpolating.
2021-08-23 12:05:13 +10:00
Mitchell Richters
252a2387af
Merge pull request #512 from carnivoroussociety/master
...
[Blood] Add vanilla enemies cvar
2021-08-23 11:51:50 +10:00
Mitchell Richters
ddc7b3d730
Merge branch 'master' into master
2021-08-23 11:40:05 +10:00
Mitchell Richters
f187b09bda
- Update language.0
.
2021-08-23 11:09:55 +10:00
Mitchell Richters
b999f3b636
- Update language.csv
.
2021-08-23 11:09:20 +10:00
Mitchell Richters
ebdc9c31f2
- Blood: Ensure new QAV timer doesn't process while game is paused.
2021-08-23 11:05:08 +10:00
Mitchell Richters
1ee6fd76c4
Merge branch 'blood-qavrework'
...
# Conflicts:
# source/core/gamecvars.cpp
# source/core/gamecvars.h
# source/games/blood/src/weapon.cpp
2021-08-23 11:02:09 +10:00
Mitchell Richters
d7450e12f0
- Blood: Re-add interpolated weapon QAVs in an externalised, disabled-by-default fashion.
2021-08-23 10:55:08 +10:00
Mitchell Richters
6975997ae3
- Blood: Remove weaponQAV[]
array entirely.
2021-08-23 10:49:47 +10:00
Mitchell Richters
5bfdd74844
- Blood: Revert "- Blood: Ensure looped QAVs interpolate using last frame in the array."
2021-08-23 09:32:00 +10:00
Mitchell Richters
916241dcdb
- Blood: Implement defineqav
DEF parser with hookup to game-side code.
2021-08-23 09:00:47 +10:00
Mitchell Richters
da78160cd1
- Blood: Revert code to dump out QAVs to disk and remove all hard-coded interpolation repairs.
2021-08-22 21:20:15 +10:00
carnivoroussociety
72225c9b8c
Added various missing item/ammo types to common_game.h
...
Renamed kAmmoItemVoodooDoll->kItemAmmoVoodooDoll
Renamed kMissileFireballNapam->kMissileFireballNapalm
2021-08-22 17:49:02 +10:00
Mitchell Richters
499e400cdb
- Blood: Add command-line switch to dump repaired QAVs back out to disk so that they can be included in raze.pk3.
...
* This required restoring the original struct temporarily to ensure contents dumped to disk were 1:1 with how they came in.
2021-08-22 15:22:58 +10:00
Mitchell Richters
907e0974e9
- Add GetLongName()
method to FileSystem
class.
2021-08-22 15:03:28 +10:00
Mitchell Richters
a681aad281
- Blood: Add interpolation repair and properties for kQAVLITEFLAM
(res_id: 5).
2021-08-22 15:03:20 +10:00
Mitchell Richters
6256de8013
- Blood: Extend interpolation repair for kQAVBUNUP
(res_id: 16) to add missing tile in first frame.
2021-08-22 11:23:29 +10:00