Randy Heit
b5e4153c78
Merge branch 'master' into gonesolong
...
Conflicts:
src/CMakeLists.txt
src/b_think.cpp
src/g_doom/a_doomweaps.cpp
src/g_hexen/a_clericstaff.cpp
src/g_hexen/a_fighterplayer.cpp
src/namedef.h
src/p_enemy.cpp
src/p_local.h
src/p_mobj.cpp
src/p_teleport.cpp
src/sc_man_tokens.h
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_function.cpp
src/thingdef/thingdef_parse.cpp
wadsrc/static/actors/actor.txt
wadsrc/static/actors/constants.txt
wadsrc/static/actors/shared/inventory.txt
- Added register reuse to VMFunctionBuilder for FxPick's code emitter.
- Note to self: Need to reimplement IsPointerEqual and CheckClass, which
were added to thingdef_function.cpp over the past year, as this file no
longer exists in this branch.
2014-12-21 21:15:11 -06:00
Randy Heit
2d87eb0ba2
Merge branch 'master' into gonesolong
...
Conflicts:
src/CMakeLists.txt
src/actor.h
src/g_heretic/a_hereticmisc.cpp
src/g_heretic/a_hereticweaps.cpp
src/g_heretic/a_ironlich.cpp
src/info.h
src/namedef.h
src/p_buildmap.cpp
src/p_enemy.cpp
src/p_map.cpp
src/p_mobj.cpp
src/thingdef/thingdef_codeptr.cpp
zdoom.vcproj
2014-12-20 19:13:14 -06:00
Kyle Evans
3af08f1983
Fixed weapon drawing rules to account for the death camera [backported from gzdoom], also fixed drawing rules for crosshair
2014-12-01 22:03:22 -06:00
Edward Richardson
07d7f690e8
Non-wall sprites need their original depth checks
2014-08-21 20:03:17 +12:00
Randy Heit
9659b894a3
Skip neardepth/fardepth checking in R_DrawSprite
...
- Wall sprites now clip much, much better than before.
2014-08-07 20:43:09 -05:00
Randy Heit
7b02027ba7
Fixed: Wall sprites cut off one pixel short of the window's right border
2014-08-07 20:00:49 -05:00
Randy Heit
6303935ad6
Use wall sprite Y scale
2014-08-07 19:57:55 -05:00
Randy Heit
0aa67c68ab
Redo lighting for each wall sprite
...
- Because previously it just reused whatever the most recently drawn wall
used.
2014-08-07 17:23:06 -05:00
Randy Heit
e1ee80661e
Make FWallCoords' members lowercase
...
because they're kind of a pain to type when all uppercase.
- Also, make its sx1 and sx2 members shorts, so it takes less space, since
it's getting crammed into a vissprite now.
2014-08-07 17:12:04 -05:00
Randy Heit
d0043bed78
Q&D port of decal code to draw generic wall sprites
...
- This still doesn't use all the sprite properties correctly. It also
looks like they're going to need different code to build the clipping
arrays. But at least wall sprites are drawn at the proper angle now!
2014-08-02 22:35:57 -05:00
Christoph Oelckers
e7225bced6
- check negative XScale on sprites to allow mirroring.
2013-12-01 01:15:10 +01:00
Randy Heit
4deeb8d8ae
Merge branch 'master' into scripting
...
Conflicts:
src/actor.h
src/g_doom/a_doomweaps.cpp
src/p_local.h
src/p_map.cpp
src/sdl/i_main.cpp
src/thingdef/thingdef_codeptr.cpp
2013-06-25 19:28:25 -05:00
Randy Heit
5916ce087b
- Revert r4244. It seems to be working well enough like this, since there have been no complaints.
...
SVN r4341 (trunk)
2013-06-08 03:24:41 +00:00
Randy Heit
459ad5abff
- Updated scripting branch to latest version in trunk.
...
SVN r4337 (scripting)
2013-06-07 03:31:30 +00:00
Randy Heit
6d6fcbe246
- For the sake of better testing, use 2D sprite sorting unconditionally and not just when a
...
voxel is in view. Hopefully I'm just being paranoid, but I don't trust it to go well with
clipping sprites to walls.
SVN r4244 (trunk)
2013-05-01 02:27:07 +00:00
Randy Heit
2dfb1dd92f
- Added an alternate 2D sprite sorting comparison function which seems to work better with
...
large voxels than the standard 1D sprite sort.
SVN r4229 (trunk)
2013-04-28 03:31:13 +00:00
Randy Heit
6dc21f9a8b
- Fixed: Voxel rendering completely fell apart when a mirror came into view.
...
SVN r4216 (trunk)
2013-04-16 20:17:34 +00:00
Braden Obrzut
dcb1a3c8bd
- GCC warning cleanup
...
SVN r4031 (trunk)
2013-01-21 22:30:30 +00:00
Randy Heit
67eda6b1ad
- Changed P_CheckPlayerSprites() so that it does not alter any actor data. It is now called by
...
R_ProjectSprite() to modify the appropriate data right before it is needed for rendering.
SVN r4004 (trunk)
2013-01-02 02:10:26 +00:00
Randy Heit
21ada0b3f6
- Fixed: When the player sprite is being drawn with a fixed colormap, hardware acceleration
...
should not be disabled when the regular colormap has lights that stay bright throughout.
SVN r4001 (trunk)
2012-12-22 02:57:35 +00:00
Randy Heit
47eec0b275
- Added tracking of time spent specifically in running action functions. I feel kind of stupid
...
about this now. I spent three days trying to figure out why the VC++ debug version was so slow.
It turns out I had a conditional breakpoint set in a high-traffic area. D'oh!
The rest of this stuff should get merged into trunk:
- Fixed: Writing to debugfile uses the standard fprintf, which does not understand %td on VC++.
- Fixed: Instead of crashing when a sprite has been scaled to 0, just don't draw it.
SVN r3896 (scripting)
2012-10-21 03:46:17 +00:00
Randy Heit
e7efa1d802
- Update to latest version in trunk.
...
SVN r3890 (scripting)
2012-10-17 04:24:54 +00:00
Randy Heit
eea532ce48
- Move the float bob offset calculation into a separate function.
...
SVN r3789 (trunk)
2012-07-27 01:53:21 +00:00
Randy Heit
6bd8fafbad
- Fixed: The float bob offsetting in R_ProjectSprite was using r_TicFrac as a millisecond count
...
rather than as a fraction of a tic.
SVN r3788 (trunk)
2012-07-27 01:44:55 +00:00
Randy Heit
562cf04db2
- Update scripting branch to trunk.
...
SVN r3758 (scripting)
2012-07-14 03:04:41 +00:00
Randy Heit
5e2b4bddda
- Make floatbobbing a purely cosmetic effect that does not alter an actor's real position in the world.
...
SVN r3744 (trunk)
2012-07-06 03:42:03 +00:00
Randy Heit
8f39e692e7
- Fixed: FCoverageBuffer::InsertSpan() failed to consider the case where the new span starts above
...
an existing span and ends below it.
SVN r3726 (trunk)
2012-07-01 22:42:35 +00:00
Randy Heit
e61f08478d
- Fixed: Revision 3711 broke voxels that need to be drawn offscreen before drawing to the screen.
...
SVN r3725 (trunk)
2012-07-01 22:30:41 +00:00
Randy Heit
2d8b43734b
- Fixed: Revision 3711 broke the drawing of all but the first post in each voxel column.
...
SVN r3724 (trunk)
2012-07-01 22:18:59 +00:00
Randy Heit
4a3438499e
- Use floating point instead of the distrecip() function for slightly less precision loss.
...
- Tweak voxel sizes and vertical positioning further.
SVN r3716 (trunk)
2012-06-29 03:58:26 +00:00
Randy Heit
a2b51665ac
- Try to keep voxels from shifting up and down depending on how far you are above or below them.
...
SVN r3714 (trunk)
2012-06-28 05:22:40 +00:00
Randy Heit
a3dc2149d4
- Adjust voxel scale further, under Enjay's tutelage.
...
SVN r3713 (trunk)
2012-06-28 04:55:44 +00:00
Randy Heit
687b371dbd
- Whoops. That doesn't work right if it needs to actually draw more than one column segment from each voxel strip.
...
SVN r3712 (trunk)
2012-06-28 04:33:49 +00:00
Randy Heit
1fc138400b
- Allow voxels to be further off the side of the screen than regular sprites, since they can stick out more.
...
- Clip each column of voxel strips individual, rather than clipping them all the same as the first one.
SVN r3711 (trunk)
2012-06-28 04:24:29 +00:00
Randy Heit
f897b1a1a2
- Make voxels slightly larger so that the size of one 3D "texel" is the same as one 2D texel at the same location.
...
SVN r3708 (trunk)
2012-06-24 03:56:53 +00:00
Randy Heit
61742ee3a9
- Fixed: Heightsecs with SECF_FAKEFLOORONLY set should not clip sprites to the fake ceiling (since
...
it doesn't really exist).
SVN r3695 (trunk)
2012-06-17 03:28:04 +00:00
Randy Heit
bf48b7620c
- Changed the direction of positive rotation for voxels to match GZDoom's counterclockwise spin.
...
SVN r3579 (trunk)
2012-04-22 02:34:57 +00:00
Christoph Oelckers
34820aacd2
- added Xaser's modified version of kgsws's railgun enhancements patch.
...
SVN r3529 (trunk)
2012-04-07 12:57:44 +00:00
Randy Heit
308f6cab9d
- Fixed: Sprites drawn with the shaded render style were always fullbright.
...
SVN r3480 (trunk)
2012-03-24 00:52:15 +00:00
Christoph Oelckers
893455ef61
- sync source with latest GZDoom:
...
Includes:
- Made the move tried from checking missile spawns ignore drop off height. This solves the Voodoo Gun ghostly civilian issue.
- Fixed: the NOTELEPORT flag is removed from Dehacked missiles which lose the MISSILE flag. This caused problems with certain special effects based on dehacked spawn cubes.
- Fixed: all Boom silent teleporters preserve relative height.
- support for palette independent particle colors if the renderer can handle them.
SVN r3329 (trunk)
2011-12-06 08:36:28 +00:00
Braden Obrzut
c013e72caa
- Backported VisibleToTeam and VisibleToPlayerClass from Skulltag with some modifications.
...
SVN r3290 (trunk)
2011-09-08 01:28:26 +00:00
Christoph Oelckers
4ef68ded5d
- fixed some leftover references to the software renderer.
...
SVN r3264 (trunk)
2011-07-07 19:53:42 +00:00
Christoph Oelckers
463c276014
- removed more r_ header dependencies from the rest of the code.
...
SVN r3260 (trunk)
2011-07-06 15:31:05 +00:00
Christoph Oelckers
42091b1bb3
- changed AlterWeaponSprite so that it doesn't take a full vissprite as parameter.
...
- FCoverageBuffer is only used in r_things.cpp, so its declaration does not need to be in a global header that's included everywhere.
SVN r3258 (trunk)
2011-07-06 13:00:51 +00:00
Christoph Oelckers
f8ba5af858
- separated sprite and skin maintenance code from r_things.cpp into a separate file.
...
SVN r3256 (trunk)
2011-07-06 10:24:40 +00:00
Christoph Oelckers
fbff5ca932
- moved r_interpolate.cpp and r_translate.cpp to r_data.
...
- merged r_jpeg.h into jpegtexture.cpp because that's the only place where it's ever used.
SVN r3255 (trunk)
2011-07-06 08:50:15 +00:00
Christoph Oelckers
5c6fd66ed5
- rename src/resources to src/r_data.
...
SVN r3254 (trunk)
2011-07-06 07:35:36 +00:00
Christoph Oelckers
5bf6398d85
- moved render style and border drawing code out of r_draw.cpp.
...
SVN r3251 (trunk)
2011-07-05 20:41:53 +00:00
Christoph Oelckers
7308e05ed0
- separated all voxel related resource maintenance code from r_things.cpp and r_data.cpp into its own file.
...
SVN r3246 (trunk)
2011-07-04 20:22:55 +00:00
Christoph Oelckers
4626492f50
- separated all colormap related code from v_palette.cpp and r_data.cpp into its own file.
...
SVN r3245 (trunk)
2011-07-03 10:47:35 +00:00