Commit graph

3616 commits

Author SHA1 Message Date
Major Cooke
6c5c6b1fd0 Merge remote-tracking branch 'gzdoom/master' into newmaster 2019-12-31 12:58:53 -06:00
Rachael Alexanderson
4bc923dddf - slight rearrange of vid_scalemode and menu update 2019-12-31 10:41:30 -05:00
Major Cooke
d101df463d Added ViewAngle/Pitch/Roll properties to actors.
- These are offsets for camera angles that allow turning the camera without affecting aim or movement direction.
- Added SPF_VIEW flag for A_SetAngle/Pitch/Roll, which will set the view direction instead of the actor's actual facing direction.
- Added ABSVIEWANGLES flag, used to make the view absolute instead of an offset.
2019-12-30 13:11:39 -06:00
Major Cooke
db3b296dfa Merge remote-tracking branch 'gzdoom/master' into newmaster 2019-12-30 12:56:24 -06:00
Major Cooke
77054fb638 Revert "Major Cooke: View Angles (Part 1)"
This reverts commit d2ecc535c1.
2019-12-30 12:50:14 -06:00
Chronos Ouroboros
b4ba7dfec2 Fixed a regression in DoTakeInventory. (the C++ code just ignored the null pointer, but ZScript can't do that) 2019-12-30 12:37:33 -03:00
Alexander Kromm
bd1892120d add Dictionary.Remove(String key) function 2019-12-30 14:57:37 +01:00
Cacodemon345
7fd27bc925 Add PSPF_PLAYERTRANSLATED flag (makes a PSprite layer translated to the user's color) 2019-12-30 13:05:38 +01:00
Christoph Oelckers
d08bb93b84 - elimintated all cases from the ZScript code where channel indices and flags were combined into one parameter and removed all remnants of CHAN_PICKUP. 2019-12-30 09:47:25 +01:00
Alexander Kromm
703686beee export TMap<FString, FString> to ZScript 2019-12-29 13:37:38 +01:00
Christoph Oelckers
77469e0512 - fixed the colorization parser. 2019-12-29 12:11:16 +01:00
Christoph Oelckers
9b9fd35107 - hooked up the colorization feature.
It can now be used from UDMF and ZScript.
To avoid clutter it doesn't allow setting the values individually but requires definition of a data record in TEXTURES.

colorization
{
    DesaturationFactor <float>
    Invert
    AddColor <color>
    ModulateColor <color>
    BlendColor <color>, <mode> [, <alpha>]
}

Mode for BlendColor can be Alpha (normal translucent blending), as well as 3 special values taken from Build engine games: Screen, Overlay and HardLight.
2019-12-29 11:30:37 +01:00
Rachael Alexanderson
01663e357e Merge branch 'master' of https://github.com/coelckers/gzdoom into newmaster 2019-12-28 14:19:31 -05:00
Rachael Alexanderson
4ff8922006 - reinstate 320x200 with the following caveat: it only functions outside of menus and console, and only when the dialogues and logs use the default font, the game will temporarily switch to 640x400 in these situations 2019-12-23 23:14:08 -05:00
Rachael Alexanderson
af18c78156 - Google fucked this up. Thanks Google. 2019-12-22 09:08:52 -05:00
Rachael Alexanderson
71808b0d3f - language update 2019-12-22 09:01:43 -05:00
Rachael Alexanderson
cd617ca0c6 - add vid_scalemode 6 to the menu 2019-12-22 09:01:43 -05:00
Christoph Oelckers
738b9ceb08 - fixed incompletely changed shader.
It was still using a variable from the first revision that no longer exists.
2019-12-21 21:07:00 +01:00
Christoph Oelckers
bb8db9422f - scaled down the texture colorization feature for easier usability.
It makes little sense exposing every minute detail of this through UDMF.
Setting it up that way is far too complicated. Using virtual textures that map to a real texture plus a colorization record should be far easier to use by mappers.
This also doesn't piggyback on the Doom64 color feature anymore and is completely separate, despite some redundancies.
This is still missing the texture definition part, though.
2019-12-20 22:25:10 +01:00
Christoph Oelckers
3a249cb06f - added high level interface to the new properties, i.e. UDMF and ZScript. 2019-12-20 18:02:42 +01:00
Christoph Oelckers
3209d4ed23 - added a few more texture coloring options to the shader.
Aside from adding an additive component it can now also do:

- desaturation (not limited to the range of 0..1 so it can also be used for oversaturation by applying a negative number or negative saturation by going above 1.0.
- invert the texture
- apply a blend, including 3 special mode taken from EDuke32.

Currently only the implementation is done, it is not exposed to UDMF yet.
2019-12-20 16:05:00 +01:00
alexey.lysiuk
59f09d4893 - move setting status bar defaults to proper location
BaseStatusBar.Init() method isn't suitable for this because it will override SBarInfoWrapper setup done in native code

https://forum.zdoom.org/viewtopic.php?t=66676
https://forum.zdoom.org/viewtopic.php?t=66339
2019-12-18 15:40:39 +02:00
Major Cooke
4eb1b6ad95 Merge remote-tracking branch 'gzdoom/master' into newmaster 2019-12-17 09:03:05 -06:00
Christoph Oelckers
136ab4f48a - renamed IsActorPlayingSomething to IsActorPlayingSound and made it clearscope. 2019-12-17 09:58:50 +01:00
Major Cooke
a960355d76 Merge remote-tracking branch 'gzdoom/master' into newmaster 2019-12-16 18:11:48 -06:00
Christoph Oelckers
e82565373f - separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated.
- added Marisa Kirisame's CHAN_OVERLAP flag.
- exported S_IsActorPlayingSomething to ZScript.

The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
2019-12-16 23:52:39 +01:00
Major Cooke
f44d2b2974 Merge remote-tracking branch 'gzdoom/master' into newmaster 2019-12-16 09:17:02 -06:00
alexey.lysiuk
1a19dbb52f - added 'damageonland' property to terrain definition
This property helps to replicate vanilla Hexen behavior of damaging player right after touching lava floor

https://forum.zdoom.org/viewtopic.php?t=66512
2019-12-12 15:14:30 +01:00
Major Cooke
101b4763d5 Merge remote-tracking branch 'gzdoom/master' into newmaster 2019-12-11 13:18:58 -06:00
Ed the Bat
f1a0345c57 More compat fixes for Swan Fox maps (#982)
* More compat fixes for Swan Fox maps

Found some more issues on maps that already have compat fixes in place

* Missed a dud line

At least I'd commented it out so it was benign, but still...
2019-12-09 07:51:02 -05:00
Rachael Alexanderson
d44a4f428e - add line_horizon on HOM line in Sapphire.wad 2019-12-09 01:56:42 -05:00
Christoph Oelckers
b9582cc98e - continued refactoring on sound code.
The game independent part of the code has been mostly isolated.
2019-12-08 21:22:53 +01:00
Rachael Alexanderson
a477dbb542 - move backend selector from display menu to video mode menu 2019-12-06 12:36:16 -05:00
Magnus Norddahl
dd87619cc4 Merge remote-tracking branch 'origin/master' into polybackend 2019-12-05 21:19:20 +01:00
Major Cooke
adae79646f Merge remote-tracking branch 'gzdoom/master' into newmaster 2019-12-05 12:38:02 -06:00
Christoph Oelckers
bbdd146243 - removed dead menu options 2019-12-05 00:00:54 +01:00
Rachael Alexanderson
a07d7856c2 - language update 2019-12-03 13:07:14 -05:00
Rachael Alexanderson
3269b61ffc - change menu option for 'vid_preferbackend' 2019-12-02 09:43:06 -05:00
Christoph Oelckers
6023b69693 - added null check to the dialogue lines array so that it doesn't crash if the text is never word wrapped. 2019-11-30 22:04:26 +01:00
alexey.lysiuk
c74c38eef7 - fixed monster teleportation on Ancient Aliens MAP23
Particular combination of teleport lines and monster radius requires vanilla behavior of P_PointOnLineSide()

https://forum.zdoom.org/viewtopic.php?t=66504
2019-11-28 13:01:23 +02:00
Major Cooke
03ef6d041e Merged Rachael's fix for EdTheBat's ClearPlayerClasses and SetSlot PR. 2019-11-26 10:23:41 -06:00
Major Cooke
775a94a5d2 Merge remote-tracking branch 'gzdoom/master' into newmaster 2019-11-26 09:36:50 -06:00
Major Cooke
6532485a93 Revert "Re-merged EdTheBat's submission now that the language file has been fixed."
This reverts commit b13c555381.
2019-11-26 09:36:35 -06:00
alexey.lysiuk
e21c9e0ef8 - made most of AltHud class functions virtual
This allows arbitrary customization of alternative HUD
2019-11-26 15:45:18 +02:00
alexey.lysiuk
a7f2df4fef - added ability to set custom alternative HUD
Use GAMEINFO key 'althudclass' to specify own class derived from AltHud

https://forum.zdoom.org/viewtopic.php?t=66422
2019-11-26 15:45:18 +02:00
Rachael Alexanderson
a3741abbf3
- add cvar 'cl_disableinvertedcolormap' - changes the invulnerability… (#972)
* - add cvar 'cl_disableinvertedcolormap' - changes the invulnerability sphere to instead be a regular desaturated colormap that transitions from deep blue to pale yellow

* - add menu option for cl_disableinvertedcolormap

* - added customization for invulnerability colormap

* - fixed custom colormap being calculated incorrectly

* - disable custom invulnerability map before the main game loop
2019-11-26 07:46:18 -05:00
alexey.lysiuk
20d3752fdd - exported several Wads.GetLump...() methods to ZScript
* GetLumpName() returns 8-characters lump name
* GetLumpFullName() returns full name with path and extension
* GetLumpNamespace() returns lump's namespace
* GetNumLumps() returns total number of lumps

https://forum.zdoom.org/viewtopic.php?t=66285
2019-11-25 17:37:56 +02:00
Ed the Bat
4d8dfd2437 More level_compatibility map fixes
These maps have actors not marked for any game mode (single, cooperative, deathmatch). That works in Zandronum, but GZDoom requires this fix.
2019-11-24 23:55:52 +01:00
Major Cooke
334f6fc018 Merge remote-tracking branch 'gzdoom/master' into newmaster 2019-11-24 11:47:35 -06:00
Rachael Alexanderson
2e0f7a0979 - fixed a compatibility fix that used 'FlipLine' 2019-11-24 06:42:03 -05:00