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 |
|
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
|
06b00887f5
|
- added a menu control for Blood's dripping blood.
|
2020-10-06 23:49:34 +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
|
1e131eda9e
|
- implemented Blood's menu caption
|
2020-10-06 00:34:35 +02:00 |
|
Christoph Oelckers
|
16431e9f0a
|
- SetupMenuColors restored.
|
2020-10-04 22:21:11 +02:00 |
|
Christoph Oelckers
|
6a4b72cfef
|
- removed obsolete calls from menudef.cpp.
|
2020-10-04 22:14:20 +02:00 |
|
Christoph Oelckers
|
f233345ba1
|
- move most of the menu code into the backend.
|
2020-10-04 21:57:35 +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
|
7f6b02c451
|
- merged string table and system callbacks.
|
2020-10-04 21:15:51 +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
|
82612a1330
|
- it compiles again (with lots of code commented out.)
|
2020-10-04 20:11:02 +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
|
89bc194035
|
- added shareware checks to the "start game" menus.
|
2020-09-25 19:36:50 +02:00 |
|
Mitchell Richters
|
ce269808dc
|
- Remove leftover Ion Fury stuffs causing log errors like "Script error, 'D:/Program Files (x86)/Steam/steamapps/common/Ion Fury/fury.grpinfo" line 10: Warning: GRP without game defined. Ignoring'".
|
2020-09-25 18:06:06 +10:00 |
|
Christoph Oelckers
|
52cbb5c9dc
|
- implemented reloading from the last saved game, like in GZDoom.
Fixes #352
|
2020-09-10 22:45:42 +02:00 |
|
Christoph Oelckers
|
d011a16c5b
|
- added a menu option for WT's music switch.
Fixes #370
|
2020-09-08 22:37:21 +02:00 |
|
Christoph Oelckers
|
c1786001b2
|
- route all game state changes through game actions.
This is to avoid problems with the main loop not calling Ticker and Render in sync.
|
2020-09-05 15:43:34 +02:00 |
|
Christoph Oelckers
|
32ec9ff369
|
- consolidated crosshair drawing and added ZDoom's crosshair code.
For Exhumed this is the default, for the other games it is an option.
Fixes #269.
|
2020-09-05 13:57:26 +02:00 |
|
Christoph Oelckers
|
1eb99f69c2
|
- transitioned Exhumed to level change events.
|
2020-09-04 21:59:38 +02:00 |
|