zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-27 03:41:01 +00:00
Code Issues Projects Releases Packages Wiki Activity
7423 commits 133 branches 151 tags 210 MiB
Commit graph

266 commits

Author SHA1 Message Date
Christoph Oelckers
8b4f4d06ad Merge branch 'zmaster' 2016-03-13 02:32:41 +01:00
Randy Heit
8a03b99b9c Use ScriptMessage to warn about missing patches in a TEXTURES texture 2016-03-12 19:23:49 -06:00
Christoph Oelckers
a96d6ab072 Merge remote-tracking branch 'remotes/zdoom/master' 
# Conflicts:
#	src/g_level.cpp
#	src/p_3dfloors.cpp
#	src/p_lnspec.cpp
#	src/p_saveg.cpp
#	src/p_spec.cpp
#	src/r_bsp.cpp
#	src/r_data/r_interpolate.cpp
#	src/r_data/r_translate.cpp
#	src/r_data/sprites.cpp
#	src/r_defs.h
#	src/r_sky.h
#	src/stats.h
#	src/textures/texturemanager.cpp
#	src/textures/textures.h
#	src/version.h
#	src/win32/fb_d3d9.cpp
#	src/win32/hardware.cpp
#	src/win32/i_system.cpp
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/compatibility.txt
#	wadsrc/static/language.enu
#	wadsrc/static/mapinfo/common.txt
#	wadsrc/static/menudef.txt
#	wadsrc/static/xlat/eternity.txt
 2016-03-01 18:50:45 +01:00
Randy Heit
55142078d8 Normalize line endings 2016-03-01 09:47:10 -06:00
Christoph Oelckers
dfd7e08307 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/menudef.txt
 2016-02-21 01:55:15 +01:00
m-x-d
d2630dee8c Fixed: warp and warp2 texture effects now work for NPo2 textures. 2016-02-20 21:45:09 +01:00
Christoph Oelckers
56202c49f1 Merge branch 'master' of c:\programming\doom-dev\zdoom 
# Conflicts:
#	.gitignore
 2016-02-16 21:02:13 +01:00
Christoph Oelckers
6adb069506 - rewrote p_local.h so that it doesn't pull in the entire bunch of headers. 
This was to resolve some circular dependencies with the portal code.
The most notable changees:

 * FTextureID was moved from textures.h to doomtype.h because it is frequently needed in files that don't want to do anything with actual textures.
 * split off the parts from p_maputl into a separate header.
 * consolidated all blockmap related data into p_blockmap.h
 * split off the polyobject parts into po_man.h
 2016-02-15 02:14:34 +01:00
Christoph Oelckers
dda73b531c Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/p_setup.cpp
#	src/r_defs.h
#	src/version.h

This only updates to a compileable state. The new portals are not yet functional in the hardware renderer because they require some refactoring in the data management first.
 2016-02-05 12:31:41 +01:00
Randy Heit
b3b0886b64 Merge branch 'scripting' 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
 2016-02-04 15:17:22 -06:00
Christoph Oelckers
046541c7ef Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-02 10:46:50 +01:00
Christoph Oelckers
6b75f14c0f - fixed some Linux/GCC warnings. 2016-02-02 01:04:59 +01:00
Christoph Oelckers
371225858d Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-26 11:40:32 +01:00
Randy Heit
9f8dee45c4 Fixed: 0 was accidentally not allowed as transparent for grayscale 
- I don't know what I was thinking when I wrote that.
 2016-01-25 21:44:08 -06:00
Randy Heit
450b6de384 cRGBT::A should return 255, not 1. Whoops. 2016-01-25 21:31:21 -06:00
Randy Heit
0fc40cff0a Fix some rare PNG tRNS chunk cases 
- For grayscale images drawn with the paletted renderer, the value here
  was treated as always full range [0,65535]. The max value is actually
  determined by the bit depth.
- For RGB images drawn with the paletted renderer, the tRNS chunk was
  ignored.
- For grayscale images drawn with the RGB renderer, having a tRNS chunk
  present resulted in undefined behavior.
- For RGB images drawn with the RGB renderer, the tRNS chunk was ignored.
 2016-01-25 21:23:53 -06:00
Christoph Oelckers
cfcd2668cc Merge commit '772a5724313f2ad0bd6828fcc28545a9ee5e6068' into scripting 
Conflicts:
	src/p_pspr.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-17 20:00:45 +01:00
alexey.lysiuk
571f7a4eb6 - fixed: debug assertion failure in texture precaching 
loading of level from command line attempted to use uninitialized time value
 2015-12-25 09:48:22 +02:00
Christoph Oelckers
455d8d9730 Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-02 22:33:10 +01:00
Christoph Oelckers
81f521fe56 - fixed: Texture precaching from MAPINFO was broken 
The code assumed that it had access to the texture manager but that gets initialized after MAPINFO, which means that MAPINFO can only store the texture names and let the precaching code resolve the actual textures.
 2015-12-02 22:31:27 +01:00
Christoph Oelckers
d8ea128f38 Merge branch 'master' into scripting 
Conflicts:
	src/p_effect.cpp
	src/p_effect.h
	src/p_local.h
	src/p_map.cpp
	src/thingdef/thingdef_codeptr.cpp
 2015-07-16 20:37:17 +02:00
Christoph Oelckers
d58d38a1d3 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/p_3dfloors.cpp
 2015-07-13 21:36:19 +02:00
Christoph Oelckers
fe2e293d02 - added some error checks for trying to create unsupported animations for textures with full path names. 2015-07-13 09:08:08 +02:00
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