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
Christoph Oelckers
817368abc2
- changed R_InstallSpriteLump so that it doesn't abort for every seemingly misnamed lump in the sprites namespace. A warning is fully sufficient here.
...
SVN r3239 (trunk)
2011-06-16 13:10:03 +00:00
Randy Heit
8ccf552d09
- Added r_shadercolormaps cvar. Set it to false to disable shaders for fixed colormap effects
...
(e.g. invulnerability). This should only be necessary for SM1.4 cards with buggy drivers. I
doubt the problem is very widespread. The one piece of SM1.4 hardware I obtained specifically
for testing purposes has no problems using shaders for these effects.
SVN r3200 (trunk)
2011-05-11 04:16:45 +00:00
Randy Heit
0d39257eaf
- Apply kgsws-CZ's fixes:
...
* Added new cvar, r_3dfloors for testing, so for example, you can see the FPS difference.
* ds_p->bkup is not always allocated.
* Fixed particles visible through 3D floors.
* Fixed FAKE3D flag names.
SVN r3178 (trunk)
2011-04-13 02:34:48 +00:00
Randy Heit
d3b44a4172
- Fix errors/warnings from MinGW 4.5.0 (tdm-1).
...
- Disable the missing field initializers warnings that -Wextra produces from GCC.
SVN r3173 (trunk)
2011-03-29 05:20:33 +00:00
Randy Heit
3344fa9f30
- Fixed: COLORMAP tricks to produce bright lights do not work with the hardware renderer, so do
...
not hardware accelerate weapon sprites that use them. (see Harmony)
SVN r3170 (trunk)
2011-03-19 04:45:59 +00:00
Christoph Oelckers
1993e969b7
- GCC warning fixes (GCC stupidity for the most part.)
...
SVN r3154 (trunk)
2011-02-19 08:59:43 +00:00
Christoph Oelckers
fae8ed444c
- merged 3dfloors2 branch into trunk.
...
SVN r3124 (trunk)
2011-01-29 11:09:38 +00:00
Christoph Oelckers
17ab63a39f
- fixed: The Skin initialization code did not NULL the Voxel pointer in its sprite definitions.
...
SVN r3103 (trunk)
2011-01-14 09:43:03 +00:00
Randy Heit
2add3fb381
- Merge voxels back into trunk. Even if it needs further tweaking, it should at least be stable now.
...
SVN r3086 (trunk)
2011-01-02 18:02:27 +00:00
Christoph Oelckers
231e7a1c6d
- added a new render style 'Shadow'. Essentially it's just a black translucent stencil with an alpha of 0.3. The purpose of this style is to be used as a software renderer approximation of GZDoom's spectre effect.
...
- allow setting 'Shadow' as default fuzz effect
- changed CVAR conversion that strings 'false' and 'true' get evaluated as integers 0 and 1 respectively so that changing boolean CVARs to int does not destroy their values.
SVN r3076 (trunk)
2010-12-25 23:27:26 +00:00
Christoph Oelckers
770a879f6a
- fixed: The TouchedActors array in the Dehacked parser was not freed after parsing was done.
...
- Initialize the alt HUD explicitly in D_DoomMain.
- don't let S_UnloadReverbDef leave a broken list of sound environments behind.
- Added more code to explicitly delete data before initializing it.
SVN r3039 (trunk)
2010-12-15 00:09:31 +00:00