Commit graph

646 commits

Author SHA1 Message Date
Christoph Oelckers
3c27ec8cbd - tested all of Duke's and RR's cutscenes. 2021-04-30 20:08:33 +02:00
Christoph Oelckers
06abc0cfe2 - removed debug output and fixed fade flag setup and missing OnTick return 2021-04-30 20:08:33 +02:00
Christoph Oelckers
26a7700579 - Duke's intro works, without fading. 2021-04-30 20:08:32 +02:00
Christoph Oelckers
1166b00af2 - switched intro movie playing over to the new system
Not tested yet.
2021-04-30 20:08:32 +02:00
Christoph Oelckers
af8d06994a - implemented the scripting interface layer. 2021-04-30 20:08:32 +02:00
Christoph Oelckers
ef6d8c2c67 - added cutscene definitions for Duke and finalized the definecutscene parser. 2021-04-30 20:08:32 +02:00
Christoph Oelckers
021f1b7832 - make SummaryInfo a struct instead of passing a list of values to the script classes. 2021-04-30 20:08:32 +02:00
Christoph Oelckers
57853bf8fe - RR Cutscene generators. 2021-04-30 20:08:31 +02:00
Christoph Oelckers
f077359196 - merge DukeDC's end of episode cutscene into BuildE3End.
This will make things a bit easier on the setup side because it eliminates the need for mission pack specific definitions.
2021-04-30 20:08:31 +02:00
Christoph Oelckers
21aa5c9234 - added game flags for all supported add-ons. 2021-04-30 20:08:31 +02:00
Christoph Oelckers
88dfb93865 - redid Duke cutscene code to use functions, not classes as exports and added the missing screens.
Functions are better because they allow doing more in the internal setup code.
2021-04-30 20:08:31 +02:00
Christoph Oelckers
eeefc4355e - scriptified all of Duke's end of episode cutscenes. 2021-04-30 20:08:30 +02:00
Christoph Oelckers
9d20185b39 - used pushv to make the intro init code look nicer. 2021-04-30 20:08:30 +02:00
Christoph Oelckers
b515543016 - added varargs pushv function to Array<int>.
We'll need this for the ANM sound arrays.
Support for other array<> types to be done later.
2021-04-30 20:08:30 +02:00
Christoph Oelckers
66799d9a6d - more screen job setup work.
* interface for movie player done.
* first cutscene definition done.
* all converted classes removed from C++ code.
2021-04-30 20:08:30 +02:00
Christoph Oelckers
4ff2010bd1 - moved the entire screen job management to the script side.
This isn't hooked up yet and lots of code is commented out, the games won't start with this commit.
2021-04-30 20:08:30 +02:00
Christoph Oelckers
d853b63a1a - RR summary screen 2021-04-30 20:08:29 +02:00
Christoph Oelckers
d5a8147f1b - Duke screens are complete. 2021-04-30 20:08:25 +02:00
Christoph Oelckers
c07fcbee08 - migrated level summary screen. 2021-04-30 20:08:24 +02:00
Christoph Oelckers
4636a52699 - MP summary screen ported. 2021-04-30 20:08:24 +02:00
Christoph Oelckers
7fbe153ae7 - more Duke screen porting. 2021-04-30 20:08:24 +02:00
Christoph Oelckers
9c95f003f1 - ported E2ENDSCREEN 2021-04-30 20:08:24 +02:00
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
5784e45f41 Merge commit 'aa6bd8ffcc11c0ae3de1dae1ab530a999dd510c9' into whaven
# Conflicts:
#	source/core/gameinput.h
2021-04-25 12:18:39 +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
Christoph Oelckers
ba5b8b3d6f Merge commit '2f696e1a95997f2969d1ddb49cd2827bde58479f' into whaven
# Conflicts:
#	source/core/gameinput.h
2021-04-19 13:11:41 +02: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
e82f17f9c6 Merge commit 'e89761d2d526581e4599f564b26a6eb983fd92ec' into whaven
# Conflicts:
#	source/core/d_protocol.h
#	source/core/gameinput.h
2021-04-17 14:59:12 +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
2a7f2f4381 Merge commit '798cf2f9733c1415eef335a45f4d69962fae0695' into whaven 2021-04-12 20:41:39 +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
aedb17e539 Merge commit 'a5ed7ba8a3eb26d3e3aa46bc87044608eacba57f' into whaven 2021-04-10 17:00:43 +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
2c44965f20 Merge commit 'e47b4507e4c0460dcc7f92b6f440c2f0d4832433' into whaven
# Conflicts:
#	source/CMakeLists.txt
2021-03-24 19:07:23 +01:00
Christoph Oelckers
75159e06c0 - uncommented the portal code in hw_walls.cpp. 2021-03-21 19:36:55 +01:00
Christoph Oelckers
b8fd41a58f Merge master into whaven
# Conflicts:
#	source/core/gamecontrol.h
2021-03-15 10:42:59 +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
157b70212f Merge branch 'master' into whaven 2021-02-27 00:22:04 +01:00
Christoph Oelckers
ba5ede65b8 - backend update from GZDoom. 2021-02-26 19:06:10 +01:00
Christoph Oelckers
42e5e370c8 Merge branch 'master' into whaven 2021-02-13 10:07:25 +01:00
Christoph Oelckers
5aacb2370d - fixed game resource lookup.
The algorithm was a bit too complicated and missed the smallest defined game resource.
GrpInfo was renamed because there were two of them which created a debugger conflict.
2021-02-13 10:07:18 +01:00
Mitchell Richters
7ed32ad5d6 - WHaven: Skirt around Witchaven detection issues in parser by duplicating grpinfo object in grpinfo.txt. 2021-02-13 19:00:33 +11:00
Mitchell Richters
08f1600aa0 - Synchronise EGameType enum from native code. 2021-02-13 19:00:32 +11:00
Mitchell Richters
5fc7c7b1d7 Merge branch 'master' into whaven
# Conflicts:
#	source/CMakeLists.txt
#	source/build/include/buildtypes.h
#	source/common/utility/m_fixed.h
#	source/core/console/c_notifybuffer.cpp
#	source/core/gamecontrol.h
#	source/core/inputstate.cpp
#	source/core/version.h
2021-02-13 18:59:58 +11: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
Mitchell Richters
a515426c68 Merge branch 'master' into witchaven2 2021-01-01 17:32:32 +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
e37dc08a6b - remap WH's fly to 'quick_kick', because crouch got refactored. 2020-11-08 10:51:19 +01:00
Christoph Oelckers
5d77b1fd25 Merge branch 'master' into witchaven2
# Conflicts:
#	source/core/packet.h
#	wadsrc/static/menudef.txt
2020-11-08 10:44:19 +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
aa4470a237 - SkipTicCmd(): Fix missed skip increment amount changes following expansion of fvel/svel in 6371505fb3.
Thanks, Graf :).
2020-11-08 19:15:03 +11: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
91ebe9bcc2 - prepared everything for use of the string table.
# Conflicts:
#	wadsrc/static/language.csv
2020-10-31 14:08:07 +01:00
Christoph Oelckers
fd3303ab2b - set up the Witchaven specific controls and their menu entries.
Sorry, no text file yet.
2020-10-31 14:07:43 +01:00
Christoph Oelckers
7f921be824 - activated weapon code and reverted quick graphics test.
Weapons do not work yet, though.
2020-10-31 14:07:43 +01:00
Christoph Oelckers
e33c7d54ac - added the weapon drawer. 2020-10-31 14:07:43 +01:00
Christoph Oelckers
f09db4c943 - fixed issues with the skill menu. 2020-10-31 14:07:41 +01:00
Christoph Oelckers
453e273d0c - implemented the WH2 menu.
This is a rather liberal reinterpretation because the original assets are unusable (text as graphics with baked-in highlights) and the highlight graphics used by GDX are too ugly for serious consideration.
As a result this highlights the font like the first Witchaven, i.e. coloring it green.
2020-10-31 14:07:38 +01:00
Christoph Oelckers
c77a072628 - added all needed parts of Witchaven's native looking menu.
This isn't particularly faithful, though, neither with DOS nor GDX because both menus have UX issues.

Main menu items reflect what a modern engine needs, not what DOS had.
The hi-res menu background is not being used because it forces the entire menu into the upper left corner.
The original game had the difficulty only as a setting on the "gore" page and could not start the game from there. This has been changed to a more traditional skill menu.
The only other part that has been ported over is the help screens.
2020-10-31 14:06:12 +01:00
Christoph Oelckers
45d2fd95a9 - implementing the Witchaven menu.
Main menu is working, skill menu still to do.
2020-10-31 14:06:12 +01:00
Christoph Oelckers
f32e9b25e0 - Witchaven 2 font 2020-10-31 14:05:39 +01:00
Christoph Oelckers
b8c700e284 - Witchaven 1 small and big font plus other graphics assets. 2020-10-31 14:05:01 +01:00
Christoph Oelckers
7f7a576961 - music code. 2020-10-31 14:05:00 +01:00
Christoph Oelckers
ff06895470 - added game identifiers for Witchaven 1+2
Lacking any main resource file, this checks for the JOESND containers to avoid rewriting the detection logic to work without containers.
2020-10-31 14:05:00 +01: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