zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-06 04:50:26 +00:00
Code Issues Projects Releases Packages Wiki Activity
4227 commits 131 branches 149 tags 198 MiB
Commit graph

807 commits

Author SHA1 Message Date
Christoph Oelckers
cf45f2d718 - added missing shader files. 2014-05-12 22:24:26 +02:00
Christoph Oelckers
4d005bdfa0 shader rework 
All those special shaders have been merged together.
Mostly working but the non-shader lighting seems a bit broken.
 2014-05-12 14:45:41 +02:00
Christoph Oelckers
b9a6fe80a4 Do not use the shader to handle STYLEF_RedIsAlpha. 
Turns out that the name doesn't accurately describe what it does.
It is correct for images that come with their own palette or are true color.
But for images using the game palette it doesn't use the red channel to determine translucency but the palette index! Ugh...

This means it cannot be done with a simple operation in the shader because it won't get a proper source image. The only solution is to create a separate texture.
 2014-05-11 23:56:53 +02:00
Christoph Oelckers
7793bbbcc9 Further cleanup of lighting code. 
- remove thing color from lighting calculations.
- implement alpha textures and inverse sprites for infrared as texture modes. This still requires some handling for the alpha texture mode for non-shader rendering because there is no way in the fixed pipeline to do it. The inverted texture effect can be done with a texture combiner.
- fixed: ThingColor for sprites was set in the wrong place. It must be in the Process function, not in the lighting calculation.
- added functions for isolated calculation of sprites' dynlight color.
 2014-05-11 17:56:38 +02:00
Christoph Oelckers
52056a05bd - changed handling of DynLight in shader to serve as a global dynamic light color for all lighting modes. 2014-05-11 16:49:17 +02:00
Christoph Oelckers
53f4cd0108 - added objectcolor uniform. This will be used to hold the thingcolor for shader based rendering. 2014-05-11 16:06:25 +02:00
Christoph Oelckers
09f4071436 Ok, it had to be done: Removed shader support for pre GLSL 1.3/GL 3.0 hardware. The compromises needed to accomodate these are just too bad and would block any attempt at streamlining the code. 2014-05-11 13:27:51 +02:00
Christoph Oelckers
b09405a8bd - changed rendering of glowing walls so that it doesn't require an additional vertex attribute, just pass the floor and ceiling planes as uniforms. 2014-05-10 17:09:43 +02:00
Christoph Oelckers
6988156d0f Merge branch 'master' of https://github.com/rheit/zdoom 2014-05-08 09:49:00 +02:00
Christoph Oelckers
63a0e01c6a Merge branch 'interpview_optin' 2014-05-08 09:17:00 +02:00
Christoph Oelckers
67ebbe3ed4 made some changes to turn the CF_INTERPVIEW flag when changing angles into an op-in feature instead of making it automatic. 2014-05-08 09:15:56 +02:00
Christoph Oelckers
cc4305e86c Merge branch 'master' of https://github.com/rheit/zdoom 2014-04-30 01:29:26 +02:00
Christoph Oelckers
94c4f38c58 - added constants for sound channels 5-7. 2014-04-28 01:26:30 +02:00
Christoph Oelckers
97c7f2c5ce Merge branch 'master' of https://github.com/rheit/zdoom 2014-04-18 12:13:29 +02:00
Christoph Oelckers
7cb828d763 Merge branch 'slowstate' of https://github.com/Gaerzi/zdoom 2014-04-18 09:46:23 +02:00
Gaerzi
60fe07df74 Added slow states to relevant Strife monsters 
Namely, acolyte, shadow acolyte, reaver, stalker, and turret. Info on
which states needed the slow flag was obtained with Quasar's permission
by looking at G_InitNew() in g_game.c and the info.c state tables from
Chocolate Strife.
Also added fast flag to acolyte states that needed it, based on the same
source.
 2014-04-17 17:42:16 +02:00
Christoph Oelckers
29231fa3b7 Merge branch 'master' of https://github.com/rheit/zdoom 2014-04-16 11:34:32 +02:00
Gaerzi
94d47efbb5 Added slow monsters to Strife's easiest skill 2014-04-15 21:02:20 +02:00
Christoph Oelckers
745b147d18 - fixed typo in xlat files (they don't use exactly C syntax.) 2014-04-15 16:40:53 +02:00
Christoph Oelckers
dbefac81d8 Merge branch 'master' of https://github.com/rheit/zdoom 2014-04-15 09:26:05 +02:00
Gaerzi
580094a792 More editing flags 
PSX-inspired flags to change the render styles of monsters (and other
things).
 2014-04-10 12:32:23 +02:00
Christoph Oelckers
e983649731 Merge branch 'master' of https://github.com/rheit/zdoom 2014-03-31 16:02:43 +02:00
alexey.lysiuk
a97b068ed7 Enable fighting between different types of gargoyles and golems 
In vanilla Heretic:
- Gargoyles are able to fight with Fire Gargoyles
- Golems are able to fight with Nitro Golems, both regular and ghosted versions
 2014-03-30 13:27:27 +03:00
alexey.lysiuk
6a958b032c Add NOBLOOD flag to Heresiarch actor 
Heresiarch entity in vanilla Hexen doesn't spawn blood when hit
 2014-03-18 12:29:14 +02:00
alexey.lysiuk
3c8e9b6dc0 Fix incorrect Maulotaur melee attack sound 
It was STFHIT instead of STFPOW
 2014-03-16 12:29:04 +02: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
a60918f601 Add NoPushWindowCheck compatibility flag 
- For maps like xtheateriii that expect non-blocking push lines to
  activate when you are standing on them and run into a completely different
  line, there is now this compatiblity.txt-only flag.
 2014-02-24 17:43:28 -06:00
Christoph Oelckers
2490324652 Merge branch 'master' of https://github.com/Gaerzi/zdoom 2014-02-18 09:59:07 +01:00
Gaerzi
d7478bcd68 New Freedoom names 
- Added freedoom2.wad as valid alias name (freedoom1.wad already
existed).
- Renamed titles to Freedoom: Phase 1 and Freedoom: Phase 2.
- Reordered to put Phase 1 above Phase 2 in the IWAD picker.
 2014-02-18 00:40:14 +01:00
Christoph Oelckers
3e318e4555 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	.gitignore
	src/CMakeLists.txt
 2014-02-16 21:08:44 +01:00
Braden Obrzut
efa9e0c3ee Merge branch 'maint' 2014-01-18 18:10:48 -05:00
Braden Obrzut
e5d7077d74 - Fixed: Shareware games couldn't bother with the actor has no frames errors since we don't load mods. 
- Fixed: Heretic shareware used a different border for the statusbar.
 2014-01-18 15:09:12 -05:00
Christoph Oelckers
fd767233aa - fixed typo: glColor must be gl_Color in shader. 2013-12-08 10:01:03 +01:00
Christoph Oelckers
d46315c44b - some finetuning of subtractive effect. 2013-12-05 15:39:46 +01:00
Christoph Oelckers
95163e378e - added a fog layer when drawing sprites with render style reverse subtract. 2013-12-05 15:06:10 +01:00
Christoph Oelckers
3fbcfa7551 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-30 01:34:10 +01:00
Christoph Oelckers
cbed4624fa - added a user-settable factor for earthquake intensity. Value can be between 0 (no shaking) and 1 (normal shaking.) 2013-11-29 13:24:38 +01:00
Christoph Oelckers
4122e4041a Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-20 09:16:12 +01:00
Randy Heit
fe67ae5e54 Merge branch 'maint' 2013-11-19 21:01:15 -06:00
Randy Heit
62ffe7e4e2 Add NOGRAVITY to every Raven actor with FLOATBOB 
- Fixed: Heretic and Hexen completely skip all normal Z processing on
  mobjs with FLOATBOB set. To emulate that, we need to add NOGRAVITY to
  everything with that flag set.
 2013-11-19 19:42:13 -06:00
Christoph Oelckers
a338248e3e - converted project to Visual Studio 2008 format. 
I own a full professional version of 2008 and 2005 is having some stability issues with Windows 7 so it makes no sense to stick to the old compiler.
 2013-10-03 12:08:57 +02:00
Christoph Oelckers
daf5b97ff9 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/version.h
 2013-09-28 23:37:41 +02:00
Christoph Oelckers
a144221174 - changed the invisible waiting frame of the ExplosiveBarrel to use TNTA10 instead of the real barrel frame. This is so that sprite checks do not erroneously determine that there's still something to see. GZDoom's dynamic light code has problems with this. 2013-09-20 10:43:10 +02:00
Christoph Oelckers
4d3f6cae2e Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-27 23:53:40 +02:00
Christoph Oelckers
8e8f6cf5a6 - A_AlertMonsters flags submission by NeuralStunner. 2013-08-20 20:33:03 +02:00
Christoph Oelckers
42c9b68d47 Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-14 00:32:35 +02:00
Christoph Oelckers
62830f7927 - added separate automap color for non-counting monsters. 
- fixed: using a nonexistent CVAR in a ColorPicker menu item caused a crash.
 2013-08-14 00:32:05 +02:00
Christoph Oelckers
16f239536a Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-12 21:16:41 +02:00
Christoph Oelckers
ef22bb2521 Merge branch 'maint' 2013-08-12 01:55:12 +02:00