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

124 commits

Author SHA1 Message Date
Mitch Richters
4030a18245 Merge branch 'master' into whaven 2021-10-28 09:45:52 +11:00
Mitchell Richters
77630dcbc7 - Rename DeferedStartGame() to DeferredStartGame(). 2021-07-20 18:43:17 +10:00
Mitchell Richters
fe652c9348 - Use isNamWW2GI() in more places. 2021-07-11 12:41:08 +10:00
Mitchell Richters
aa13b50504 - Use isRR() in more places. 2021-07-11 12:40:46 +10:00
Mitchell Richters
6894be4ad1 - Use the new isSWALL() wrapper everywhere. 2021-07-11 12:40:01 +10:00
Mitchell Richters
ffba10a7c5 - SW: Set default skill level to match original release and what the manual says is default. 2021-07-11 12:08:12 +10: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
9c60ab791b - implemented all needed font overrides for localization. 2021-05-31 21:20:31 +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
5e57b738d5 - removed redundant menu initializsation in M_StartControlPanel. 
This was a leftover of early development and is no longer needed.
 2021-05-16 12:21:08 +02:00
Christoph Oelckers
783b94f922 - more warning fixes in 'core'. 2021-05-12 21:48:14 +02:00
Christoph Oelckers
9dd9dc8efd - handle savegame loads like GZDoom. 
They are synchronized with the game loop and should not be initiated directly from the menu.
 2021-05-12 00:31:49 +02:00
Christoph Oelckers
499ed52972 - route savegame requests through the newwork, just like GZDoom does. 
Although a bit overkill for single player saves only, this will ensure consistent behavior between both engines regarding the menu.
 2021-05-12 00:21:26 +02:00
Christoph Oelckers
ccc77cefbb Merge branch 'master' into whaven 2021-05-09 11:24:48 +02:00
Christoph Oelckers
c679f83f75 - make all games return to the main menu when the game is ended with F10. 
Duke still went to the intro movies which was a bit problematic.
 2021-05-04 11:32:09 +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
8003ab6fa3 Merge branch 'scriptable_cutscenes' into newrenderer 2021-05-02 22:37:46 +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
f732d4ec64 - added MAPINFO parser, based on GZDoom's. 
This isn't hooked up yet, but all necessary structures and fields have been added so that selected pieces can be tested.
 2021-05-01 22:52:28 +02:00
Christoph Oelckers
e05f900315 - added the data structures to hold the cutscene data. 2021-04-30 20:08:31 +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
9a58299bee Merge branch 'master' into newrenderer2 2021-04-14 22:37:59 +02:00
Christoph Oelckers
230312e7f3 - re-fixed Blood skill selection. 2021-04-13 18:08:55 +02:00
Christoph Oelckers
88fb2185fa - Blood: default skill is 2, not 3. 2021-04-13 00:31:49 +02:00
Christoph Oelckers
aedb17e539 Merge commit 'a5ed7ba8a3eb26d3e3aa46bc87044608eacba57f' into whaven 2021-04-10 17:00:43 +02:00
Christoph Oelckers
e098e0ca2e - added VR mode init code as this is actually functional with the new renderer. 
Also moved a few things out of gl_texture.cpp as this file is scheduled to go away with Polymost.
 2021-04-05 20:12:11 +02: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
26c5d5aa32 - SW: fixed issue with autoselecting single episode entries with non-empty subtitles. 
This case needs different offsets.
 2021-01-27 23:53:26 +01:00
Mitchell Richters
25eaeff0db - Wrap all g_gameType & GAMEFLAG_BLOOD checks into isBlood() inline. 2021-01-02 14:46:58 +11:00
Mitchell Richters
a515426c68 Merge branch 'master' into witchaven2 2021-01-01 17:32:32 +11:00
Christoph Oelckers
5a5f9b8e02 - backend update from GZDoom. 2020-11-23 15:54:06 +01:00
Christoph Oelckers
61b42ea448 - fixed font color in SW's menus 
fixes #165
 2020-11-09 16:56:59 +01:00
Mitchell Richters
f7e30acf85 - gamecontrol.h: Define GAMEFLAG_WHALL as bitwise or of GAMEFLAG_WH and GAMEFLAG_WH2. 2020-11-08 21:59:46 +11: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
f09db4c943 - fixed issues with the skill menu. 2020-10-31 14:07:41 +01:00
Christoph Oelckers
2bebe0fa6a - the WH intro movies are playing now. 2020-10-31 14:05:01 +01:00
Christoph Oelckers
e702a13ef4 - close the quickload and quicksave confirmation screens after selection. 
Fixes #139
 2020-10-22 01:01:28 +02:00
Christoph Oelckers
699c32ff4a - fixed quicksave setup 
Fixes #133
 2020-10-20 23:34:30 +02:00
Christoph Oelckers
ef15ac8b6e - fixed: For the episode and skill menu, autoselection for single entries did not work. 2020-10-13 22:16:43 +02:00
Christoph Oelckers
86ad576675 - fixed lockup on Shareware screen when quitting Duke 
Two errors: the menu wasn’t closed and the shareware check was inverted.
 2020-10-12 08:07:51 +02:00
Christoph Oelckers
8b8c6a5e3a - fixed episode default. 2020-10-11 07:44:51 +02:00
Christoph Oelckers
242a70e610 - split the command line buffer off from c_console.cpp and reactivated the check for CONBACK. 2020-10-10 23:16:08 +02:00
Christoph Oelckers
16a4d49268 - added background dimming for the menu when in overlay mode. 2020-10-10 18:29:15 +02:00
Christoph Oelckers
03e57fa3d7 - fixed Exhumed's game startup. 2020-10-09 23:58:34 +02:00
Christoph Oelckers
d6d9100992 - set proper slider colors for all games. 2020-10-09 23:35:38 +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
15eaf86f5a - preparations for the image scroller menu. 2020-10-08 18:02:25 +02:00