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 |
|
Christoph Oelckers
|
6e0fbb2043
|
- removed templates.h includes.
|
2021-10-30 10:51:03 +02:00 |
|
Mitch Richters
|
4030a18245
|
Merge branch 'master' into whaven
|
2021-10-28 09:45:52 +11:00 |
|
Christoph Oelckers
|
2348dd8848
|
- backend update from GZDoom
* GLES backend fixes.
* font colorization fixes.
* option menu spacing fix
|
2021-10-07 22:46:45 +02:00 |
|
Mitchell Richters
|
1ee6fd76c4
|
Merge branch 'blood-qavrework'
# Conflicts:
# source/core/gamecvars.cpp
# source/core/gamecvars.h
# source/games/blood/src/weapon.cpp
|
2021-08-23 11:02:09 +10:00 |
|
Christoph Oelckers
|
bad2c2e55f
|
- backend update from GZDoom
* replacement of 'long' in string code.
* palette removal in V_GetColor.
* fixes to DShape2D buffer management.
|
2021-08-14 10:04:45 +02:00 |
|
Mitchell Richters
|
0d9afc1aaf
|
- Extend menu's ImageScroller ZScript class with mAnimated and use with Blood for the help and credits menu.
|
2021-08-05 14:52:51 +10:00 |
|
Mitchell Richters
|
1ed1222e10
|
- Extend menu's ListMenu ZScript class with mAnimated already natively available, and use with Blood where BloodDripDrawer is defined.
* Finalises the interpolated blood dripping code changes from 9884d5f396 .
|
2021-08-04 10:31:45 +10: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
|
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
|
ba5b8b3d6f
|
Merge commit '2f696e1a95997f2969d1ddb49cd2827bde58479f' into whaven
# Conflicts:
# source/core/gameinput.h
|
2021-04-19 13:11:41 +02:00 |
|
Christoph Oelckers
|
c8e466c995
|
- delete the "New savegame" node before starting work on the savegame.
This caused an off-by-one issue in the displayed list.
|
2021-04-19 12:48:06 +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
|
e7ab4cd176
|
- backend update from GZDoom.
|
2021-01-29 13:20:00 +01: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
|
f09db4c943
|
- fixed issues with the skill menu.
|
2020-10-31 14:07:41 +01:00 |
|
Christoph Oelckers
|
f341fbc1fb
|
- backend update.
|
2020-10-28 21:46:43 +01: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
|
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
|
cc7290e313
|
- work on menu transitions.
|
2020-10-08 01:00:23 +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
|
603c3b50ec
|
- reimplemented Blood's menu items.
|
2020-10-07 00:50:26 +02:00 |
|
Christoph Oelckers
|
7c89db69bd
|
-menuCustomizer from GZDoom.
|
2020-10-05 00:23:30 +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
|
27ff78ed51
|
- removed the GZDoom menu CCMDs.
|
2020-10-04 22:02:10 +02:00 |
|
Christoph Oelckers
|
f233345ba1
|
- move most of the menu code into the backend.
|
2020-10-04 21:57:35 +02:00 |
|
Christoph Oelckers
|
29db3febb8
|
- updated the platform code to be mostly identical with GZDoom
|
2020-05-26 00:08:26 +02:00 |
|
Christoph Oelckers
|
e2f5e8fe34
|
- renamed 'common' to 'core'.
We'll need 'common' for something else.
|
2020-04-12 08:30:36 +02:00 |
|
Mitchell Richters
|
c23351a4b9
|
Menu System: Add confirmation to FOptionMenuItemSafeCommand()
- Resolves 'https://forum.zdoom.org/viewtopic.php?f=340&t=67721'.
|
2020-04-10 10:29:50 +02:00 |
|
Christoph Oelckers
|
f89915ac8f
|
- fixed game start check for Exhumed's ingame menu.
|
2020-03-01 16:40:19 +01:00 |
|
Christoph Oelckers
|
12af524dcc
|
- fixed Exhumed's ingame menu.
The bad setup here didn't let the menu's exit action pass to the game code, it still needed ugly workarounds.
|
2020-03-01 16:32:41 +01:00 |
|
Christoph Oelckers
|
4bc0531bf7
|
- disabled help screen in Exhumed and save menus in Deer Huntin'.
|
2020-02-29 12:55:12 +01:00 |
|
Christoph Oelckers
|
dbf446ee6c
|
- ported the menu changes of the last commit.
|
2020-02-27 19:26:30 +01:00 |
|
Christoph Oelckers
|
1eb00949e3
|
- manually added the RRDH menu stuff.
|
2020-02-26 20:31:49 +01:00 |
|
Christoph Oelckers
|
0551c16203
|
- added detection for Deer Huntin' GRP.
|
2020-02-26 20:31:48 +01:00 |
|
Christoph Oelckers
|
985e441d80
|
- transitioned all JSON-based savegame code to FSerializer and removed sjson.
Now everything is in place to transition the rest of the savegame code as well.
|
2020-02-23 14:03:03 +01:00 |
|
Christoph Oelckers
|
ce9b71a31f
|
- fixed hitbox for menu sliders.
|
2020-02-18 21:05:46 +01:00 |
|
Christoph Oelckers
|
7dc26a3162
|
- stop all playing sound when starting a new game.
- give all bonus screen sounds in Duke the CHANF_UI flag.
|
2020-02-17 19:43:58 +01:00 |
|
Christoph Oelckers
|
dcad616030
|
- unpause sound when starting the demo loop.
|
2020-02-17 18:40:32 +01:00 |
|
Christoph Oelckers
|
3cd2b92dd1
|
- pause all game sounds while the menu or console are open and marked SW's UI sounds as such.
|
2020-02-16 20:08:04 +01:00 |
|