Commit graph

15903 commits

Author SHA1 Message Date
drfrag
d299576eb0 - Fixed vanilla light mode being available for GL2 when it's not supported without shaders. 2019-08-21 14:17:59 +02:00
drfrag
45abf1a5c9 - Added support for up to 4 DirectInput joysticks at the same time for fake splitscreen. But with more than 32 buttons per device they will overlap as before and you'll get wrong labels. 2019-08-21 14:06:29 +02:00
Petr Kobalicek
275ecb2623 AsmJit update
# Conflicts:
#	.gitignore
2019-08-20 13:08:18 +02:00
Marisa Kirisame
b08ba350d3 Allow custom status bars to override notifications, centered prints and chat prompt.
# Conflicts:
#	src/c_console.cpp
#	src/ct_chat.cpp
2019-08-20 13:06:52 +02:00
drfrag
f63f833ed1 - Consolidated C_MidPrint and C_MidPrintBold. 2019-08-20 13:06:48 +02:00
drfrag
488627d3b2 Revert "- Changed default GL sprite billboard mode to X/Y axis."
This reverts commit 5b76d7563b.
2019-08-20 10:17:25 +02:00
Christoph Oelckers
e7d5b85234 - changed colors for crosshair health display to keep this in line with other health indicators on the HUD.
Use green for 100% health, not 200% and move toward blue for higher health.
2019-08-19 00:25:05 +02:00
Hugo Locurcio
1c8c8224be Improve crosshair health color to be more informative
With `crosshairhealth 2`, the crosshair will now
go from white to yellow, then yellow to red as the player's health
decreases. As the player's health increases up to 200, the crosshair
will also go from white to green to indicate overheal.
This is similar to the implementation in games like Xonotic.

The old behavior (`crosshairhealth 1`) is still the default.
2019-08-19 00:25:03 +02:00
Christoph Oelckers
0b1b78c725 - fixed the PR.
# Conflicts:
#	src/g_game.cpp
2019-08-19 00:25:00 +02:00
cuttlefish
a516b2c872 - Converts keyboard turnspeeds into global CVars
# Conflicts:
#	src/g_cvars.cpp
2019-08-19 00:24:57 +02:00
Christoph Oelckers
20e574058e - removed the internal WildMidi player object cleanup code.
This was solely meant for the original WildMidi player but got seriously in the way of how this code gets used by GZDoom. In GZDoom the player object is owned by the MIDI devive which should be the only instance which is allowed to destroy it.
2019-08-19 00:24:54 +02:00
Christoph Oelckers
163d26ff2b - fixed bad default alpha for 3D floors.
This is a byte value, therefore the default must be 255, not 65536.
2019-08-19 00:24:51 +02:00
Christoph Oelckers
ac484634b3 - fixed attached dynamic light setup.
This was only run on a state change and missed every external light change.
Any place which wants to flag a light change now only will set a flag and at the end of the thinker loop all flagged actors will be processed.
For performance reasons this was merged with the P_RunEffects iterator loop.

# Conflicts:
#	src/p_effect.cpp
#	src/p_effect.h
#	src/p_tick.cpp

# Conflicts:
#	src/p_mobj.cpp
2019-08-18 21:33:42 +02:00
drfrag
6b20de2b63 - Block scaling for the classic software renderer, it didn't work and caused some serious glitches. 2019-08-18 13:07:24 +02:00
alexey.lysiuk
7dd227bde0 - added missing space character to script parser's message 2019-08-17 13:29:42 +02:00
alexey.lysiuk
f2e034b969 - added check for multiple parsing of the same MAPINFO
Warning message is issued when such case is detected

# Conflicts:
#	src/g_mapinfo.cpp
2019-08-17 13:29:40 +02:00
alexey.lysiuk
3eb96eeeff - remove '... is already the default skill' error 2019-08-17 13:29:37 +02:00
alexey.lysiuk
00c1fece16 - use Xcode 10.3 for "up-to-date" Travis target 2019-08-17 13:29:35 +02:00
drfrag
9639956fa4 - Now the quicksave slot must be selected explicitly like in original Doom. 2019-08-16 17:28:34 +02:00
alexey.lysiuk
7b8754c740 - added ability to enter main menu from credits screen via controller
There was only one way to enter main menu (by pressing Escape button) from the last intermission screen after episode's end
Controller's buttons that are usually assigned to this action, Start and Back by default, now open main menu as well

https://forum.zdoom.org/viewtopic.php?t=65632
2019-08-16 12:25:40 +02:00
Rachael Alexanderson
35d0bcb1d5 - fix typo 2019-08-16 12:25:36 +02:00
alexey.lysiuk
12dee6ca91 - fixed doubling of deprecation warnings for ZScript code
https://forum.zdoom.org/viewtopic.php?t=65617
2019-08-15 21:12:10 +02:00
drfrag
54d0ed23e9 - Fixed compilation. 2019-08-15 12:48:11 +02:00
alexey.lysiuk
728390ce48 - exposed xBRZ scaler options as CVARs
Added 5 xbrz_... CVARs to control various settings of upscaling process

Added xbrz_colorformat CVAR for buffered (zero) and unbuffered (any other value) color format
The first one requires a restart because settings are applied once to a precalculated buffer
The second one has reduced performance with ability to apply settings on-the-fly
2019-08-15 12:43:49 +02:00
alexey.lysiuk
e93d8395bc - updated xBRZ scaler to version 1.7
https://sourceforge.net/projects/xbrz/
https://sourceforge.net/projects/xbrz/files/xBRZ/xBRZ_1.7.zip

https://forum.zdoom.org/viewtopic.php?t=65596
2019-08-15 12:43:45 +02:00
alexey.lysiuk
6b70620bb9 - removed type punning from xBRZ scaler integration
it was a hack that wouldn't work with xBRZ 1.7
2019-08-15 12:43:41 +02:00
drfrag
67fb719a7c Revert "- Now the quicksave slot must be selected explicitly like in original Doom."
This reverts commit 9f0d5ac113.

Else you'd need to select it twice.
2019-08-14 14:17:39 +02:00
drfrag
1fca65f9e4 - Missed some language strings again. 2019-08-14 10:40:33 +02:00
drfrag
b3c4e24b58 - Fall back to D3D for software on systems without GL2 support. 2019-08-13 22:04:05 +02:00
drfrag
9f0d5ac113 - Now the quicksave slot must be selected explicitly like in original Doom. 2019-08-13 21:15:09 +02:00
drfrag
1f7c241eb8 - Changed how the old quicksave works. Now you select the slot using quicksave like in original Doom. 2019-08-13 20:32:41 +02:00
Christoph Oelckers
13ee3e3484 - added checks for the special hacky quicksave marker. 2019-08-11 18:51:35 +02:00
Rachael Alexanderson
7adda0e47a - fix a couple issues with sigil.wad:
- e5m2: floating skulls disappear on lower skill levels
- e5m4: the platform with the baron of hell that led to the invulnerability secret had a missing texture
2019-08-11 14:32:37 +02:00
Christoph Oelckers
d13499d2b7 - fixed the extremely long standing bug that Lost Souls didn't reacquire their target when slamming into something.
This was one of that annoying old design mistakes where Doom and Heretic features were poorly merged together. The Heretic Gargoyle uses very similar coding but performs a subtly different action when actually hitting another actor. This different action was made the default, even for the Lost Soul.
It has now been changed that both monsters use their original action, being distinguished by an actor flag. For compatibility with custom definitions Heretic's behavior, which has been the default in ZDoom will be the preferred one. The one of the Lost Soul can be reactivated by a flag.
2019-08-11 14:28:51 +02:00
alexey.lysiuk
e4ef998dc2 - exposed Append() method to ZScript dynamic array
https://forum.zdoom.org/viewtopic.php?t=65570
2019-08-11 00:09:51 +02:00
Christoph Oelckers
994bdc0b03 - fixed: Do not use BasicArmor's save percentage when no armor present.
This function is only for the Hexen status bar and printed incorrect values.
2019-08-10 12:47:57 +02:00
Christoph Oelckers
1161a17f00 - do not blur the background for portrait-less conversations.
- Fixed the mHasBackdrop flag. (drfrag)

# Conflicts:
#	wadsrc/static/zscript/ui/menu/conversationmenu.zs

# Conflicts:
#	src/menu/menu.cpp
2019-08-10 12:47:41 +02:00
Christoph Oelckers
d6e7e68bfa - fixed: The frozen state was not reset when the global level variable was reset.
# Conflicts:
#	src/g_level.cpp
2019-08-09 13:16:27 +02:00
drfrag
2c014e63ac - Unicode fix.
(patch by Graf)
2019-08-09 13:16:24 +02:00
Christoph Oelckers
d9f3fdd293 - fixed handling of the "ouch" face.
This depended on order of execution, taking the health values to compare from variables which were not synchronized properly.
Now both the last and current health being used here are being retrieved in the same place so that further changes cannot break this again.

But here it worked. (drfrag)
2019-08-09 13:16:22 +02:00
Christoph Oelckers
61a849b439 - fixed an inconsistency with missiles bouncing off actors.
They exploded when hitting a side but not when hitting top or bottom. Changed so that they always explode now.
2019-08-09 13:16:19 +02:00
Christoph Oelckers
15cf157877 - removed the ActiveSequences counter.
It was only used to avoid traversing the list if all sequences were paused which is an exceptional situation.
On the other hand, the way it counted was not correct so rather than fixing it it seemed more appropriate to remove it entirely.

# Conflicts:
#	src/g_levellocals.h
#	src/s_sndseq.cpp
2019-08-09 13:16:17 +02:00
Christoph Oelckers
9a4959c82e - fixed incorrect write barrier in sound sequence code.
# Conflicts:
#	src/s_sndseq.cpp
2019-08-09 13:16:14 +02:00
drfrag
61bd1d614a - More fake generic font support. 2019-08-08 00:39:22 +02:00
Christoph Oelckers
f6234d08fa - optionally disallow showing the autor's name
# Conflicts:
#	src/g_level.cpp
#	src/gamedata/g_mapinfo.h
#	wadsrc/static/zscript/ui/statscreen/statscreen.zs
2019-08-07 13:42:05 +02:00
drfrag
25c890d91c - Fixed bad return value. 2019-08-07 13:42:03 +02:00
Christoph Oelckers
78fa0a6f95 - added option to print a map author's name on the summary screen
For now only with font-printed map names. Allowing this with titlepatches will require more work and an option to disable.

# Conflicts:
#	src/g_level.cpp
#	src/gamedata/g_mapinfo.h
#	src/gi.cpp
#	wadsrc/static/zscript/ui/statscreen/statscreen.zs
2019-08-06 18:46:23 +02:00
drfrag
149a294a49 - Fixed compilation. 2019-08-06 17:27:12 +02:00
Christoph Oelckers
4a563f449d - fixed: The wbstartstruct that gets passed to the level summary screen needs to be static
This variable is needed long after the function which sets it up will be exited. So this either needs to be dynamically allocated or static, and in this case using a static variable is simpler.  However, unlike before, it is only being accessed in the one function that needs to initialize it and pass to the summary screen and nowhere else.

# Conflicts:
#	src/g_level.cpp
2019-08-06 17:13:30 +02:00
Christoph Oelckers
2b51e8d5dd - allow the language table to supersede the title patches, if appropriate
For the Doom IWADs the provided font looks almost identical to the characters used on the title patches. So, for any level name that got replaced in some language, it will now check if the retrieved name comes from the default table, and if not, ignore the title patch and print the name with the specified font.

This also required removing the 'en' label from the default table,  because with this present, the text would always be picked from 'en' instead of 'default'. Since 'en' and 'default' had the same contents, in any English locale the 'default' table was never hit, so this won't make any difference for the texts being chosen.

Last but not least, wminfo has been made a local variable in G_DoCompleted. There were two places where this was accessed from outside the summary screen or its setup code, and both were incorrect.

# Conflicts:
#	src/g_hub.cpp
#	src/g_level.cpp
#	src/gamedata/g_mapinfo.h
#	src/gi.h
#	src/p_setup.cpp
#	src/stringtable.cpp
#	src/stringtable.h
#	wadsrc/static/zscript/ui/statscreen/statscreen.zs
#	wadsrc_extra/static/iwadinfo.txt

# Conflicts:
#	src/gi.h
#	wadsrc_extra/static/iwadinfo.txt
2019-08-06 17:13:21 +02:00