Christoph Oelckers
8447990889
Merge commit '2719ce86dc07c9f7b1ad6d61a9a49c974896abf2' into scripting
...
Conflicts:
src/info.h
src/thingdef/thingdef_codeptr.cpp
(until right before the main work for multiple tags.)
2015-04-28 13:32:50 +02:00
Christoph Oelckers
065c0a79cd
Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting
...
Conflicts:
src/d_main.cpp
src/info.cpp
src/info.h
src/p_acs.cpp
src/p_interaction.cpp
src/p_mobj.cpp
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_properties.cpp
(scripting branch update part 5)
2015-04-28 12:48:33 +02:00
Christoph Oelckers
792cad89b3
Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting
...
Conflicts:
src/g_hexen/a_clericstaff.cpp
src/g_hexen/a_hexenspecialdecs.cpp
src/p_acs.cpp
src/p_enemy.cpp
src/p_interaction.cpp
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_expression.cpp
(Scripting branch update part 4)
2015-04-28 11:59:33 +02:00
Christoph Oelckers
d6e3fc0567
Merge commit 'fb9231a38db2025eb77bfd246f36d985cbbccd2e' into scripting
...
Conflicts:
src/info.cpp
src/thingdef/thingdef_expression.cpp
wadsrc/static/actors/constants.txt
(Scripting branch update part 2)
2015-04-28 09:57:01 +02:00
Christoph Oelckers
45f893f8fc
Merge branch 'master' of https://github.com/rheit/zdoom
2015-04-16 18:08:23 +02:00
Braden Obrzut
7217c69be4
- Fixed portability issue in ANIMATED with systems that treat char as unsigned.
2015-04-12 15:22:39 -04:00
Christoph Oelckers
bead3e046b
- fixed weapon positioning again, after finding out that the first fix just worked around the actual problem: The entire coordinate calculation must be done in floating point with no integer math at all. Due to roundoff errors the stored int values needed for wall and flat placement significantly lack precision and with the high scaling factor that needs to be used for weapon HUD sprites these can easily become several pixels. After fixing this the border around sprite textures could be reverted to one pixel again.
...
- fixed: The 'may not be expanded' state should be stored in the texture and reused later. This also needs to revalidate the material if it decides that expansion should be disallowed.
2015-04-04 17:50:22 +02:00
Christoph Oelckers
60d9f38084
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/v_video.cpp
2015-04-01 11:59:20 +02:00
Christoph Oelckers
ad9e4413fa
- made the texture precaching code a bit more self-descriptive after finding a discrepancy in handling between ZDoom and GZDoom's versions.
2015-04-01 11:48:47 +02:00
Christoph Oelckers
6eb4e2a224
Merge branch 'master' of https://github.com/rheit/zdoom
2015-03-31 18:25:31 +02:00
Christoph Oelckers
3849cb8623
- added precaching of textures via MAPINFO.
2015-03-29 13:02:45 +02:00
Christoph Oelckers
d1a972ff3d
- fixed: The recent ANIMDEFS extension missed adjusting the call to AddSimpleAnim for ANIMATED-defined animations.
2015-03-25 20:34:26 +01:00
Christoph Oelckers
7dbabb5ee7
- missed a NULL pointer check.
2015-03-21 13:08:08 +01:00
Christoph Oelckers
ffbcda206c
- allow oscillating for discretely defined animations as well, not just for ranged ones.
...
- add random animations.
2015-03-21 12:48:37 +01:00
Christoph Oelckers
97947f9e10
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
dumb/vc6/dumb_static/dumb_static.vcproj
wadsrc/static/compatibility.txt
2015-03-15 11:42:59 +01:00
Randy Heit
e259087c19
Change RGB32k to a union of BYTE[32][32][32] and BYTE[32*32*32]
...
- Clang's optional runtime array bounds checking doesn't understand when we
intentionally "overflow" by doing this:
RGB32k[0][0][colorval]
It will warn that it was accessed at an index will past the bounds
of type 'BYTE [32]', which makes it less than useful for catching real
array bounds overflows. So now do this:
RGB32k.All[colorval]
And if you want this:
RGB32k[r][g][b]
Now do this:
RGB32k.RGB[r][g][b]
2015-03-08 18:05:02 -05:00
Christoph Oelckers
523f66fadb
Merge branch 'master' of https://github.com/rheit/zdoom
2015-02-10 21:52:42 +01:00
Christoph Oelckers
a3bdbff052
- fixed: 3Dmidtex opening checks didn't take per-sidedef scaling into account.
2015-02-10 21:30:52 +01: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
Christoph Oelckers
3c7664a460
- we don't really need a bBrightmap in a texture. All it did was duplicate some functionality of bMasked.
...
- renamed bBrightmapDisablesFullbright flag.
2014-10-26 08:41:52 +01:00
Christoph Oelckers
1050013017
major cleanup of the texture manager:
...
- use sampler objects to avoid creating up to 4 different system textures for one game texture just because of different clamping settings.
- avoids flushing all textures for change of texture filter mode.
- separate sprite and regular dimensions on the material level to have better control over which one gets used. It's now an explicit parameter of ValidateTexture. The main reason for this change is better handling of wall sprites which may not be subjected to such handling.
- create mipmaps based on use case, not texture type.
- allows removal of FCloneTexture hack for proper sharing of the same sprite for decals and other purposes.
- better precaching of skyboxes.
2014-08-22 23:50:38 +02:00
Christoph Oelckers
09ae52e26b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-31 00:44:59 +02:00
Randy Heit
02e7c56c82
Move SpriteFrames.Clear() from R_InitSprites to FTextureManager::Init
...
- Fixed: Blood sprite rotations were overwritten by the Doom sprite
rotations.
2014-07-29 20:31:53 -05:00
Christoph Oelckers
3c5d07e9c6
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-31 11:05:44 +02:00
Edoardo Prezioso
b285cbebe4
- Fixed compiler errors in latest TEXTURES code.
2014-05-25 01:12:16 +02:00
Shawn Walker
582b1990b7
- restore original line endings
2014-05-18 16:00:31 -07:00
Shawn Walker
59885b856d
- remove texture name length limits for udmf maps
2014-05-18 15:38:46 -07:00
Shawn Walker
ae8995e65b
Merge branch 'master' of https://github.com/rheit/zdoom
...
# By Christoph Oelckers (2) and Edward Richardson (1)
# Via Christoph Oelckers
* 'master' of https://github.com/rheit/zdoom :
- fixed: The map setup code was still truncating texture names in several places.
Fix nettic run-out at end of demo playback
- fixed: ACS's check...Texture functions must use the same search flags as the texture initialization code in p_setup.cpp and p_udmf.cpp. It also should not create textures that don't exist yet. We are only doing a comparison so it's not relevant if the texture exists or not.
2014-05-16 20:27:57 -07:00
Christoph Oelckers
8443de3f33
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-16 22:50:12 +02:00
Christoph Oelckers
25f4af734f
- fixed: ACS's check...Texture functions must use the same search flags as the texture initialization code in p_setup.cpp and p_udmf.cpp. It also should not create textures that don't exist yet. We are only doing a comparison so it's not relevant if the texture exists or not.
2014-05-16 10:56:23 +02:00
Christoph Oelckers
4e64ad847b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-15 09:46:47 +02:00
Shawn Walker
bfb5944517
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-15 00:11:52 -07:00
Christoph Oelckers
2944e4f6ae
- fixed some Linux issues with recent changes.
2014-05-14 14:08:14 +02:00
Christoph Oelckers
8c052818b7
- fixed: long texture name lookup did not work with TEXMAN_TryAny.
2014-05-14 10:27:40 +02:00
Shawn Walker
fdfcb728a9
- make it easier to spot patch definition errors in console log
2014-05-13 22:50:39 -07:00
Christoph Oelckers
ca4179caa3
- allow texture lookup by full path names. Due to technical limitations this may result in double textures if the same graphics lump is also referenced by its short texture name.
2014-05-13 20:51:16 +02:00
Christoph Oelckers
a05e584b81
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-13 12:00:37 +02:00
Christoph Oelckers
65e8563cf4
replaced all character arrays for lump/texture names in the level_info_t and FLevelLocals structures with FStrings as first preparation for allowing long texture names.
2014-05-13 11:33:59 +02:00
Christoph Oelckers
d74f045004
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
game-music-emu/game-music-emu.vcproj
2014-04-05 15:37:10 +02:00
Randy Heit
fc97584c69
Disable warning C4200 on VC++
...
- This warning is about using zero-sized arrays in structs (aka flexible
member arrays). It's standard-enough for our purposes, so don't warn
about it, since neither GCC nor Clang do.
2014-04-03 16:50:20 -05:00
Randy Heit
43fe317dbe
Use flexible array members for structs that end with var-sized arrays
...
- Since Clang++, G++, and VC++ all support this extension (even though it's
technically officially only part of C99), use it. It lets Clang's array-
bounds checker know that these are meant to be accessed out of their so-called
"bounds".
2014-04-03 16:33:33 -05:00
Christoph Oelckers
4a23b97963
Merge branch 'master' of https://github.com/rheit/zdoom
2014-03-01 14:41:00 +01:00
Randy Heit
e7f427aa60
Merge branch 'maint'
2014-02-24 19:26:50 -06:00
Randy Heit
1d4f4b25d7
Don't free replaced textures that are used as patches.
...
- Fixed: If a part of a multipatch texture is replaced by a HIRESTEX
version, the original patch must not be deleted, since the multipatch
texture still needs it for compositing.
2014-02-24 19:01:36 -06:00
Christoph Oelckers
7ba0f2467a
Merge branch 'master' of https://github.com/rheit/zdoom
2013-12-01 21:11:52 +01:00
Christoph Oelckers
86d7a326be
- allowdecals logic was nonfunctional.
2013-12-01 21:11:33 +01:00
Christoph Oelckers
f7c7b07962
Merge branch 'master' of https://github.com/rheit/zdoom
2013-12-01 20:37:50 +01:00
Christoph Oelckers
25f60779fd
- fixed: The 'allowdecals' check in animated doors was wrong.
2013-12-01 20:20:26 +01:00
Christoph Oelckers
8451cc6e9f
Merge branch 'master' of https://github.com/rheit/zdoom
2013-12-01 16:49:55 +01:00
Christoph Oelckers
c5b2c95572
- fixed placement and handling of 'allowdecals' for animated doors.
2013-12-01 15:11:41 +01:00
Christoph Oelckers
a915c934b5
Merge branch 'master' of https://github.com/rheit/zdoom
2013-12-01 01:43:50 +01:00
Christoph Oelckers
7e062f394b
- fixed: animated door textures defined by index were not added to the sequence.
...
- fixed: animated doors should set 'no decals' for the texture.
- added 'allowdecals' option to override the above.
2013-12-01 01:26:30 +01:00
Christoph Oelckers
b91d5d5eb5
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
2013-11-03 16:55:00 +01:00
Randy Heit
c2bac9d2df
Add WorldPanning flag for camera texture definitions.
...
- To make camera textures pan in world units instead of texture units, you
can now add "WorldPanning" at the end of the cameratexture definition in
ANIMDEFS, after the "fit" specification. e.g.
cameratexture CAMTEX 128 128 fit 64 64 worldpanning
2013-10-09 21:29:28 -05:00
Christoph Oelckers
251cdacf26
Merge branch 'master' into scripting
...
Conflicts:
src/g_shared/a_randomspawner.cpp
src/g_strife/a_strifeweapons.cpp
src/thingdef/thingdef_parse.cpp
wadsrc/static/actors/constants.txt
2013-09-03 09:01:28 +02:00
Christoph Oelckers
bab56106c1
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-31 21:53:11 +02:00
Randy Heit
260ce62175
Don't abort for TEXTUREx lumps that define textures with no patches
...
- A texture defined in TEXTUREx without any patches isn't necessarily an
error, so accept. This also means they shouldn't be used for determining
if a TEXTURE directory belongs to Strife instead of Doom.
2013-08-30 23:10:20 -05:00
Christoph Oelckers
bba092cc0b
Merge branch 'master' into scripting
...
Conflicts:
src/d_player.h
src/g_doom/a_archvile.cpp
src/thingdef/thingdef.h
src/thingdef/thingdef_properties.cpp
2013-08-09 13:03:28 +02:00
Christoph Oelckers
2cd1fd9658
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-30 15:25:09 +02:00
Edoardo Prezioso
7e21eafc2f
- Fixed mismatched alloc/dealloc in FTextureManager.
...
The 'TextureFrames', which is attached to all the 'mAnimatedDoors', were deleted with one-pointer 'delete' and they were allocated with 'new[]'.
2013-07-30 13:36:56 +02:00
Christoph Oelckers
399d0974ab
- added GL render as of SVN revision 1600.
2013-06-23 09:49:34 +02:00
Randy Heit
459ad5abff
- Updated scripting branch to latest version in trunk.
...
SVN r4337 (scripting)
2013-06-07 03:31:30 +00:00
Braden Obrzut
b493d8e823
- Just remembered that the true color stuff generates textures differently. Changed the previous commit to expand 1, 2, and 4 bit grayscale images while reading the PNG instead of changing the palette.
...
SVN r4289 (trunk)
2013-05-26 04:56:52 +00:00
Braden Obrzut
dabd48ab81
- Fixed: 4, 2, and 1 bit grayscale images weren't properly supported.
...
- Fixed: Valgrind uninitialized memory error and a signed/unsigned warning.
SVN r4288 (trunk)
2013-05-26 04:03:47 +00:00
Braden Obrzut
316faf59b4
- Fixed: Skin mugshots didn't load. (This adds a texture usetype for skin graphics.)
...
SVN r4205 (trunk)
2013-03-25 18:20:39 +00:00
Randy Heit
fef083f59c
- Use a temporary bitmap when when copying true color pixels of a multipatch texture, the blend
...
operation is not BLEND_NONE, and it doesn't just redirect straight to a direct texture.
SVN r4151 (trunk)
2013-02-20 01:31:41 +00:00
Braden Obrzut
c845675b9b
- Fixed: When using PALVERS on the sky, it used the scaling from the true color version. (Side Note: I changed a line that scales the sky position according to the y scaling factor. This is because a 2x high resolution sky at 2048x256 wasn't positioned the same as a 1024x128 unscaled version. I moved the expression to the > 200 height path only, but I'm not sure if it's even still needed.)
...
- Fixed: PALVERS crashed with unknown textures since a value was never given for %s.
- Fixed: FON2 loader didn't set ActiveColors correctly.
SVN r3973 (trunk)
2012-11-30 23:36:02 +00:00
Randy Heit
e7efa1d802
- Update to latest version in trunk.
...
SVN r3890 (scripting)
2012-10-17 04:24:54 +00:00
Randy Heit
4ac8f5eae4
- Fixed: FMultiPatchTexture::CopyTrueColorPixels() set up the alpha values backwards for blend mode BLEND_OVERLAY.
...
SVN r3806 (trunk)
2012-08-04 03:01:17 +00:00
Randy Heit
562cf04db2
- Update scripting branch to trunk.
...
SVN r3758 (scripting)
2012-07-14 03:04:41 +00:00
Randy Heit
fd784b05c2
- Fix some GCC 4.7.1 warnings.
...
SVN r3747 (trunk)
2012-07-07 03:43:11 +00:00
Randy Heit
ce8ca26bc9
- Fixed: Don't warn when an Inventory item's Icon is set to "".
...
SVN r3720 (trunk)
2012-07-01 02:57:00 +00:00
Christoph Oelckers
6db4164794
- added a check to the ANIMATED parser that prints an error message if it tries to read past the end of the lump.
...
SVN r3679 (trunk)
2012-06-06 07:02:30 +00:00
Braden Obrzut
f4ff63e7c3
- Fixed: FMultiPatchTexture::ParsePatch didn't pass the usetype onto FTexture::CreateTexture.
...
SVN r3658 (trunk)
2012-05-17 03:24:27 +00:00
Randy Heit
1ac8f8b348
- Did some restructuring of FMultiPatchTexture::CopyTrueColorPixels() so that it composites to
...
a temporary bitmap before copying to the destination bitmap if any fancy stuff is going on.
This simplifies the part drawing, since it doesn't need to check if each part is a multipatch
texture. It also means it can reliably use copy operations other than OP_COPY.
SVN r3639 (trunk)
2012-05-11 03:52:58 +00:00
Randy Heit
37001d3640
- Added new patch style "Overlay" for TEXTURES. This is the same as CopyAlpha, except it only
...
copies the patch's alpha channel where it has a higher alpha than what's underneath.
SVN r3638 (trunk)
2012-05-11 02:26:50 +00:00
Randy Heit
b9c3f8db4f
- Added a new patch style: CopyNewAlpha. This works just like Copy except it multiplies each
...
pixel's alpha channel by the specified Alpha property.
SVN r3637 (trunk)
2012-05-11 02:05:24 +00:00
Randy Heit
eb03d8e77e
- There doesn't seem to be much point to this inf==NULL check when inf isn't used either way...
...
SVN r3635 (trunk)
2012-05-10 03:47:40 +00:00
Randy Heit
9340dc4eca
- Changed FMultiPatchTexture::CopyTrueColorPixels() so that all parts use their copy info.
...
Previously, "complex" parts would ignore it and use the copy info passed to the function
instead. The copy info passed to the function is now only used to decide to if it should clear
the destination image. I'm not sure if this really matters, since it itself is the only place aside
from FTexture::FillBuffer() that ever calls CopyTrueColorPixels() with a copy info, and when
it does so for a multipatch texture, it does so to a temporary buffer.
SVN r3634 (trunk)
2012-05-10 03:07:30 +00:00
Randy Heit
c05345668c
- Fix wrong case 'NULL' from previous commit. (I sure hope that patch was
...
tested!)
SVN r3434 (trunk)
2012-03-12 22:23:17 +00:00
Christoph Oelckers
365311ec36
- added SMMU/Eternity method of defining warped textures (Patch by Gez)
...
SVN r3433 (trunk)
2012-03-12 14:30:45 +00:00
Randy Heit
9acf65b9a4
- Added support for a PALVERS lump. This specifies replacement textures to
...
be used when for walls and floors when the renderer is paletted. The format
is very simple:
rgbtex1 paltex1
rgbtex2 paltex2
...
The first texture is the one to be used normally, and the second is the one
to be used in paletted modes.
The vid_nopalsubstitutions cvar can be used to ignore this lump.
SVN r3311 (trunk)
2011-11-04 01:12:53 +00:00
Braden Obrzut
e68d956208
- Fixed: 2048 should be a valid height for a Doom patch.
...
SVN r3310 (trunk)
2011-11-03 21:08:39 +00:00
Braden Obrzut
9c8bb236ec
- Backport r1253 through r1256 and r1259 of GZDoom.
...
* By pressing request, allow Linux users to build ZDoom with an FMOD version that doesn't give them 3D sound positioning. :p
* Fixed severe copy-pasta portal copy bug.
* 3D floors hidden by being moved above the ceiling or below the floor will no longer show in the automap.
* Reject TEXTURES scale of 0. They'd do nothing but provoke a division by zero error.
* Maybe fixed Linux compilation?
SVN r3297 (trunk)
2011-09-27 01:14:31 +00:00
Christoph Oelckers
5bfcaab25c
- separation of software renderer from the rest of the code complete. All external access to the renderer is routed through the FRenderer interface class now, with two exceptions (2D texture drawing to a canvas and polymost testing code) that are handled by #defines.
...
SVN r3263 (trunk)
2011-07-07 15:37:47 +00:00
Christoph Oelckers
f08188b0e5
- removed unneeded includes of r_local.h.
...
SVN r3261 (trunk)
2011-07-06 18:12:16 +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
163301dcd5
- took all includes of farchive.h out of headers. This file will have to be included explicitly in each source file that needs it.
...
SVN r3259 (trunk)
2011-07-06 14:20:54 +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
17ed7aaabd
- moved the code from r_data.cpp to some better fitting places and deleted this file and r_data.h because the remaining parts of it were just a random collection of unrelated functions.
...
SVN r3248 (trunk)
2011-07-05 10:02:38 +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
Randy Heit
2de3937338
- Fixed: Typo in FClipRect::Intersect() could case bad clipping.
...
SVN r3211 (trunk)
2011-05-19 04:46:04 +00:00
Randy Heit
29e486495b
- Fixed: The sign in Eternall.wad, map25 on line 2236 rendered at the wrong height because Doom
...
ignored the Y locations of patches drawn on two-sided midtextures and always drew them at the
top of the texture. Added a compatibility flag.
SVN r3205 (trunk)
2011-05-13 03:29: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
1b93b56f46
- damn integer type confusion... :(
...
SVN r3155 (trunk)
2011-02-19 13:35:11 +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
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
f0f17e531c
- move static AM color initialization into the AM_StaticInit function.
...
- move D_LoadWadSettings to keysections.cpp.
- made some more data reloadable.
- data structures filled by P_SetupLevel should be cleared before loading the level. They can remain non-empty in case of an error. There's probably more to fix here...
- fixed: MidiDevices and MusicAliases were not cleared before reloading local SNDINFOs.
- fixed signed/unsigned warnings in AddSwitchPair for real (GCC really allows -1u? MSVC prints a warning for that.)
SVN r3036 (trunk)
2010-12-14 00:50:02 +00:00