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 |
|
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
|
62e1fdf709
|
- Blood: Fix handling of QAVs defined as loopable while interpolating.
|
2021-08-23 12:05:13 +10:00 |
|
Mitchell Richters
|
ddc7b3d730
|
Merge branch 'master' into master
|
2021-08-23 11:40:05 +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
|
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 |
|
Mitchell Richters
|
2edbd3447c
|
- Blood: Extend interpolation properties for kQAVBUNFUSE (res_id: 21) to stop interpolating all tiles after frame 6 and not just tile index 4.
|
2021-08-22 10:55:01 +10:00 |
|
Mitchell Richters
|
7e8ec89a68
|
- Blood: Add interpolation repair for kQAVSTAFDOWN (res_id: 119).
|
2021-08-22 08:18:17 +10:00 |
|
Mitchell Richters
|
a03848d1f8
|
- Blood: Add interpolation repair for kQAVSTAFIRE4 (res_id: 116).
|
2021-08-22 08:18:14 +10:00 |
|
Mitchell Richters
|
fb084734e3
|
- Blood: Add interpolation repair for kQAVVDSPEL1 (res_id: 110).
|
2021-08-22 08:18:00 +10:00 |
|
Mitchell Richters
|
0172373650
|
- Blood: Add interpolation repair for kQAVVDDOWN (res_id: 109).
|
2021-08-22 08:17:50 +10:00 |
|
Mitchell Richters
|
95878bcea1
|
- Blood: Add interpolation repair for kQAVVDFIRE4 (res_id: 106) and kQAVVDFIRE5 (res_id: 107).
|
2021-08-22 08:17:47 +10:00 |
|
Mitchell Richters
|
d34fd124b7
|
- Blood: Add interpolation repair for kQAVVDFIRE3 (res_id: 105).
|
2021-08-22 08:17:44 +10:00 |
|
Mitchell Richters
|
a3a2cd8da8
|
- Blood: Add interpolation repair for kQAVVDFIRE1 (res_id: 103) and kQAVVDFIRE2 (res_id: 104).
|
2021-08-22 08:17:37 +10:00 |
|
Mitchell Richters
|
dd1e716082
|
- Blood: Extend backported voodoo doll fix from BloodGDX to always use kQAVVDIDLE2 when the player is moving. As kQAVVDIDLE2 has moving frames and is not a static idle animation, call it via StartQAV() so that weaponTimer is started.
|
2021-08-22 08:17:33 +10:00 |
|
Mitchell Richters
|
cd092153eb
|
- Blood: Mark kQAVVDIDLE2 (res_id: 102) as being loopable.
|
2021-08-22 08:17:14 +10:00 |
|
Mitchell Richters
|
803e9f8a04
|
- Blood: Add interpolation repair for kQAVVDIDLE2 (res_id: 102).
|
2021-08-22 08:16:41 +10:00 |
|
Mitchell Richters
|
1fd66681d2
|
- Blood: Add interpolation repair for kQAVVDUP (res_id: 100).
|
2021-08-22 08:15:53 +10:00 |
|
Mitchell Richters
|
3a656c91cb
|
- Blood: Mark kQAVNAPFIRE (res_id: 91) as being loopable.
|
2021-08-22 08:15:43 +10:00 |
|
Mitchell Richters
|
d4fe734afa
|
- Blood: Add interpolation repair for kQAVNAPUP (res_id: 89).
|
2021-08-22 08:14:47 +10:00 |
|
Mitchell Richters
|
99ab8fa726
|
- Blood: Add interpolation repair for kQAV2SGUNPRE (res_id: 86). Thanks again to @Phredreeke for the tiles with overlays baked in for this to work properly.
|
2021-08-22 08:14:45 +10:00 |
|
Mitchell Richters
|
ed92ec9af9
|
- Blood: Add interpolation repair for kQAV2SGUNALT (res_id: 85). Thanks again to @Phredreeke for the tiles with overlays baked in for this to work properly.
|
2021-08-22 08:14:42 +10:00 |
|
Mitchell Richters
|
b2637050e8
|
- Blood: Mark kQAV2SGUNFIR (res_id: 84) as being loopable.
|
2021-08-22 08:14:33 +10:00 |
|
Mitchell Richters
|
22e348613f
|
- Blood: Add interpolation repair for kQAV2SGUNFIR (res_id: 84). Thanks to @Phredreeke for the tiles with overlays baked in for this to work properly.
|
2021-08-22 08:14:05 +10:00 |
|
Mitchell Richters
|
073f0d953f
|
- Blood: Add interpolation repair for kQAV2SGUNUP (res_id: 82).
|
2021-08-22 08:14:03 +10:00 |
|
Mitchell Richters
|
7bbf478859
|
- Blood: Add interpolation repair for kQAVSGUNPOST (res_id: 80). Thanks again to @Phredreeke for the tiles with overlays baked in for this to work properly.
|
2021-08-22 08:14:00 +10:00 |
|
Mitchell Richters
|
df3bc4d90a
|
- Blood: Add interpolation repair for kQAVSGUNPRE (res_id: 79). Thanks again to @Phredreeke for the tiles with overlays baked in for this to work properly.
|
2021-08-22 08:13:58 +10:00 |
|