Commit graph

212 commits

Author SHA1 Message Date
Christoph Oelckers
7ba152e588 Merge branch 'master' into whaven
# Conflicts:
#	source/core/gameinput.h
#	source/core/version.h
#	source/games/exhumed/src/enginesubs.cpp
#	source/games/sw/src/game.cpp
2021-11-12 11:19:23 +01:00
Mitch Richters
a2a75fccc2 - Add support for Duke Nukem's Penthouse Paradise as shipped with the Zoom release of Duke Nukem 3D Atomic. 2021-11-06 23:26:56 +11:00
Mitch Richters
4030a18245 Merge branch 'master' into whaven 2021-10-28 09:45:52 +11:00
Mitchell Richters
271eb16833 - Duke: Correctly mark Duke: Alien World Tour as a Duke add-on. 2021-08-24 20:54:33 +10:00
Mitchell Richters
78b8f77850 - Remove duplicate grpinfo definition for "BLOOD: One Unit Whole Blood". 2021-08-24 11:22:44 +10:00
Christoph Oelckers
1fde9f2173 - workaround to allow playing SW's Last Warrior mod in one go.
This disables the boss's death in L4 ending the game and just advances to the next level.
This seems to be the intent with this mod as the second episode starting at L5 is not defined and the first episode's subtitle advertises the full game.
2021-07-26 00:58:00 +02:00
Mitchell Richters
4ac1376b9f - Make naming of multiplayer episode exclusion stuff from d0e6a7ea29 more generic and exclude invalid episodes from "Duke It Out in DC", "Duke Nuclear Winter" and "Duke Caribbean". 2021-07-19 12:24:47 +10:00
Mitchell Richters
b969a9aee3 - Blood: Capitalise Blood for 1.0 and 1.1 grpinfo definitions for consistency. 2021-07-18 22:46:18 +10:00
Mitchell Richters
bce8ea67d9 - Blood: Fixed grpinfo declarations for Blood 1.0 and 1.1 as per wildweasel on the forums: https://forum.zdoom.org/viewtopic.php?f=358&t=67220&start=45#p1149216
* Tested with 1.1 files and confirmed working as expected.
2021-07-18 22:38:42 +10:00
Mitchell Richters
d0e6a7ea29 - Allow CON-based games to have multiplayer episodes filtered from menu.
* Fixes #461.
* Fixes #462.
2021-07-16 20:55:29 +02:00
Christoph Oelckers
dd8505829e Merge branch 'master' into whaven 2021-06-27 09:27:40 +02:00
Christoph Oelckers
5556756d43 - map fix for Hickston Swamp (RR mod) E1L3:
Wall sprite is placed in the wrong sector which makes the new renderer's far stricter checks to reduce sprite flicker fail to position it correctly.
2021-06-13 09:32:30 +02:00
Christoph Oelckers
198fbf9297 Merge branch 'master' into whaven
# Conflicts:
#	source/core/screenjob.cpp
#	source/core/searchpaths.cpp
2021-06-03 08:52:19 +02:00
Christoph Oelckers
a0bf16d8fe - let Twin Dragon load the regular sw.def file.
TwinDrag.def is just some leftover SWP stuff in one of the available GRPs and should not be used.
2021-05-31 23:38:49 +02:00
Christoph Oelckers
8aed9063f8 - sector splitting hack for SW $bath.map. 2021-05-23 17:06:47 +02:00
Christoph Oelckers
671d200aa7 Merge branch 'master' into whaven
# Conflicts:
#	source/build/include/buildtypes.h
#	source/core/console/c_notifybuffer.cpp
#	source/core/d_protocol.h
#	source/core/version.h
#	wadsrc/static/zscript.txt
2021-05-16 13:03:17 +02:00
Christoph Oelckers
a346c141eb - added detection record for yet other variants of DukeDC and Duke Caribbean. 2021-05-15 18:42:51 +02:00
Christoph Oelckers
33a8355d11 Merge branch 'master' into whaven 2021-05-10 20:15:19 +02:00
Christoph Oelckers
bdfa13e341 - clear the sky flag off two more sectors in WT's "Skyline" map.
This is clearly a mapping error - these sectors aren't even supposed to have a sky - No idea why this did not glitch out in the other renderers
Trying to fix this in the renderer is tricky because it involves some unknown render quirk.
2021-05-10 20:13:29 +02:00
Christoph Oelckers
ccc77cefbb Merge branch 'master' into whaven 2021-05-09 11:24:48 +02:00
Christoph Oelckers
3fce8ab693 - added support for the 3 missing Duke Vacation SSIs. 2021-05-06 17:14:18 +02:00
Christoph Oelckers
6f19c415d6 Merge commit '6589222da6e2ac09d90681dbc6f97154cd60ef0b' into whaven
# Conflicts:
#	source/core/gamecontrol.h
#	source/core/searchpaths.cpp
#	wadsrc/static/zscript.txt
#	wadsrc/static/zscript/razebase.zs
2021-05-03 18:53:54 +02:00
Christoph Oelckers
d206a767b2 - added render workaround for CP07. 2021-05-03 17:48:35 +02:00
Christoph Oelckers
8003ab6fa3 Merge branch 'scriptable_cutscenes' into newrenderer 2021-05-02 22:37:46 +02:00
Christoph Oelckers
21aa5c9234 - added game flags for all supported add-ons. 2021-04-30 20:08:31 +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
Christoph Oelckers
ba5b8b3d6f Merge commit '2f696e1a95997f2969d1ddb49cd2827bde58479f' into whaven
# Conflicts:
#	source/core/gameinput.h
2021-04-19 13:11:41 +02:00
Christoph Oelckers
d5dc8230d6 - fixed typo. 2021-04-17 17:21:02 +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
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
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
2a7f2f4381 Merge commit '798cf2f9733c1415eef335a45f4d69962fae0695' into whaven 2021-04-12 20:41:39 +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
db5fbe3bbb - make the startup banner in the initial console window work. 2021-04-10 19:14:30 +02:00
Christoph Oelckers
b8fd41a58f Merge master into whaven
# Conflicts:
#	source/core/gamecontrol.h
2021-03-15 10:42: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
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
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
26c7bcdca4 - added default controller bindings from GZDoom. 2020-11-23 13:54:22 +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
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
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
b57e13ff62 - mouse code update.
May still need some tweaking of the factors.
2020-09-28 22:36:43 +02:00
Christoph Oelckers
2e4596b99b - fixed typo in menu. 2020-09-26 17:45:46 +02:00