zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,440 Commits 6 Branches 6 Tags 107 MiB
Commit Graph

854 Commits

Author SHA1 Message Date
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
Christoph Oelckers 3300566493 - P_DropItem's chance parameter had an incorrect default value. 2013-08-12 01:54:45 +02:00
Christoph Oelckers 9455608e21 Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-11 21:05:36 +02:00
Christoph Oelckers fabf8272e6 Merge branch 'maint' 2013-08-11 21:04:17 +02:00
Christoph Oelckers c0174ea7cd - Added A_DropItem for DECORATE. 2013-08-11 20:48:08 +02:00
Christoph Oelckers 752f44502c Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-11 14:49:36 +02:00
Christoph Oelckers 36b487fd78 Merge branch 'maint' 2013-08-11 11:32:44 +02:00
Christoph Oelckers 1acbe17876 - specte typo in language.ptb. 2013-08-10 21:15:06 +02:00
Christoph Oelckers d438c6c456 - fixed typo in Strife spectre's obituary message and added it to the DECORATE definition of the spectre. 2013-08-10 20:42:34 +02:00
Christoph Oelckers c88bf3108c Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-10 10:21:00 +02:00
Christoph Oelckers 3bcc4078b1 Merge branch 'maint' 2013-08-10 10:19:20 +02:00
Christoph Oelckers 1c889dc9fa - let APowerRegeneration use the Strength property to define the amount of regeneration it gives. 2013-08-10 09:51:48 +02:00
Christoph Oelckers ad7c53855e Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-09 13:05:14 +02:00
Christoph Oelckers 21bce3b0c4 Merge branch 'maint' 2013-08-09 12:51:26 +02:00
Christoph Oelckers 5d0369d4ed - Ability to set A_VileAttack's initial attack's damage type - by BlueShadow. 2013-08-09 12:18:58 +02:00
Christoph Oelckers 34b71baad1 - added Player.Aircapacity property which is used as a multiplier for the level's air supply. 2013-08-09 11:57:14 +02:00
Christoph Oelckers 9f35788164 - added custom automap overlay colors. 
- extended am_drawmapback so that map backgrounds can only be drawn if used with custom colorsets and Raven's, assuming that these sets were specifically made for the accompanying backgrounds.
 2013-08-09 11:00:24 +02:00
Christoph Oelckers 62e55d710a Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-02 22:14:22 +02:00
Christoph Oelckers 8f45e906d4 Merge branch 'automap_colors' 2013-08-02 18:16:05 +02:00
Christoph Oelckers 42848f41dc - fixed typo in MENUDEFS. 2013-08-02 18:15:39 +02:00
Christoph Oelckers aa72857c72 - implemented automap color parser for MAPINFO (code not tested yet!) 2013-08-02 16:56:42 +02:00
Christoph Oelckers 845020c617 - ovthingcolors were not properly set. 
- added all the missing color CVARs for the overlays which previously duplicated use of one of the other CVARs.
 2013-07-31 23:13:20 +02:00
Christoph Oelckers ef6fca823e Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/version.h
 2013-07-30 15:20:38 +02:00
Christoph Oelckers e01c4e0201 Merge branch 'maint' 2013-07-30 13:18:08 +02:00
Christoph Oelckers 16456bec56 - added separate colors for the various types of 2-sided walls for the overlay automap. They previously all mapped to the same CVAR. 2013-07-30 13:17:20 +02:00
Christoph Oelckers 81334809c4 - changed autoloading of *.deh lumps: it is now controlled by a CVAR with 3 options: never load *.deh lumps, load all of them or only load the last one. *.deh loading is disabled by default. 2013-07-30 09:32:33 +02:00
Christoph Oelckers cf31ccbbaf Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-28 18:23:50 +02:00
Christoph Oelckers c253d40fbb - externalize labels for automap statistics display to the string table. 2013-07-28 16:18:57 +02:00
Christoph Oelckers b499742d46 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-25 17:31:27 +02:00
Christoph Oelckers 897a17309b - added menu option for sprite display on automap. 2013-07-25 17:22:45 +02:00
Christoph Oelckers cbc0b70e7c - TransferStencilColor A_SpawnItemEx patch / by Ryan Cordell. 2013-07-24 20:15:17 +02:00
Christoph Oelckers ba2faee125 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-22 23:01:58 +02:00
Christoph Oelckers f3d8790995 Merge branch 'maint' of https://github.com/rheit/zdoom into maint 2013-07-22 22:54:45 +02:00
Christoph Oelckers 83bd8ba1b8 - added NeuralStunner's player.userange submission, but changed it to use the value directly from the PlayerPawn data. 
- bumped savegame version for addition of APlayerPawn::userange.
 2013-07-22 22:37:50 +02:00
Christoph Oelckers aad509c800 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-14 14:47:12 +02:00
Christoph Oelckers 531da15ac2 Merge branch 'maint' 2013-07-14 14:44:11 +02:00
Christoph Oelckers 10dd75f902 - externalized "New save game" line for save screen. 2013-07-14 09:31:49 +02:00
Christoph Oelckers 453f4ace5c - added compatibility setting for stuff in Cheogsh2 MAP04's megasphere cage which is positioned too low. 2013-07-14 09:01:00 +02:00
Christoph Oelckers edd2142a0f Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-02 22:11:55 +02:00
Randy Heit 3d61365879 Merge branch 'maint' 2013-07-02 14:51:49 -05:00
Randy Heit 5af1e6f734 - Added a compatibility option to fix Super Sonic Doom's first bonus 
stage leaving you frozen when you finished it.
 2013-07-02 14:15:08 -05:00
Christoph Oelckers 503dc1d9a1 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	wadsrc/CMakeLists.txt
 2013-07-02 09:59:59 +02:00
Braden Obrzut cc616a417d Merge branch 'maint' 2013-07-01 16:58:14 -04:00
Braden Obrzut 02ff428d54 - Allow generator expressions to be turned off during pk3 building with CMake. 
- On Mac OS X, ensure assembly code is disabled by default (since it won't work).
 2013-07-01 16:57:46 -04:00
Christoph Oelckers ddae9757a8 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-26 09:32:43 +02:00
Christoph Oelckers f0feee3b4e Merge branch 'maint' 2013-06-26 01:03:19 +02:00
Christoph Oelckers fb1734ba50 - fix previous commit and add compat option for Cheogh's blue key. 2013-06-26 00:57:26 +02:00
Christoph Oelckers 4622ab865b - merged the two blocks for void.wad in compatibility.txt. 2013-06-25 11:55:49 +02:00
Christoph Oelckers 5a24190796 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-24 02:31:18 +02:00
Christoph Oelckers e4f78f225c Merge fix. 2013-06-24 02:26:23 +02:00
Christoph Oelckers 631fd69719 - fixed: GoldWandPuff2 requires the PUFFONACTORS flag. 2013-06-24 02:25:16 +02:00
Christoph Oelckers 5fd3b1cf19 - added _mental_*s compatibility fix for Ultimate Simplicity, map07 2013-06-23 17:38:51 -05:00
Christoph Oelckers faeba3933e Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-23 18:52:45 +02:00
Christoph Oelckers 7d56311152 - added Ryan Cordell's A_CheckRange submission. 2013-06-23 18:45:17 +02:00