Commit graph

16372 commits

Author SHA1 Message Date
Christoph Oelckers
65a054ba88 - implemented subtitle display for Blackbird's voiceover messages.
# Conflicts:
#	src/g_statusbar/shared_sbar.cpp
2019-07-18 12:33:48 +02:00
drfrag
a87d8ef7e2 - Missing strings. 2019-07-18 12:32:36 +02:00
drfrag
b92ceac25f - Fixed compilation.
# Conflicts:
#	src/c_console.cpp
2019-07-18 12:32:33 +02:00
Christoph Oelckers
1fb5361a82 - implemented subtitles for intermission slideshows.
# Conflicts:
#	src/d_main.cpp
#	wadsrc/static/language.csv
2019-07-18 12:30:19 +02:00
drfrag
0beb8b85bd - Changed default keybindings for Strife. 2019-07-18 00:47:26 +02:00
drfrag
74d8fa8a28 - added printlocalized CCMD to check strings in-game.
(patch by Graf)
2019-07-18 00:10:25 +02:00
Rachael Alexanderson
c992604b7f - set language cvar to global config, it should not be game-specific
# Conflicts:
#	src/g_cvars.cpp
2019-07-18 00:10:23 +02:00
alexey.lysiuk
fa7dae2676 - fixed compilation error with GCC and Clang
src/intermission/intermission_parse.cpp:941:2: error: no matching function for call to 'F_StartFinale'
2019-07-18 00:10:18 +02:00
Christoph Oelckers
b6799e7843 - added a 'testfinale' CCMD, so that the layout of finale texts can be tested more easily
# Conflicts:
#	src/gamedata/stringtable.cpp
#	src/gamedata/stringtable.h

# Conflicts:
#	src/intermission/intermission_parse.cpp
2019-07-18 00:10:14 +02:00
drfrag
ef1047db20 - Changes to the language table.
(patch by Graf)
2019-07-18 00:04:31 +02:00
drfrag
02ee44772c - fake VGA font support to the MessageBoxMenu class 2019-07-17 23:58:12 +02:00
drfrag
8c941ba1cf - A few more missing things for compatibility.
# Conflicts:
#	wadsrc/static/language.enu
2019-07-17 23:58:09 +02:00
drfrag
b702a5a514 - fake generic font support for the dialogue system. 2019-07-17 23:49:47 +02:00
alexey.lysiuk
cedc5a9702 - fixed UMAPINFO episode parsing
* bounds checking for accessing episode tokens
* support empty tokens in episode definition
* handle upper cased episode shortcut

https://forum.zdoom.org/viewtopic.php?t=65364

# Conflicts:
#	src/gamedata/umapinfo.cpp
2019-07-17 18:15:09 +02:00
alexey.lysiuk
95f0f7eadd - cleaned up language detection leftovers
# Conflicts:
#	src/posix/sdl/i_system.cpp
2019-07-17 18:14:53 +02:00
Christoph Oelckers
9c25d75f65 - removed a few obsolete definitions from basictypes.h
# Conflicts:
#	src/win32/i_specialpaths.cpp
2019-07-17 17:54:30 +02:00
Christoph Oelckers
1697e6ff3a - eliminated dependency of CVar code on AActor.
As a low level feature, the CVAR management should not access game structures like actors, just to retrieve a player index. The index should be calculated by the calling code instead and passed into the function.

# Conflicts:
#	src/win32/i_specialpaths.cpp

# Conflicts:
#	src/p_acs.cpp
2019-07-17 17:54:28 +02:00
alexey.lysiuk
bb946348da - fixed compilation with GCC 5 and newer
src/r_data/a_dynlightdata.cpp:72:44: error: no matching function for call to ‘FSerializer::Array(const char [5], int [5], int, std::nullptr_t)’
2019-07-17 17:54:08 +02:00
Christoph Oelckers
26863bfd94 - tested and fixed the attachable lights.
# Conflicts:
#	src/g_shared/a_dynlight.cpp
2019-07-17 17:53:43 +02:00
Christoph Oelckers
0c4fc385cc - User definable dynamic lights
This hasn't been tested yet!

# Conflicts:
#	src/g_shared/a_dynlight.h

# Conflicts:
#	src/g_shared/a_dynlightdata.cpp
2019-07-17 17:51:28 +02:00
drfrag
3000e15aec - Adjustments to the new player setup menu. 2019-07-16 01:53:29 +02:00
drfrag
7b3d02dfec Revert "- fixed layout issues with Strife's dialogues."
This reverts commit 963d1b682c.

Partial revert.
2019-07-16 00:00:58 +02:00
drfrag
25ffe28abe Revert "- fixed lifetime of ScaleOverrider for Strife dialogues."
This reverts commit 6c14fe7202.
2019-07-15 23:23:55 +02:00
drfrag
87e8200277 Revert "- changed calculation of the scaling value for the option menu."
This reverts commit 6c869f123d.
2019-07-15 23:23:53 +02:00
drfrag
40875d1697 Revert "- make the clean scaling system more consistent."
This reverts commit cdcc8996a7.
2019-07-15 23:23:52 +02:00
drfrag
a66bb6ad16 - Cosmetic changes. 2019-07-15 20:38:44 +02:00
Christoph Oelckers
8f3f95dfc8 - mark NewPlayerMenu as protected. 2019-07-15 20:38:32 +02:00
Christoph Oelckers
f77336b25c - fixed: The color sliders in the player setup menu may not be selected when inactive. 2019-07-15 20:38:29 +02:00
Christoph Oelckers
ce7920727c - removed debug output. 2019-07-15 20:38:28 +02:00
Christoph Oelckers
2577c0843e - adjustments to the player menu so that the display isn't cut off on the smallest screen sizes. 2019-07-15 20:38:26 +02:00
Christoph Oelckers
bba2854796 - reimplemented new player setup menu as an OptionsMenu.
This is both for consistency and better localizability. The old code is retained to ensure that mods inheriting from the old menu continue to work.

# Conflicts:
#	src/menu/menudef.cpp
#	src/namedef.h
#	wadsrc/static/zscript/ui/menu/optionmenu.zs
2019-07-15 20:37:36 +02:00
Rachael Alexanderson
3cf84ee60b - improved backdrop texture a little bit. replaced with a CC0 texture designed in Krita 2019-07-15 20:34:06 +02:00
Christoph Oelckers
2ca0e82e79 - added missing files.
No idea why they weren't committed...
2019-07-15 19:56:06 +02:00
Christoph Oelckers
3700b0c7b8 - replaced the procedural backdrop texture with some warped noise texture.
This was done because the backdrop as implemented was the only texture in the entire game that had to be deleted and recreated each frame.
However, with Vulkan this would have necessitated quite a bit of synchronization with the render pipeline which wasn't really feasible just for this one single texture.
Now the texture manager can assume that once a texture was created it will be immutable and never has to change.

# Conflicts:
#	src/CMakeLists.txt
#	src/textures/backdroptexture.cpp
#	src/v_2ddrawer.cpp
2019-07-15 19:55:51 +02:00
alexey.lysiuk
15dbacca01 - added validation for presence of drop item classes
https://forum.zdoom.org/viewtopic.php?t=65307
2019-07-12 22:11:54 +02:00
drfrag
19df6559a8 - Print a warning instead of error out on unsupported ZScript version. 2019-07-11 18:20:57 +02:00
drfrag
1d77f880a4 - Fixed hack: CanPrint must return 0 or it'd signal to the mods that NO FONT can print the text (what Graf said). 2019-07-11 14:07:47 +02:00
drfrag
e5f7bf068c - Some ugly hackery to try to make it more compatible. 2019-07-11 14:07:20 +02:00
Christoph Oelckers
da5c1c90dc - let IWAD and PWAD BigFonts override BigUpper for consistency.
# Conflicts:
#	src/gamedata/fonts/font.cpp
#	src/gamedata/fonts/singlelumpfont.cpp
#	src/gamedata/fonts/v_font.cpp
2019-07-11 13:41:45 +02:00
Christoph Oelckers
8ff421104d - fixed: The lump renaming was not performed for Doom, even for those pieces where needed. 2019-07-11 13:26:37 +02:00
Christoph Oelckers
d14a48f8f4 - use BigUpper font for option menu captions.
# Conflicts:
#	src/gamedata/fonts/v_font.cpp

There's actually no BigUpper font here. (drfrag)
2019-07-11 13:24:40 +02:00
drfrag
08cd080597 - Added DrawOptionText function for the options menu. 2019-07-10 23:04:40 +02:00
drfrag
a6429a1ae1 - Added some dummy functions for the option menu. 2019-07-10 22:59:53 +02:00
alexey.lysiuk
660d930cf6 - do not set crouch player sprites on voodoo dolls
https://forum.zdoom.org/viewtopic.php?t=65257
2019-07-10 22:04:20 +02:00
alexey.lysiuk
c4780495e1 - fixed linking without DYN_FLUIDSYNTH defined
Undefined symbols for architecture x86_64:
  "CreateFluidSynthMIDIDevice(char const*, int)", referenced from:
      MIDIStreamer::CreateMIDIDevice(EMidiDevice, int) in music_midistream.o
2019-07-09 22:58:11 +02:00
Christoph Oelckers
d018b430f7 - made the class definitions of the MIDI devices private to the implementations. 2019-07-09 22:58:08 +02:00
alexey.lysiuk
a646b9cfa2 - fixed crash on starting ACS script without level
https://forum.zdoom.org/viewtopic.php?t=65287
2019-07-08 13:56:45 +02:00
alexey.lysiuk
0dbf2e3df7 - fixed LevelLocals.isFrozen() return value with JIT disabled
No more 'Number of parameters returned differs from what was expected by the caller' assertion failures
2019-07-08 13:56:35 +02:00
drfrag
ca9967d13b - Made automatic level compatibility optional.
As Enjay requested and Rachael suggested.
 I don't think i'm opening Pandora's box, what could go wrong?
2019-07-05 14:45:01 +02:00
alexey.lysiuk
9d8b4f6c05 - fixed missing dive and surface player sounds
https://forum.zdoom.org/viewtopic.php?t=65233
2019-07-05 13:33:55 +02:00