zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-04 01:51:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
15237 commits 34 branches 63 tags 172 MiB
Commit graph

735 commits

Author SHA1 Message Date
Christoph Oelckers
af781e0422 - moved all font setup out of the C++ code. 
All internal fonts now get defined through FONTDEFS.
Also fixing a few offsets.
 2021-05-31 21:20:31 +02:00
Christoph Oelckers
42b70a7d93 - added internationalized fonts. 
This still needs a bit of fixing and tweaking but most is working.
 2021-05-31 21:20:30 +02:00
sinisterseed
64a3c5aac8 - expose the HQ resize options to the menu. 2021-05-29 15:58:31 +03:00
Christoph Oelckers
39b84c4063 - don't use DI_ITEM_RELCENTER for Blood's animated heart. 
It does not look right for this sprite.
 2021-05-29 13:42:00 +02:00
Christoph Oelckers
db21313c96 - add some hackery to deal with WT's bosses. 
This was the result of some gross change to the spawning code which suddenly changed the rules about minibosses.
To reduce the impact, it is only enabled for the "Alien World Order" maps.
 2021-05-29 13:12:50 +02:00
Christoph Oelckers
8fae793341 - defined a new constant, CR_NATIVEPAL, to use the font functions with a predefined palette. 
This is mainly for code clarification, the value is the same as CR_UNDEFINED.
 2021-05-29 11:47:05 +02:00
Christoph Oelckers
d44500863b - removed the multiplayer scoreboard screens. 
Since there is no plan to keep them in case MP gets implemented there's no need to maintain them.
These should later be replaced by a generic screen using a better font and a layout that takes higher resolutions into account.
 2021-05-27 13:33:54 +02:00
Christoph Oelckers
a63873d243 - fixed 'pause' keybinding control was disabled in the menu. 2021-05-23 17:10:51 +02:00
Christoph Oelckers
8aed9063f8 - sector splitting hack for SW $bath.map. 2021-05-23 17:06:47 +02:00
Christoph Oelckers
b2545f8042 - PlayMusic script function. 2021-05-23 16:21:04 +02:00
Christoph Oelckers
0c6e2f0c9e - silenced some warnings. 2021-05-22 15:34:04 +02:00
Christoph Oelckers
d7a47b2f3a - route all accesses to gameaction from the backend through the sysCallbacks. 
gameactions are frontend specific so this needs to be decoupled.
 2021-05-22 13:02:34 +02:00
Christoph Oelckers
6ae09f8ec9 - ported Doom's type-on text screens as a screen job overlay. 2021-05-22 12:08:08 +02:00
Christoph Oelckers
5337513044 - ported GZDoom's subtitle drawer to the cutscene framework. 
For later use, this isn't used yet.
 2021-05-22 10:26:53 +02:00
Christoph Oelckers
d2ed4e703d - made Exhumed's text scroller a universal component of the cutscene system, usable by all games. 2021-05-22 10:06:15 +02:00
Christoph Oelckers
0d793a59fd - moved the cutscene core to 'engine'. 
More adjustments for making this code compatible with GZDoom.
 2021-05-22 02:15:49 +02:00
Christoph Oelckers
c80c2e7a6c - this wasn't supposed to be changed. 2021-05-19 22:48:21 +02:00
Christoph Oelckers
75cc66083d - Blood: fixed use of wrong font for ammo display on statusbar. 2021-05-19 22:40:10 +02:00
Christoph Oelckers
91bd24f8b5 - fixed level name display on automap. 2021-05-19 22:21:11 +02:00
Christoph Oelckers
4d8a2c91f2 - another WIP. 2021-05-19 00:43:50 +02:00
Christoph Oelckers
bd1755dee7 WIP 2021-05-18 08:01:08 +02:00
Christoph Oelckers
98bb8c516d - added missing declarations for RR's intro movies. 2021-05-18 00:08:32 +02:00
Christoph Oelckers
3ae8f45928 Merge branch 'master' into whaven 2021-05-17 19:33:02 +02:00
Christoph Oelckers
4d226d19e7 - Exhumed: fixed jumping icons on the status bar. 
Unfortunately, due to the utterly broken design of the sequences the fullscreen HUD is not fixed. This would require graphics replacements that fix the bad offsetting in the torch.
 2021-05-17 19:22:57 +02:00
Christoph Oelckers
61d81efe45 - fixed definition of ExhumedCutscenes.BuildGameoverScene. 
Needs to be declared static.
 2021-05-17 18:17:15 +02:00
Christoph Oelckers
24ce5d6130 - Exhumed: fix animation stopping for inventory torch item. 
I have no idea how the old code could ever work...
 2021-05-16 20:25:56 +02:00
Christoph Oelckers
88fe8e49a3 - Blood: fixed throw power meter. 2021-05-16 18:56:56 +02:00
Christoph Oelckers
25d516c36f - fixed shadow and positioning of stats display. 2021-05-16 16:12:44 +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
f2d75d4146 - made status bar configurable through rmapinfo. 2021-05-16 10:43:47 +02:00
Christoph Oelckers
ee559b7ba9 - removed all leftover parts of the native status bars. 2021-05-16 10:35:33 +02:00
Christoph Oelckers
83f151529b - fixed SW status bar. 2021-05-16 10:25:56 +02:00
Christoph Oelckers
8d8b3cda46 - scriptified SW's status bar. 
Not tested yet. This just compiles without errors.
 2021-05-16 09:34:08 +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
f136330628 - removed the native versions of Duke's and RR's status bar. 2021-05-15 17:15:29 +02:00
Christoph Oelckers
781cb32dcf - fixed all issues with Duke's/RR's status bar. 2021-05-15 16:46:08 +02:00
Christoph Oelckers
f84f58e714 - ported Duke and RR status bars. 
Compiles but not tested yet.
 2021-05-15 14:27:32 +02:00
Christoph Oelckers
d311792e06 - engine side preparations for Duke Statusbar scriptification. 
Mainly, gotweapon had to be reverted to a flat bool array to avoid implementing FixedBitArray for the VM.
Also adding a few new tile names and PushV for string arrays.
 2021-05-15 10:44:35 +02:00
Christoph Oelckers
b520d38bc0 - removed the native implementation od Exhumed's status bar. 2021-05-15 10:25:39 +02:00
Christoph Oelckers
663f330684 - fixed GetChunkFrame implementation and one bad GetString call. 
Exhumed's status bar is fully working with this.
 2021-05-15 10:25:38 +02:00
Christoph Oelckers
b71c725e3e - ported Exhumed's status bar. 
Not tested yet.
 2021-05-15 10:25:38 +02:00
Christoph Oelckers
5a6121d424 - status bar interface work. 2021-05-15 10:25:38 +02:00
Christoph Oelckers
317238147b - Blood: fixed scriptified MP statusbar code to the point where it compiles. 
Mainly to avoid code rot by future changes, this probably cannot remain as it is if MP gets reimplemented.
 2021-05-15 10:25:37 +02:00
Christoph Oelckers
e5dd4a8638 - made the scripted version of Blood's status bar functional. 2021-05-12 21:50:02 +02:00
Christoph Oelckers
778378fd5c - scriptified version of Blood's status bar compiles. 
Not tested yet.
 2021-05-12 21:50:02 +02:00
Christoph Oelckers
4ad20e4c00 - more preparations for scriptification of Blood's status bar. 
* restructured some code that could not be converted as-is due to access to data that should be off-limits to scripts.
* exporting most of PLAYER's member fields.
 2021-05-12 21:50:02 +02:00
Christoph Oelckers
acb4830eb5 - ported the BaseStatusBar class to ZScript. 
Not hooked up yet, but it compiles.
 2021-05-12 21:50:01 +02:00
Christoph Oelckers
633d205d80 - SW: fixed ammo pickup amount. 2021-05-12 00:01:19 +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
6c8b133b87 - integrated all the recent UI changes into Witchaven. 2021-05-09 16:05:42 +02:00
Christoph Oelckers
ccc77cefbb Merge branch 'master' into whaven 2021-05-09 11:24:48 +02:00
arrowgent
bc66690349 Create menudef.txt 
fixes issue only for option Chat > Say = (T)
https://github.com/coelckers/Raze/issues/311
 2021-05-07 20:55:42 +02:00
Christoph Oelckers
3fce8ab693 - added support for the 3 missing Duke Vacation SSIs. 2021-05-06 17:14:18 +02:00
Christoph Oelckers
8c6cecd738 - scriptified WH cutscenes and created a texture name definition table. 2021-05-03 18:58:02 +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
56fcf904b5 - Backend update from GZDoom. 2021-05-03 14:48:55 +02:00
Christoph Oelckers
8003ab6fa3 Merge branch 'scriptable_cutscenes' into newrenderer 2021-05-02 22:37:46 +02:00
Christoph Oelckers
dfd47ea33a - migrated SW to RMAPINFO as well. 
Also removed the 'definecutscene' code from the .def parser as this was never meant to be more than a temporary solution.
 2021-05-02 17:35:25 +02:00
Christoph Oelckers
4b064b9f34 - migrated Exhumed's level setup to RMAPINFO. 
This game never had a proper setup so this also fixes the crashes with visiting the multiplayer maps.
 2021-05-02 15:54:19 +02:00
Christoph Oelckers
bb9d492db6 - migrated RRRA as well. 2021-05-02 14:01:10 +02:00
Christoph Oelckers
a28b4ea06a - migrated Route66 and fixed some issues pointed out by this mod. 2021-05-02 13:29:41 +02:00
Christoph Oelckers
6f4e380728 - migrated RR's cutscene definitions. 
Also turned several level-specific init options into map flags or map parameters.
 2021-05-02 13:12:24 +02:00
Christoph Oelckers
15f9861633 - summary screens, too. 2021-05-02 12:28:32 +02:00
Christoph Oelckers
4458f8c929 - migrated the global cutscenes to RMAPINFO as well. 2021-05-02 12:22:40 +02:00
Christoph Oelckers
2d4e91615f - migrated Duke's cutscene definitions to the new RMAPINFO.txt. 2021-05-02 12:02:55 +02:00
Christoph Oelckers
dbd179be5c - RR progression fixes. 
* E1L7 abuses an 'end the game' command to progress to E2L1, this needs special treatment.
* handle ENDGAME.MAP more cleanly by injecting an 'engine.con' into the compilation chain to define its map record. The main issue with this is that it needs to be defined before the regular CONs run.
* check the already defined 'clearinventory' and 'clearweapons' flags that are exposed through RMAPINFO (Duke/RR only so far.)
 2021-05-02 10:55:22 +02:00
Christoph Oelckers
1798380f23 - adapted map transition in Duke/RR. 
There's still some issues which will be taken care of by adding map flags.
 2021-05-02 10:35:43 +02:00
Christoph Oelckers
93bfc35ad6 - use the volumes to find the starting maps for the menu and the clusters for the cutscenes. 2021-05-02 01:01:30 +02:00
Christoph Oelckers
825963661b - migrated volumes to the new storage. 2021-05-02 00:35:56 +02:00
Christoph Oelckers
03b9275244 - removed debug printf. 2021-05-01 23:59:45 +02:00
Christoph Oelckers
51aeb6dd39 - fixed issues with skipping over an entire cutscene. 
This must never destroy the last element of the cutscene because it is still needed to draw something while shutdown is performed.
 2021-05-01 20:54:57 +02:00
Christoph Oelckers
fa3fd9ac8f - removed unused array. 2021-05-01 20:34:43 +02:00
Christoph Oelckers
4c2266ee88 - fixed incomplete SW ending cutscene. 2021-05-01 20:31:51 +02:00
Christoph Oelckers
a2a850ea3c - center the texts on Duke's loading screen. 2021-05-01 20:14:30 +02:00
Christoph Oelckers
512f1d852b - fixed: Blood's summary screen needs to stop it sound when it ends. 2021-05-01 20:11:47 +02:00
Christoph Oelckers
f0bd290801 - corrected speed of RR intro videos. 2021-05-01 20:04:22 +02:00
Christoph Oelckers
27799def63 - rewrote movie player so that the decoder backends only perform the decoding but do not draw the frames themselves. 
This caused twq problems:

1. It made it impossible to let the client apply effects to the video.
2. The client had no control when rendering stopped.

Now the backends only provide a texture handle that the client must draw. One immediate benefit is that Blood's fixed viewport scaling is now available to all video formats.
 2021-05-01 18:59:16 +02:00
Christoph Oelckers
4069a5096a - scriptified Exhumed's 2D content (minus the programmatic textures.) 2021-04-30 20:08:36 +02:00
Christoph Oelckers
5b54e9c1ad - removed the 26 factor from Duke's par times. 
What were they thinking?
 2021-04-30 20:08:36 +02:00
Christoph Oelckers
aa148d602c - scriptified SW's 2D screens. 
Compiles but not tested yet.
 2021-04-30 20:08:35 +02:00
Christoph Oelckers
6c2aab3017 - fixed remaining issues with Blood's cutscenes. 2021-04-30 20:08:34 +02:00
Christoph Oelckers
eaf5e1fba5 - Cutscene support in Blood. 
Intro tested, rest to do.
 2021-04-30 20:08:34 +02:00
Christoph Oelckers
869dbd70e5 - fixed the design by merging the episode start handler into ShowIntermission. 
Tying the start-of-episode cutscene to the cluster does not really work because it gets triggered by all maps of the cluster.
All currently existing intro cutscenes are tied to the map anyway.
Also correcting transition movie name for RRRA E2L1.
 2021-04-30 20:08:34 +02:00
Christoph Oelckers
cdccdec3e7 - final cleanup on new cutscene interfacw 
* fixed frame gaps when exiting a cutscene. This must be properly synchronized with the state handler in the main loop.
* reactivated the loading screens. With texture precaching working the delay when loading a map becomes significant enough to require a visual feedback.
* RR does not play 'bonusmusic' on its summary screen.
 2021-04-30 20:08:34 +02:00
Christoph Oelckers
ad01aee5ec - fixed RR summary screen 2021-04-30 20:08:33 +02:00
Christoph Oelckers
6d743ce921 - most of the summary screen is working 2021-04-30 20:08:33 +02:00
Christoph Oelckers
0dc6980e5c - made episode intro cutscenes a game independent feature. 
So far only defined for Duke E4 but all the logic is outside the game code now and can be universally handled.
 2021-04-30 20:08:33 +02:00
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