zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-18 00:22:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
8749 commits 132 branches 151 tags 206 MiB
Commit graph

1335 commits

Author SHA1 Message Date
Magnus Norddahl
5849c83028 Added bloom and tonemap to menus 
Added gl_renderbuffers CVAR that disables render buffers
Added patch shader support to FShaderProgram
Added OpenGL 2 fallback support to render buffers
 2016-07-29 21:31:20 +02:00
Magnus Norddahl
0efee85bd8 Added tonemapping and sector based exposure control 2016-07-29 00:36:43 +02:00
Christoph Oelckers
b8abec4e1f Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-28 09:20:48 +02:00
MajorCooke
3d9591229e Added A_CopySpriteFrame(from, to, flags).. 
- Copies a sprite/frame from one actor pointer to another. Sprite and/or frame copying can be disabled with flags CPSF_NO<SPRITE/FRAME>.
 2016-07-28 08:39:32 +02:00
Magnus Norddahl
69f52cc898 Added bloom shaders 2016-07-27 21:50:30 +02:00
Christoph Oelckers
c9f93d9c88 Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-27 11:28:55 +02:00
Magnus Norddahl
aeb7df09de Added hardware gamma option and improved window handling on Windows 2016-07-27 11:15:19 +02:00
Blue-Shadow
69a00ddabb Added TRANSFERTRANSLATION morph flag 2016-07-24 00:56:57 +02:00
Magnus Norddahl
41e959e102 Adds the last texture filter mode (trilinear min filter with nearest magnification) 2016-07-23 18:57:37 +02:00
Magnus Norddahl
669238db66 Fix Apple GLSL compile errors 2016-07-23 17:27:19 +02:00
Magnus Norddahl
c08fc8f5a8 Fix depth calculations for R_DoomLightingEquation and make it an exact match of what zdoom does 2016-07-23 17:27:19 +02:00
Christoph Oelckers
2cdc77de34 Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-23 10:56:12 +02:00
yqco
4d6532d303 Added RGF_NORANDOMPUFFZ flag for A_CustomRailgun and A_RailAttack 2016-07-22 02:46:41 -06:00
Christoph Oelckers
881731d76b Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-21 08:28:56 +02:00
Blue-Shadow
c428e376cd Added INFLICTORDMGTYPE flag to A_Damage* action functions 
It forces the use of the inflictor's damagetype instead of whatever is
passed to the functions.
 2016-07-19 08:34:55 +02:00
MajorCooke
35c30ab62f Fixed missing constants. 2016-07-16 20:28:43 -05:00
Christoph Oelckers
bce9929c22 Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-16 19:57:09 +02:00
MajorCooke
3c7e1e0528 - Added the tracer actor spawning for A_FireBullets and A_CustomBulletAttack. 
The projectiles spawning conditions rely upon the puff successfully spawning.

# Conflicts:
#	wadsrc/static/actors/actor.txt
 2016-07-16 17:34:15 +02:00
alexey.lysiuk
da9f4cc1dd Added 'ammo display order' item to options menu 2016-07-16 16:15:59 +02:00
Christoph Oelckers
943a799aee Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-16 08:30:33 +02:00
MajorCooke
b121284fc0 Added GAF_SWITCH to GetAngle, inverting the function to get the caller's angle on the pointer instead. 2016-07-14 17:14:17 +02:00
Christoph Oelckers
2a42c20c8c Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-13 09:30:16 +02:00
m-x-d
1cf51791de Adds //%Title property to all locks to make parsing LOCKDEFS by map editors more feasible. 
Fixes: Strife Base key Message now uses LANGUAGE string.
 2016-07-12 23:52:04 +02:00
Christoph Oelckers
522b2f4706 - updated xlat/eternity.txt for reference. 2016-07-12 23:50:45 +02:00
Christoph Oelckers
279b939521 Merge branch 'master' of c:\programming\doom-dev\zdoom 2016-07-04 00:44:52 +02:00
Christoph Oelckers
0b93e9b897 Merge branch 'roll' of https://github.com/MajorCooke/zdoom 2016-07-04 00:43:16 +02:00
Christoph Oelckers
e42442732a Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-03 13:39:58 +02:00
Christoph Oelckers
148de414e0 - fixed: Checking for quest item 0 should not print an error message but silently fail. 2016-07-03 13:32:40 +02:00
Christoph Oelckers
57667c2e0b Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/language.eng
 2016-06-29 14:58:32 +02:00
Christoph Oelckers
593e2f7641 - fixed spelling. 2016-06-29 13:03:39 +02:00
jayman2000
43e62c4236 Added sliders in the display options menu to control movebob and stillbob. 2016-06-29 13:02:55 +02:00
Christoph Oelckers
af20f31b94 Merge branch 'master' of https://github.com/rheit/zdoom 2016-06-21 10:46:12 +02:00
Christoph Oelckers
ce0c2863b0 - set 'maskedmidtex' compatibility option for Caverns of Darkness MAP07. 2016-06-21 10:31:25 +02:00
MajorCooke
26408a5043 Switched the pointer to AAPTR_DEFAULT. 2016-06-20 09:11:38 -05:00
MajorCooke
85a34bbb88 Added GetPlayerInput(int numinput, int ptr = AAPTR_PLAYER1). 
- Works exactly like the ACS version, but with pointers instead. The pointer can be anything, so long as it can be identified as a player.
 2016-06-20 08:49:57 -05:00
MajorCooke
630dc8c8cd Fixed execution prevention. 2016-06-19 22:18:43 -05:00
MajorCooke
dd410876cf Added A_ClearOverlays(int start, int stop, bool safety). 
- Clears a set of overlays in ranges [start,stop]. If unspecified, wipes all non-hardcoded layers. Safety determines whether to affect core layers or not (i.e. weapon). Returns the number of layers cleared.

Added no override boolean to A_Overlay and a boolean return type.

- If true, and a layer already has an active layer, the function returns false. Otherwise, sets the layer and returns true.
 2016-06-20 01:15:49 +02:00
Christoph Oelckers
b7d13c0711 Merge branch 'master' of https://github.com/rheit/zdoom 2016-06-17 16:18:24 +02:00
Christoph Oelckers
7ccdbf9b62 Merge branch 'PSprites' 2016-06-16 16:16:16 +02:00
Xaser Acheron
de0301a704 split bfg self-damage code into its own function, A_RadiusDamageSelf 2016-06-16 00:43:07 +02:00
Xaser Acheron
481ef7a5b5 added SMMU-BFG11k-style 'damrad' property to A_BFGSpray 2016-06-16 00:43:07 +02:00
Xaser Acheron
8e8248284a added BFGF_HURTSOURCE and BFGF_MISSILEORIGIN to A_BFGSpray 2016-06-16 00:43:06 +02:00
MajorCooke
2d4eb8dde4 - Added limit parameter to A_RailAttack and A_CustomRailgun. 2016-06-14 18:20:43 -05:00
Christoph Oelckers
9eb18a9e45 Merge branch 'master' of https://github.com/rheit/zdoom 2016-06-11 17:15:55 +02:00
MajorCooke
fb286d1737 - Changed endsize to sizestep. Endsize affected more things than I thought it would. 2016-06-11 08:05:29 -05:00
Leonard2
ebe3f23677 Added GetCVar(string name) 
Works like ACS's GetCVar
 2016-06-11 10:15:49 +02:00
MajorCooke
f787056198 - Added endsize parameter and SPF_NOTIMEFREEZE for A_SpawnParticle. 
SPF_NOTIMEFREEZE processes particles with this flag regardless of time freeze. The endsize parameter changes the scale of the particle to that size throughout its lifetime linearly.
 2016-06-11 10:00:50 +02:00
Leonard2
afa708c138 Allow psprite layers to be manipulated directly from the player's own body 2016-06-03 19:18:58 +02:00
Leonard2
543414d31f Added 2 new layer flags: PSPF_CVARFAST and PSPF_POWDOUBLE 
These flags allowed to easily restore a lost part of the targeter layers
behavior
 2016-06-03 00:50:11 +02:00
Christoph Oelckers
9cf1d96698 - added identification for delaweare.wad to the list of supported IWADs. 2016-06-02 12:04:35 +02:00
Christoph Oelckers
18ebe92cfc Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/g_level.cpp
 2016-06-01 11:45:57 +02:00
MajorCooke
bb91723174 - Added GetCrouchFactor(ptr). 
Gets the crouch factor of a player. Can be set to target/master/tracer, as long as it's a player. Defaults to the first player.
 2016-05-29 12:43:46 +02:00
MajorCooke
2719905ade - Added source and inflictor parameters to all A_Damage/Kill functions. 
- Source is the actor to blame for the cause of damage (monster infighting for example). For missiles, modders should consider setting to AAPTR_TARGET.
- Inflictor is the actor doing the damage itself. Note that by changing this, it will take into account the flags on the pointed actor.
 2016-05-29 12:40:17 +02:00
Roadcrosser
334962da2c Corrected death message not being gender neutral. 2016-05-29 12:38:36 +02:00
Leonard2
2f5ae3b51e Changed the default layer indices and renamed them 
Note that this doesn't compile yet
 2016-05-28 01:19:41 +02:00
Leonard2
c82620129c Added A_OverlayFlags 
Allows psprites to follow the weapon and/or the player's bobbing
 2016-05-28 01:19:40 +02:00
Christoph Oelckers
a0dc4ae738 Merge branch 'master' of https://github.com/rheit/zdoom 2016-05-24 13:53:52 +02:00
MajorCooke
1b1195df6a - Added limit parameter to A_RadiusGive. 
- The function ends operation if the number of successfully given actors reaches this count.
 2016-05-23 21:11:26 -05:00
Leonard2
8c205ebac3 Added A_OverlayOffset 
Like A_WeaponOffset except it can access any psprites
 2016-05-20 17:04:45 +02:00
Leonard2
1ecfb5897b Added A_Overlay 2016-05-20 17:04:45 +02:00
Christoph Oelckers
ea62d4c2d1 Merge branch 'master' of https://github.com/rheit/zdoom 2016-05-18 21:47:42 +02:00
Christoph Oelckers
f22adcc398 - be more thorough with Eternal Doom MAP03. The compatibility option does not seem to fully solve the problem, so let's just clear the tags in the bogus stair sectors. 2016-05-18 21:06:07 +02:00
Christoph Oelckers
ae3f50d1b2 - set a compatibility option to build the stairs in Eternal Doom MAP03 correctly. 2016-05-18 13:11:31 +02:00
MajorCooke
cd3a3d4472 Not like this makes a difference. 2016-05-18 11:19:24 +02:00
MajorCooke
115dbd0b58 - Added A_WeaponOffset(x = 0, y = 32, flags). 
- Places the weapon offset by the defined x and y. Both are floats. This stacks with weapon bobbing.
- WOF_KEEPX: Don't change the X offset.
- WOF_KEEPY: Don't change the Y offset.
- WOF_ADD: Add onto instead of replacing the coordinates.
 2016-05-18 11:19:24 +02:00
Christoph Oelckers
03b31796cc Merge branch 'master' of https://github.com/rheit/zdoom 2016-05-13 10:09:24 +02:00
MajorCooke
2ba26693d1 - Added 3D Floor + Portal awareness, along with flags to turn off detection of both features. 2016-05-12 22:15:06 +02:00
MajorCooke
b91ed5dc5d Added GetZAt DECORATE function. 
- float GetZAt(x, y, angle, flags, pick_pointer);
- Gets the floor z  at x distance ahead and y distance to the side in relative form from the calling actor pointer. Flags are as follows (GZF_ prefix):
- CEILING: Returns the ceiling z instead of floor.
- ABSOLUTEPOS: x and y are absolute positions.
- ABSOLUTEANG: angle parameter does not add the pointer's angle to the angle parameter.
 2016-05-12 22:15:05 +02:00
MajorCooke
39f64383cb Changed RTF_THRUSTZ to match RADF_THRUSTZ's bitmap. 2016-05-11 19:41:33 +02:00
MajorCooke
952219a018 Added RTF_THRUSTZ for A_RadiusThrust. 
- Allows thrusting with Z velocity.
 2016-05-11 19:41:33 +02:00
Christoph Oelckers
3334b28a02 - don't let the light go completely black with software-emulated lighting. 2016-05-04 14:30:10 +02:00
Christoph Oelckers
9f91fa8f43 - make the warp2 shader's formula match the software renderer's. 
This fixes some jerkiness with vertical scrollers due to a bad sine period and makes the overall appearance of the effect what it was originally supposed to be. The old warp2 shader was not created by replicating the formula but by trial and error until it looked close enough.

A version of the old warp2 shader with a fixed sine period is still available as a custom hardware shader.
 2016-05-04 13:47:40 +02:00
alexey.lysiuk
f9022f3054 Fixed compilation of gamma correction shader with particular OpenGL setup 2016-05-02 16:13:54 +03:00
alexey.lysiuk
333560086d Calculate color values for gamma correction directly in shader 
Gamma table texture is no longer needed
 2016-05-02 11:24:42 +03:00
alexey.lysiuk
44b019413c Implemented gamma correction in OS X native backend using shader effect 2016-05-02 10:04:09 +03:00
MajorCooke
0bf7c3e362 - Removed FlatAngle. This will come back hopefully in another commit sometime in the future. 2016-05-01 17:19:39 -05:00
MajorCooke
f41dcc75d1 FlatAngle can now be defined directly via properties. 2016-05-01 16:33:00 -05:00
MajorCooke
a8248433e9 - Updated <pitch>/flat/roll/wall sprites submission to 2.9+. (ZDoom compatibility submission. ) 
- FLATSPRITE: An actor becomes flat as if they were a decal on the floor.
- PITCHFLATSPRITE: A flat sprite tilts up and down based on pitch.
- WALLSPRITE: Similar to a Y billboarded sprite. The degree of the flattening is determined by the FlatAngle property.
- ROLLSPRITE: The sprite of the actor is affected by the Roll property.
 2016-05-01 08:45:50 -05:00
Christopher Bruns
c4590a2615 Fix locale string for "sprite billboard faces camera" menu option. 2016-04-30 18:15:28 -04:00
Christopher Bruns
ed6cf6cf1e Add menu option for new "sprites face camera" mode. 
# Conflicts:
#	wadsrc/static/menudef.z
 2016-04-30 18:15:28 -04:00
Christoph Oelckers
70bf649364 - added clip planes for line portals and mirrors. This should eliminate the remaining problems with some visible geometry in front of the portal, it is also necessary to handle sprite splitting across line portals properly. 2016-04-29 12:26:57 +02:00
Christoph Oelckers
dc772a9f34 Merge branch 'master' of https://github.com/rheit/zdoom 2016-04-29 11:48:46 +02:00
Christoph Oelckers
4a72c7d2f1 - fixed: Decals may not be serialized before thinkers. 
Since decals may have thinkers attached this will crash when such a savegame gets loaded, because the thinker lists get reset in P_SerializeThinkers, deleting any thinker that already was processed.
I also added an error message that immediately aborts the save process if such an out-of-sequence thinker is attempted to be written out.
This obviously breaks savegame compatibility again...
 2016-04-29 11:44:17 +02:00
Christoph Oelckers
21283b18f4 - preparations for using clip planes on line portals. 2016-04-29 01:48:06 +02:00
Christoph Oelckers
60a78a0d9b Merge branch 'master' of https://github.com/rheit/zdoom 2016-04-28 17:35:52 +02:00
MajorCooke
6f11a65893 - Converted rollIntensity from int to double. 
- It was already a double in the save version serialization so nothing had to be changed there.
 2016-04-27 12:58:18 -05:00
Christoph Oelckers
15480feb96 Merge branch 'master' of https://github.com/rheit/zdoom 2016-04-27 13:47:56 +02:00
MajorCooke
c972caa9f3 - Added rollIntensity and rollWave to A_QuakeEx. 
- Instead of moving the camera around, it rolls the camera.
- This only has an effect in GZDoom.
 2016-04-27 13:42:15 +02:00
Christoph Oelckers
f5afa30ee6 - added GetAngle(bool relative, int target) DECORATE function. 2016-04-27 11:52:52 +02:00
Christoph Oelckers
61b165ccc4 - fixed the camera height setting for the camera actors. 
The scripting branch changed camera semantics to default to an actor's center - which for monsters and decorations makes sense - but not for simple mapspots that get used as camera. For those the CameraHeight must be explicitly set to 0.
 2016-04-27 11:38:54 +02:00
Christoph Oelckers
86f38475b0 - shaders for last commit. 2016-04-27 02:10:42 +02:00
Christoph Oelckers
09f54b0940 - cleaned up the clip plane management for portals. 
Unfortunately the math behind the old clip planes is utterly impenetrable and so poorly documented that I have no idea how to set that up, so it is deactivated for now. It wasn't working anyway.
 2016-04-27 00:41:00 +02:00
Christoph Oelckers
f066457a48 - add shader patching to allow running the engine with GLSL 1.2. 
- made some initial preparations for the shader-less fallback path.
 2016-04-26 15:26:52 +02:00
Christoph Oelckers
fc38728309 - made some changes to the shaders to allow downpatching them to GLSL 1.2: 
* disable the dynamic light code if no buffers are available
 * added a duplicate of the getTexel function which cannot be patched without creating syntax problems.
 * fixe int<->float conversion warning, which on some compilers may be an error.
 2016-04-26 11:31:27 +02:00
Christoph Oelckers
172290224b - make modes 2 and 3 of Teleport_NoFog compatible with Eternity by defaulting to mode 1 when no line is available. 2016-04-25 01:01:28 +02:00
Christoph Oelckers
2914cdc939 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/r_defs.h
 2016-04-24 12:19:07 +02:00
Randy Heit
593f6c29ad Use 2 decimal places for volume sliders, since they move in 0.05 increments 2016-04-23 22:38:55 -05:00
Christoph Oelckers
f420ccd287 - made Teleport_NoFog compatible with Hexen and Eternity. 
ZDoom defaulted to Boom's (buggy) angle adjustment.
Changed it so that
 * Mode 0 is like Hexen, performing no adjustment at all. This still should match all known maps using this special.
 * Mode 1 remains unchanged.
 * Mode 2 replicates Boom's broken angle adjustment and is used in the xlat file.
 * Mode 3 implements the correct angle adjustment that Boom originally intended.

 (Note: Should some map require something different it should be handled with compatibility.txt instead of reverting this back to the broken way it was before.)
 2016-04-23 21:32:40 +02:00
Christoph Oelckers
20d3a72307 Merge branch 'master' of https://github.com/rheit/zdoom 2016-04-22 09:15:37 +02:00
Christoph Oelckers
ed070cfe06 - updated xlat/eternity.txt. 2016-04-21 13:01:57 +02:00