Commit graph

1585 commits

Author SHA1 Message Date
Magnus Norddahl
9953d70eaa Merge remote-tracking branch 'upstream/master' into truecolor 2016-08-06 20:45:35 +02:00
Magnus Norddahl
346badf25f Moved state to FGLPostProcessState and merged vertex shaders 2016-08-06 11:51:08 +02:00
Christoph Oelckers
09e40840b5 Merge branch 'master' of https://github.com/rheit/zdoom 2016-08-05 15:15:11 +02:00
Magnus Norddahl
a893013dbb Adds HUD quadruple scale and a scale slider for the crosshair 2016-08-05 12:20:34 +02:00
Magnus Norddahl
0457fee9c0 Added lens distortion effect to menus 2016-08-04 17:22:05 +02:00
Magnus Norddahl
6fc7596d52 Fix aspect ratio and texture clipping in lens shader 2016-08-04 15:47:15 +02:00
Christoph Oelckers
2c38e20352 - update xlat/eternity.txt for reference. 2016-08-03 13:16:14 +02:00
Magnus Norddahl
6b9529d70f Added lens distortion shader 2016-08-02 17:32:21 +02:00
Magnus Norddahl
7709db4bb0 Fix broken viewport/backbuffer location for WriteSavePic 2016-07-31 16:23:21 +02:00
Christoph Oelckers
a69182f9ef Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-31 09:19:36 +02:00
Leonard2
8068792f4b Fixed: A_RadiusGive had an incorrect definition 2016-07-31 09:06:14 +02:00
Christoph Oelckers
c93204cace Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-07-30 22:09:56 +02:00
Christoph Oelckers
124c109e18 Merge branch 'multisamplingbuffers' of https://github.com/dpjudas/zdoom 2016-07-30 16:35:19 +02:00
Magnus Norddahl
cfc20d1198 Added multisample support to FGLRenderBuffers and added gl_multisample to the menus 2016-07-30 15:33:30 +02:00
alexey.lysiuk
7de242930a Removed obsolete gamma correct shader used on macOS only 2016-07-30 15:30:35 +03:00
Christoph Oelckers
0c8a4689b8 Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-30 13:26:25 +02:00
Xaser Acheron
a1a0da1f13 added SWF_SELECTPRIORITY flag to A_SelectWeapon 2016-07-29 18:48:54 -05:00
Christoph Oelckers
50765f8b79 Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-30 00:32:29 +02:00
Christoph Oelckers
f4cbde856b Merge branch 'bloom' of https://github.com/dpjudas/zdoom 2016-07-30 00:30:27 +02:00
Major Cooke
13fa06fe7a Renamed GetProximity to CountProximity.
# Conflicts:
#	wadsrc/static/actors/actor.txt
2016-07-30 00:27:12 +02:00
Major Cooke
167cb28563 Added GetProximity(classname, distance, flags, ptr).
- Behaves similarly to A_CheckProximity but returns the count of classname instead of true/false.

# Conflicts:
#	wadsrc/static/actors/actor.txt
2016-07-30 00:26:55 +02:00
Major Cooke
dfed6ac1fb Added SpriteAngle and SpriteRotation properties.
- Includes four functions, A_SetSprite(Angle/Rotation) and GetSprite(Angle/Rotation).
- SpriteRotation offsets the angle of the sprite, allowing for actors to move backwards or sideways for example.
- SpriteAngle requires +SPRITEANGLE and sets the actor's sprite to the absolute rotation found at that angle. Overrides SpriteRotation once the flag is on.
2016-07-30 00:26:40 +02:00
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
Magnus Norddahl
50f59bd3c7 Merge remote-tracking branch 'upstream/master' into truecolor 2016-07-28 10:54:44 +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
Magnus Norddahl
421cd2f403 Merge remote-tracking branch 'upstream/master' into truecolor 2016-07-17 23:36:35 +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
Magnus Norddahl
335ca12909 Merge remote-tracking branch 'upstream/master' into truecolor 2016-06-27 12:29:23 +02:00
Magnus Norddahl
7705463966 Improved linear filtering of walls
Fixed some crash bugs
Added mipmap and filtering options to the display menu
2016-06-25 10:33:35 +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
Magnus Norddahl
3369a2747c Merge remote-tracking branch 'upstream/master' into truecolor
# Conflicts:
#	src/r_things.cpp
2016-06-17 08:23:42 +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
Magnus Norddahl
351874be30 Merge remote-tracking branch 'upstream/master' 2016-06-12 00:08:05 +02: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
Magnus Norddahl
9420826094 Merge remote-tracking branch 'upstream/master' 2016-06-10 16:59:20 +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
Magnus Norddahl
05220a7133 Added IsBgra() to DCanvas
Changed SWRender output format to be decided by IsBgra()
2016-05-31 09:36:18 +02:00
Magnus Norddahl
7080180d47 Added menu option for toggling true color output on and off 2016-05-30 13:32:24 +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