Commit graph

595 commits

Author SHA1 Message Date
Christoph Oelckers
05fa21785d - ported Duke end of E1 cutscene 2021-04-30 20:08:24 +02:00
Christoph Oelckers
e75f0c17e4 - ported the TitleScreen class. 2021-04-30 20:08:23 +02:00
Christoph Oelckers
1022564cab - initial framework for scriptification of screen jobs. 2021-04-30 20:08:23 +02:00
Christoph Oelckers
ad28630df6 - offloaded map patches to data files.
This is a lot easier to manage than having them in the code.
For now it piggybacks on the map hack feature, later this should use the same scripted approach as GZDoom.
2021-04-24 23:07:35 +02:00
sinisterseed
3159ef0691 - and get rid of this too.
This is irrelevant.
2021-04-21 21:40:39 +03:00
sinisterseed
2d73b19887 - updated menus and changed the mentions of "Polymost" to "Render".
These settings now extend to the new render as well, so the mentions of Polymost had to be changed accordingly.
2021-04-21 21:20:43 +03:00
Mitchell Richters
171d541112 Merge branch 'master' into newrenderer 2021-04-18 10:05:10 +10:00
Christoph Oelckers
d5dc8230d6 - fixed typo. 2021-04-17 17:21:02 +02:00
Christoph Oelckers
80c67cda06 - language update. 2021-04-17 17:06:57 +02:00
Christoph Oelckers
e89761d2d5 - added menu option for mirror effect. 2021-04-17 13:43:49 +02:00
Christoph Oelckers
82194bbf6b Merge branch 'master' into newrenderer
# Conflicts:
#	source/games/exhumed/src/2d.cpp
2021-04-17 13:22:30 +02:00
Christoph Oelckers
53cd8958ae - added a fallback generic record for identifying Blood.rff based on content.
This is for loading mods that have been set up to require running BARF before they can be used. Strict CRC identification does not work for these.
2021-04-17 13:11:02 +02:00
Christoph Oelckers
7e9b8059cf - enable cl_slopetilting for Exhumed as well, now that it has a function there 2021-04-16 17:24:37 +02:00
Christoph Oelckers
9a58299bee Merge branch 'master' into newrenderer2 2021-04-14 22:37:59 +02:00
Christoph Oelckers
6ad3ac8ef9 - added GameID field to GrpInfo.
This is for allowing new features easier referencing of the various records.
2021-04-13 18:08:55 +02:00
Christoph Oelckers
aba5099ccb - added widescreen graphics credits to the Engine Credits menu. 2021-04-13 00:31:49 +02:00
Christoph Oelckers
9598b626c9 Merge branch 'master' into newrenderer2 2021-04-12 20:03:50 +02:00
Christoph Oelckers
ac04403292 - added native support for Nightfright's Alien World Order" GRP generator. 2021-04-12 19:35:39 +02:00
Christoph Oelckers
42d02834b1 Merge branch 'master' into newrenderer2
# Conflicts:
#	source/build/include/build.h
#	source/build/src/polymost.cpp
#	source/build/src/voxmodel.cpp
#	source/core/gamecontrol.cpp
#	source/core/gamestruct.h
#	source/games/blood/src/animatesprite.cpp
#	source/games/blood/src/misc.h
#	source/games/blood/src/view.cpp
#	source/games/duke/src/render.cpp
#	source/games/sw/src/draw.cpp
#	source/games/sw/src/game.h
#	source/games/sw/src/jsector.cpp
#	source/glbackend/glbackend.cpp
2021-04-11 14:38:56 +02:00
Christoph Oelckers
db5fbe3bbb - make the startup banner in the initial console window work. 2021-04-10 19:14:30 +02:00
Christoph Oelckers
333581a084 Merge branch 'master' into newrenderer2
# Conflicts:
#	source/build/src/defs.cpp
2021-04-09 19:57:56 +02:00
Christoph Oelckers
03c19a0cad - removed the no longer used 'options' menu item graphic for Exhumed. 2021-04-09 14:29:31 +02:00
alexey.lysiuk
c8c8635b4c - fixed render backend switch menu option 2021-04-09 10:47:00 +03:00
Christoph Oelckers
4cdc39c9b9 Merge branch 'master' into newrenderer2 2021-04-08 08:55:41 +02:00
Christoph Oelckers
8cc3a81c3b - enable the render backend switch in the menu.
Vulkan is working now so this can be reactivated.
2021-04-07 23:56:01 +02:00
Christoph Oelckers
0b79649dc2 Merge branch 'master' into newrenderer2 2021-04-06 16:14:21 +02:00
Christoph Oelckers
cbe25d9d6b - Blood: disable look left and look right in the classic key configuration. 2021-04-06 12:06:03 +02:00
Christoph Oelckers
75159e06c0 - uncommented the portal code in hw_walls.cpp. 2021-03-21 19:36:55 +01:00
Christoph Oelckers
d604ca732f - upgraded wadsrc/CMakeLists.txt 2021-03-15 08:38:31 +01:00
Christoph Oelckers
aa789c7605 - adapt to changed value range of module master volume in ZMusic.
The default was far too quiet and had to be increased to let the player have comparable output to the rest of the music system.
2021-03-14 08:51:59 +01:00
Christoph Oelckers
f4b27bbd27 - sort the game selection list by definition order in grpinfo.txt.
This is to have consistent ordering, independent of where the files are found.
Game order is: Duke, Blood, Shadow Warrior, Redneck Rampage, Nam, WW2GI, Exhumed, all the official mission packs are grouped below the game they belong to.
2021-03-12 23:45:03 +01:00
Christoph Oelckers
6368db7d9e - deactivate the swcustom.txt in ProAsm's Wanton Destruction.
This is to allow the internal one to take over which has localizable labels.
2021-03-02 21:48:58 +01:00
sinisterseed
410a269c93 - added autodetection support for the ProAsm version of Wanton Destruction. 2021-03-02 22:32:38 +02:00
Christoph Oelckers
e3678e27c0 - added "swap mouse buttons" option to menu. 2021-03-02 17:10:34 +01:00
sinisterseed
bdeca12f95 - removed menu entry for SW's altnukeinit toggle.
The feature has been removed, rendering the entry useless.
2021-03-02 15:15:33 +02:00
Christoph Oelckers
4b9a1465af - Exhumed: fixed inventory use bindings
They got shuffled around a bit by accident.
2021-03-01 20:13:12 +01:00
sinisterseed
8f0d022b44 - added menu entry for Exhumed's keyboard turning speed toggle.
This allows enabling the original turning speed with the keyboard in Exhumed. The new behavior is still the default as the original turning is just far too slow.
2021-03-01 15:16:36 +02:00
Christoph Oelckers
2f2d0443f2 - fixed size setup for most menus.
All of Raze's menus scale to 320x200 and to get proper mouse coordinates the definitions must reflect that as well.
Fixes #271
2021-03-01 13:08:10 +01:00
Christoph Oelckers
ba5ede65b8 - backend update from GZDoom. 2021-02-26 19:06:10 +01:00
Christoph Oelckers
5ad1d74f62 - added missing shader #define. 2021-02-12 14:55:42 +01:00
Christoph Oelckers
c96e04e6c9 - backend update from GZDoom. 2021-02-12 14:44:54 +01:00
Christoph Oelckers
5b6aa372ea - fixed autoaim check and adjusted presentation in the menu to be correct for all games.
Fixes #264
2021-02-06 10:56:11 +01:00
Christoph Oelckers
20db6b0c78 - added protection against oversized menu caption bars.
SWC20 is a mod that contains a caption that is larger then the entire screen and was pushing the actual menu content out of it.
Fixes #239
2021-02-02 23:49:04 +01:00
Rachael Alexanderson
09d2e44da6 - add missing menu spacer 2021-01-18 08:17:35 -05:00
Rachael Alexanderson
8c87bc7d08 - language update 2021-01-18 06:26:14 -05:00
Rachael Alexanderson
47f0370512 - add some 21:9 presets 2021-01-18 06:25:04 -05:00
Mitchell Richters
b191a482d6 - Remove hw_detailmapping and hw_glowmapping since they're no longer relevant with GZDoom's backend (they're always in an on state). 2021-01-03 21:39:21 +11:00
Mitchell Richters
ae731d1eaf - Duke/RR: Expose cl_slopetilting via the menu. 2021-01-02 13:16:15 +11:00
Christoph Oelckers
2184baaa18 - detection of alternative Twin Dragon GRP. 2020-12-30 09:55:57 +01:00
Christoph Oelckers
b0bf51ec5c - Duke/RR: Selecting the alternative weapon must set the proper bits in 'subweapon'.
Otherwise the weapon cycling breaks.
Fixes #182
2020-12-01 21:07:38 +01:00
Christoph Oelckers
5a5f9b8e02 - backend update from GZDoom. 2020-11-23 15:54:06 +01:00
Christoph Oelckers
26c7bcdca4 - added default controller bindings from GZDoom. 2020-11-23 13:54:22 +01:00
Christoph Oelckers
36479b623d - re-fixed crosshair scale to only use one CVAR for everything. 2020-11-13 17:56:55 +01:00
sinisterseed
34dfb6c5fc - fixed crosshair scaling in Exhumed & the other games.
The problem was that the CVARs operating the scale were different between Exhumed and the other titles, meaning that "crosshairscale" worked in one, but not the others. They have now been split.
Also lowered the default crosshair size as it was too much for Exhumed.
Fixes #180.
2020-11-13 18:33:18 +02:00
Christoph Oelckers
a35adc45c2 - use correct CVAR for menu's statusbar scale setting.
Fixes #169
2020-11-09 17:23:58 +01:00
Christoph Oelckers
918425469a - fixed crosshair setup.
Fixes #168
2020-11-09 17:20:14 +01:00
Christoph Oelckers
aed8a450fd - SW: fixed episode menu display.
The subtitle needs to use the game specific drawer, not the generic one.
Fixes #162
2020-11-08 10:12:12 +01:00
Christoph Oelckers
8a4b2e792e - set a default font for list menus. 2020-11-08 10:11:00 +01:00
Mitchell Richters
032db82f82 - Exhumed: Add crouch toggle mechanism. 2020-11-07 13:27:58 +11:00
Mitchell Richters
7c8efde38c - Blood: Add crouch toggle mechanism.
* Fixes #151.
2020-11-07 13:23:16 +11:00
Christoph Oelckers
c93b8f3e54 - copyright headers added. 2020-10-31 13:20:55 +01:00
Christoph Oelckers
30c4a0856e - moved common script files. 2020-10-31 13:20:54 +01:00
Christoph Oelckers
7a482c6284 - make DHUDFont an object. 2020-10-31 13:20:54 +01:00
Christoph Oelckers
7de6528a1f - the status bars work as objects.
# Conflicts:
#	source/common/menu/menudef.cpp
2020-10-31 13:20:54 +01:00
Christoph Oelckers
05fd2b4d4e - another text update. 2020-10-31 12:35:33 +01:00
Christoph Oelckers
c349987bd4 - text update. 2020-10-31 12:33:39 +01:00
Christoph Oelckers
bc7c37779f - text update. 2020-10-25 17:14:05 +01:00
Christoph Oelckers
5abc5c0509 - option menu positioning fix. 2020-10-25 17:11:45 +01:00
Christoph Oelckers
273ad5e133 - backend update 2020-10-25 09:20:26 +01:00
Christoph Oelckers
c82d9d2908 - backend update from GZDoom. 2020-10-24 17:30:47 +02:00
Christoph Oelckers
127440f03c - fixed some menu alignment issues
* the left selector in Duke was misplaced to the right.
* some issues with incomplete handling of RR's downscaled fonts.
* give SW's caption bar a little more space on the edges.
2020-10-13 22:53:27 +02:00
Christoph Oelckers
f179ee502e - fixed: Selecting a submenu in the options played the wrong sound. 2020-10-12 20:08:10 +02:00
Christoph Oelckers
3bc9b3f5fc - fixed bad filenames in SW's map list (fortunately only DM levels...) 2020-10-12 19:13:30 +02:00
Christoph Oelckers
87859e87bf - fixed heatseeker definition in SWCustom.txt. 2020-10-10 22:28:46 +02:00
Christoph Oelckers
b06a847d9a Merge branch 'menu2'
# Conflicts:
#	source/exhumed/src/sound.cpp
2020-10-10 19:03:29 +02:00
Christoph Oelckers
3cfba26bec - fixed layout issues with load/save menus. 2020-10-10 12:25:30 +02:00
Christoph Oelckers
db21d5e946 - took all script exports out of the namespaces.
It looks like GCC cannot deal with this - on MSVC it works fine.
2020-10-10 10:11:22 +02:00
Christoph Oelckers
2237113a77 - fixed font scaling in RR's confirmation screens. 2020-10-10 00:51:26 +02:00
Christoph Oelckers
2e94fdc3b5 - Duke: fixed text alignment in menu caption. 2020-10-10 00:40:36 +02:00
Christoph Oelckers
fb10473e40 - fixed the controller menu.
This needed a definition update for its defaults.
2020-10-10 00:24:11 +02:00
Christoph Oelckers
03e57fa3d7 - fixed Exhumed's game startup. 2020-10-09 23:58:34 +02:00
Christoph Oelckers
fb6267dce0 - removed 'centermenu' from Blood's ingame menu. 2020-10-09 23:40:15 +02:00
Christoph Oelckers
b21beb4039 - made the options search work.
This required changing how the engine credits menu work because it created a circular dependency in its original form.
2020-10-09 22:33:02 +02:00
Christoph Oelckers
2d8bcd06fd - added the player display for Duke.
This completes the menu transition.
2020-10-09 01:09:51 +02:00
Christoph Oelckers
a10aacea3a - added the QAV drawer page. 2020-10-09 00:50:21 +02:00
Christoph Oelckers
2f8284f10b - added filler help and credit menus for Exhumed.
They should not be empty, so that they do not crash when opened from the console.
2020-10-09 00:21:06 +02:00
Christoph Oelckers
4024ebd12d - re-added Duke 1.3's credit screens. 2020-10-09 00:11:49 +02:00
Christoph Oelckers
802d295e48 - Shadow Warrior credit screens. 2020-10-08 23:53:15 +02:00
Christoph Oelckers
02507d937d - got the text screens working. Also reformatted RR's credits a bit for a better presentation. 2020-10-08 23:40:17 +02:00
Christoph Oelckers
19c719db4e - image scroller is working again. 2020-10-08 22:53:12 +02:00
Christoph Oelckers
6ba06f5ed0 - ImageScroller WIP commit. 2020-10-08 22:20:41 +02:00
Christoph Oelckers
15eaf86f5a - preparations for the image scroller menu. 2020-10-08 18:02:25 +02:00
Christoph Oelckers
8caaf4fa64 - menu transitions are working again. 2020-10-08 16:33:11 +02:00
Christoph Oelckers
968fe10de7 - use unsigned variables for Duke's spinning selector.
The formula depends on unsigned modulo.
2020-10-08 01:49:21 +02:00
Christoph Oelckers
cc7290e313 - work on menu transitions. 2020-10-08 01:00:23 +02:00
Christoph Oelckers
a7e25a116f - made Exhumed's text menu fully operational. 2020-10-08 00:50:23 +02:00
Christoph Oelckers
56eae0b42d - got the basics working for Exhumed's main menu. 2020-10-08 00:21:07 +02:00
Christoph Oelckers
a953404331 - SW's text menus done.
This also copies the Build texture animation info into the texture manager so that the 2D code can access it through existing interfaces.
2020-10-07 23:22:29 +02:00
Christoph Oelckers
789eb6d51d - Most of Duke's menus work again. 2020-10-07 20:32:43 +02:00
Christoph Oelckers
2bb38f7d67 - get load and save game menus and related CCMDs working again. 2020-10-07 18:32:57 +02:00
Christoph Oelckers
38ddbfe65f - activated most of the support code for programmatically created menus again.
Blood's regular menu screens mostly work again
2020-10-07 01:31:41 +02:00
Christoph Oelckers
5726b693bd - added back the menu transition, although it cannot be used yet, and all game specific menu CCMDs. 2020-10-07 01:12:57 +02:00
Christoph Oelckers
0968a9d97e - renamed the Customizer to 'Delegate' because this works very much like a delegate in Objective-C.
- route menu sound calls through the delegate to better deal with differences between games.
2020-10-07 01:00:43 +02:00
Christoph Oelckers
603c3b50ec - reimplemented Blood's menu items. 2020-10-07 00:50:26 +02:00
Christoph Oelckers
a7035a932f - added a DrawSelector hook to the customizer. 2020-10-07 00:03:05 +02:00
Christoph Oelckers
06b00887f5 - added a menu control for Blood's dripping blood. 2020-10-06 23:49:34 +02:00
Christoph Oelckers
3ddc544a85 - added a caption drawer control for ListMenus. 2020-10-06 23:11:04 +02:00
Christoph Oelckers
99e6c718d7 - Added Exhumed's Mummy Staff graphics after getting MaxED's ok. 2020-10-06 22:42:55 +02:00
Christoph Oelckers
1ea6084478 - Exhumed also done.
Also using proper assets now.
2020-10-06 22:35:25 +02:00
Christoph Oelckers
17a68bc60a - SW's caption done, too.
In this case the font is squashed to be more narrow because otherwise many texts would not fit anymore.
2020-10-06 22:01:20 +02:00
Christoph Oelckers
bec1f67178 - implemented the menu caption for Duke et.al. 2020-10-06 20:49:55 +02:00
Christoph Oelckers
d22bdf9dc7 - use an alias for the menu bar texture in Blood.
Direct tile access has been disabled for now, hopefully this can be buried deep in the engine for all eternity.
2020-10-06 20:05:51 +02:00
sinisterseed
e27077bee1 - added menu entry for the alternative nuke initialization toggle 2020-10-06 18:39:24 +02:00
Christoph Oelckers
1e131eda9e - implemented Blood's menu caption 2020-10-06 00:34:35 +02:00
Christoph Oelckers
3dbb8cbb11 - safety commit 2020-10-05 21:47:53 +02:00
Christoph Oelckers
c03644ea76 - base.zs cleanup and extendable structs. 2020-10-05 20:03:28 +02:00
Christoph Oelckers
be55e26689 - menu code update. 2020-10-05 18:39:16 +02:00
Christoph Oelckers
9606b09ddd - update of language code from GZDoom. 2020-10-05 00:46:24 +02:00
Christoph Oelckers
7c89db69bd -menuCustomizer from GZDoom. 2020-10-05 00:23:30 +02:00
Christoph Oelckers
70e7176531 - made adjustments for new Menudef format. 2020-10-04 22:42:13 +02:00
Christoph Oelckers
26a31a626d - option menus are working, although all colors are still wrong and the captions are not displayed. 2020-10-04 21:42:40 +02:00
Christoph Oelckers
5d76cbcbdb - game compiles and starts again (without menu, of course)
Now it's time to rebuild the menu.
2020-10-04 20:53:37 +02:00
Christoph Oelckers
b0301d6fc9 - progress. 2020-10-04 20:11:04 +02:00
Christoph Oelckers
4790773ec2 - script update for key bindings. 2020-10-04 20:11:03 +02:00
Christoph Oelckers
0b9c6fe559 - added GZDoom's menu script code. 2020-10-04 20:11:03 +02:00
Christoph Oelckers
46a1fe3826 - updated script definitions to silcence startup warnings. 2020-10-04 20:10:13 +02:00
Christoph Oelckers
393b0a1db2 - added missing punctuation characters to Exhumed's SmallFont.
In particular this provides the required colon and slash characters for the level stats display.
2020-10-03 19:32:42 +02:00
Christoph Oelckers
bd25019b33 - added punctuation characters to SW's BigFont. 2020-10-03 19:03:02 +02:00
Christoph Oelckers
ddc968f607 - disable palette emulation when map global fog is active.
This doesn't work well together and is pointless anyway as everything needs to be rendered at full brightness.
Fixes #99
2020-10-03 18:04:07 +02:00
Christoph Oelckers
4c2ff2950a - for Duke/RR, when not using English force use of the regular text font for drawing the map label on the automap.
This essentially removes the tiny font which is simply too small to ever be able to receive a proper international extension from the equation for localization because the level name display was the only remaining relevant content using this font.
The only other screen where this font is still being used to draw text requiring translated content is the multiplayer summary which will have to be redesigned anyway if multiplayer becomes functional again.
2020-09-29 21:47:32 +02:00
Christoph Oelckers
fe61ff09a4 - added remapping for Cyrillic characters to matching Latin counterparts. 2020-09-29 20:16:31 +02:00
Christoph Oelckers
b57e13ff62 - mouse code update.
May still need some tweaking of the factors.
2020-09-28 22:36:43 +02:00
Christoph Oelckers
78903fab2b - text update mainly for Exhumed LEV19. 2020-09-27 07:34:38 +02:00
Christoph Oelckers
2e4596b99b - fixed typo in menu. 2020-09-26 17:45:46 +02:00
Christoph Oelckers
b93a9b478a - implemented World Tour's developer commentaries. 2020-09-26 17:43:34 +02:00
Christoph Oelckers
b8dae02464 - text update. 2020-09-26 14:30:54 +02:00
Christoph Oelckers
1e12bca0a6 - route World Tour's texts through the string table by adding an indirection option
This way they can be translated into all languages without duplicating all relevant content.
The original text files are no longer being used.
2020-09-26 10:08:48 +02:00
Christoph Oelckers
77841b3154 - fixed application of detail textures. 2020-09-25 22:03:11 +02:00
Christoph Oelckers
89bc194035 - added shareware checks to the "start game" menus. 2020-09-25 19:36:50 +02:00
Christoph Oelckers
cb63f5cdbf - SW: Two of the sword's frames are different in the shareware version, add these to the widescreen list as well. 2020-09-25 19:12:07 +02:00
Christoph Oelckers
ac99e35c9a - fixes for menu 2020-09-25 19:04:33 +02:00
Christoph Oelckers
0bb45a0a41 - added postprocessong options to menu 2020-09-25 18:42:07 +02:00
Rachael Alexanderson
c8a74a8f3f - sw: flykey: guard against non-godmode, bind to j by default 2020-09-25 13:50:29 +02:00
Christoph Oelckers
f106f35598 - fixed interpolation of palette emulation. 2020-09-23 18:18:23 +02:00
Christoph Oelckers
5e6317b8b9 Merge remote-tracking branch 'remotes/Github_private/Blood_InputReworking' 2020-09-22 23:32:28 +02:00
sinisterseed
831a9e3b29 - added menu entry for "cl_viewbob" in SW too 2020-09-22 23:25:07 +02:00
Mitchell Richters
2bc4291817 - menudef.txt: Remove a few Exhumed exclusions.
* These didn't seem to apply (as in, these functions worked out of the box for Exhumed) so I forgot about checking this.
2020-09-22 19:53:24 +10:00
Mitchell Richters
d40a2d3e95 Merge branch 'back_to_basics2' into Blood_InputReworking
# Conflicts:
#	source/blood/src/hudsprites.cpp
#	source/exhumed/src/status.cpp
#	source/games/duke/src/game_misc.cpp
#	source/sw/src/draw.cpp
2020-09-22 07:34:39 +10:00
Christoph Oelckers
0461acfc8b - removed the brightness fudging in the palette emulation shader and always return an alpha of 1.
The fudging was only needed because fog was still applied on top of the palette emulation so after completely disabling the true color distance attenuation in palette mode it made the image too bright.
The alpha needs to be 1 because this is only the texel, not the combined color.
2020-09-21 21:17:23 +02:00
Mitchell Richters
7bf1cacc7f - Blood/Duke/RR/SW: Unify the player's angle function.
* For Blood/SW, exposes `SB_LOOK_LEFT`/`SB_LOOK_RIGHT` to games, hooking up `q16look_ang` and `q16rotscrnang` within.
* For SW, use Duke & Blood's return to center function and remove `PF_TURN_180` bit.
* For RR, replace a few misused bits with some bools inside of `player_struct`.
* Since bulk of functionality is sourced from Duke (30Hz), apply proper scaling so SW speed matches (40Hz).
2020-09-21 17:12:26 +10:00