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

126 commits

Author SHA1 Message Date
hendricks266
2cdf98f07a Systematize the appearance of the menu fonts using the DOS version as a reference. 
New events:
"EVENT_MENUCURSORLEFT"
"EVENT_MENUCURSORRIGHT"
"EVENT_MENUCURSORSHADE"
"EVENT_MENUSHADESELECTED"

New userdef structures:
"menu_shadedeselected"
"menu_shadedisabled"
"menutext_zoom"
"menutext_xspace"
"menutext_pal"
"menutext_palselected"
"menutext_paldeselected"
"menutext_paldisabled"
"menutext_palselected_right"
"menutext_paldeselected_right"
"menutext_paldisabled_right"
"gametext_zoom"
"gametext_xspace"
"gametext_pal"
"gametext_palselected"
"gametext_paldeselected"
"gametext_paldisabled"
"gametext_palselected_right"
"gametext_paldeselected_right"
"gametext_paldisabled_right"
"minitext_zoom"
"minitext_xspace"
"minitext_tracking"
"minitext_pal"
"minitext_palselected"
"minitext_paldeselected"
"minitext_paldisabled"
"minitext_palselected_right"
"minitext_paldeselected_right"
"minitext_paldisabled_right"
"menutitle_pal"
"slidebar_palselected"
"slidebar_paldisabled"

Self-explanatory. Use in conjunction with "menutext_tracking" and "gametext_tracking" ("mgametext_tracking" is now ignored).

The values for disabled shade is added to the selected or deselected shades. The palettes have a disabled > selected > deselected hierarchy, and are applied if not zero.

Patch from Fox

git-svn-id: https://svn.eduke32.com/eduke32@6613 1a8010ca-5511-0410-912e-c29ae57300e0
 2018-01-29 02:14:16 +00:00
hendricks266
c7edef4f43 New LOGO_FLAGS bits LOGO_NOHELP and LOGO_NOCREDITS. 
LOGO_NOHELP: Remove the "Help" item in the main menu and the F1 key function.

LOGO_NOCREDITS: Remove the "Credits" item in the main menu.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6612 1a8010ca-5511-0410-912e-c29ae57300e0
 2018-01-29 02:14:09 +00:00
hendricks266
0bad11ee9d Fix typo in r6589. 
git-svn-id: https://svn.eduke32.com/eduke32@6599 1a8010ca-5511-0410-912e-c29ae57300e0
 2018-01-28 04:30:29 +00:00
hendricks266
740cedefbb New userdef structures "default_volume", "default_skill" 
Lets you choose which episode or skill should be selected by default in the menus. Default values are 0 and 1, respectively.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6596 1a8010ca-5511-0410-912e-c29ae57300e0
 2018-01-26 04:35:33 +00:00
hendricks266
1e04f43240 New userdef structure: "menu_slidebarz", "menu_slidebarmargin", "menu_slidecursorz" 
Self-explanatory. Default value for all is 65536.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6589 1a8010ca-5511-0410-912e-c29ae57300e0
 2018-01-26 04:35:02 +00:00
hendricks266
4da012a15f Add an option to move the status bar to the top of the screen in the Android version. 
Restores a feature temporarily disabled in r6553.

Currently only supports the modern status bar.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6588 1a8010ca-5511-0410-912e-c29ae57300e0
 2018-01-26 04:34:57 +00:00
hendricks266
150ddded12 New userdef structure: "statusbarflags", "statusbarrange", "statusbarcustom" 
"statusbarflags" is a bitfield. Values are:
STATUSBAR_NONONE = 1
STATUSBAR_NOMINI = 2
STATUSBAR_NOFULL = 4
STATUSBAR_NOSHRINK = 8
STATUSBAR_NOFRAGBAR = 16
STATUSBAR_NOOVERLAY = 32
STATUSBAR_NOMODERN = 64
Default value is 8. In case you modify it, you also have to set the other status bar related userdefs in EVENT_SETDEFAULTS. Default values in EDuke32 are: screen_size = 4; statusbarmode = 1; althud = 1;

"statusbarrange" is used to add more alternatives for the status bar without breaking the option in the menu. If used, the mini status bar (screen_size = 4) will cycle through "statusbarcustom" when changing the screen size.

Also fix the size of the viewport when the screen is shrunk and the scale of the status bar is not 100%.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6587 1a8010ca-5511-0410-912e-c29ae57300e0
 2018-01-26 04:34:51 +00:00
hendricks266
85d0a3c520 New userdef structure "menubackground" 
Set to 0 to disable the black transparent mask below the in-game menu.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6585 1a8010ca-5511-0410-912e-c29ae57300e0
 2018-01-26 04:34:43 +00:00
hendricks266
29543fd087 Menus: Fix current selection of episode menu when you return from the skill menu. 
git-svn-id: https://svn.eduke32.com/eduke32@6583 1a8010ca-5511-0410-912e-c29ae57300e0
 2018-01-26 04:34:33 +00:00
hendricks266
d9b0479343 ZDoom-style saves 
git-svn-id: https://svn.eduke32.com/eduke32@6569 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-12-18 11:24:53 +00:00
hendricks266
63748e5381 New LOGO_FLAGS bits: 
- LOGO_STOPMISCSOUNDS = 2097152: Don't play NITEVISION_ONOFF when the logo starts.
- LOGO_NOGAMETITLE = 4194304: Don't display the title (INGAMEDUKETHREEDEE and PLUTOPAKSPRITE+2) in the main menu.
- LOGO_NOTITLEBAR = 8388608: Don't display the title bar background (TITLEBAR) above the menu.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6555 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-12-12 05:13:49 +00:00
hendricks266
9765526948 Move the modern status bar option into the screen size slider. 
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6553 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-12-12 05:13:42 +00:00
terminx
de5f16b1c5 Fix events added in recent commits 
git-svn-id: https://svn.eduke32.com/eduke32@6537 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-12-02 09:24:55 +00:00
hendricks266
d722b998ed Make sure I_EnterText never writes a null terminator out of bounds. 
git-svn-id: https://svn.eduke32.com/eduke32@6530 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-12-01 06:19:12 +00:00
hendricks266
4313460da7 Bump savegame name limits from 22 in memory and 19 in practice to 32 in memory and 30 in practice. 
This bumps SV_MINOR_VER.

git-svn-id: https://svn.eduke32.com/eduke32@6529 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-12-01 06:19:09 +00:00
hendricks266
5de5dc9fcd Menus: Change "Size:" entries in HUD Setup to "Scale:" and indent them. 
git-svn-id: https://svn.eduke32.com/eduke32@6522 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-11-29 07:29:57 +00:00
terminx
67e3166fb3 Add palette emulation menu options to control r_usetileshades and r_pr_artmapping 
git-svn-id: https://svn.eduke32.com/eduke32@6502 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-11-22 05:23:43 +00:00
hendricks266
60fcb6527c Menus: If you open the Help menu with the F1 key, make Help the selected item on the main menu, if applicable. 
git-svn-id: https://svn.eduke32.com/eduke32@6466 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-10-09 07:36:55 +00:00
hendricks266
ae81b6dce7 Menus: Factor out code into Menu_AboutToStartDisplaying and Menu_ChangingTo. 
git-svn-id: https://svn.eduke32.com/eduke32@6465 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-10-09 07:36:52 +00:00
hendricks266
e971005153 Menus: Use SMALLFNTCURSOR for a text caret in the absence of a SPINNINGNUKEICON tile. 
git-svn-id: https://svn.eduke32.com/eduke32@6464 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-10-09 07:36:48 +00:00
hendricks266
0ed359244e Menus: Factor out SPINNINGNUKEICON drawing 
git-svn-id: https://svn.eduke32.com/eduke32@6463 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-10-09 07:36:45 +00:00
hendricks266
5967749a10 Menus: Don't play EXITMENUSOUND when trying to close a root menu outside of an active game. 
git-svn-id: https://svn.eduke32.com/eduke32@6459 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-09-27 05:22:35 +00:00
hendricks266
01c073f18a Update credits. 
git-svn-id: https://svn.eduke32.com/eduke32@6446 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-09-23 03:17:26 +00:00
terminx
389c71e185 uint64_t based FPS limiter 
git-svn-id: https://svn.eduke32.com/eduke32@6441 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-09-19 19:10:39 +00:00
terminx
72f7a6983a Remove user map menu from EDUKE32_SIMPLE_MENU builds. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@6415 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-08-04 23:06:37 +00:00
hendricks266
c3fcd92db3 Menus: Fix RangeInt32. 
git-svn-id: https://svn.eduke32.com/eduke32@6412 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-08-01 09:48:52 +00:00
terminx
a1d17f3a49 Continuation of r6409 
git-svn-id: https://svn.eduke32.com/eduke32@6411 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-31 03:14:51 +00:00
hendricks266
2a75137f79 Fix two warnings. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@6410 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-31 01:53:16 +00:00
terminx
fe05c5dcc1 Unimportant menu changes to kick off synthesis 
git-svn-id: https://svn.eduke32.com/eduke32@6409 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-31 01:34:54 +00:00
hendricks266
3e8c80a3d3 Fix a warning. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@6406 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-30 04:27:44 +00:00
hendricks266
d414d15b52 Menus: Disable compilation of all code pertaining to MenuRangeDouble_t, since we're not using any. 
git-svn-id: https://svn.eduke32.com/eduke32@6403 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-29 20:39:57 +00:00
hendricks266
88d5da2859 Menus: Clean up MenuRanges. 
git-svn-id: https://svn.eduke32.com/eduke32@6402 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-29 20:39:53 +00:00
hendricks266
9eaf935757 Connect minitext_ to MF_Minifont. 
git-svn-id: https://svn.eduke32.com/eduke32@6390 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-28 08:27:24 +00:00
terminx
652a56e3d3 Derp. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@6389 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-27 20:05:48 +00:00
terminx
9b9b6baecd Set default number of voices to 256, remove voices option from menu when compiled with SIMPLE_MENU=1 
git-svn-id: https://svn.eduke32.com/eduke32@6380 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-27 09:13:09 +00:00
hendricks266
715d2ec25a Menu stuff 
git-svn-id: https://svn.eduke32.com/eduke32@6377 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-22 04:00:26 +00:00
terminx
dad337add8 Fix gcc 7.1.0 warnings 
git-svn-id: https://svn.eduke32.com/eduke32@6370 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-18 20:53:41 +00:00
hendricks266
b702ebb085 Menus: Draw most text using YCenter and YOffsetZero modes to facilitate certain kinds of visual cues. 
git-svn-id: https://svn.eduke32.com/eduke32@6354 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-10 13:44:07 +00:00
hendricks266
ebe2e67439 Fix a bug with undefinegamefunc breaking the key configuration menu. 
git-svn-id: https://svn.eduke32.com/eduke32@6350 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-10 13:43:54 +00:00
terminx
15b2186696 Internal menu tweaks 
git-svn-id: https://svn.eduke32.com/eduke32@6335 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-07 22:50:42 +00:00
hendricks266
4f1343adfc Menus: Use screentext's newline support for more mgametext. 
git-svn-id: https://svn.eduke32.com/eduke32@6330 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-06 14:43:11 +00:00
hendricks266
3e7f9ad276 Menu stuff 
git-svn-id: https://svn.eduke32.com/eduke32@6329 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-06 14:43:07 +00:00
terminx
6af5f3b478 "Keyboard Keys" -> "Key Configuration" 
git-svn-id: https://svn.eduke32.com/eduke32@6324 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-05 05:42:29 +00:00
hendricks266
d372800b3c Menus: Wrap Menu_Find in Menu_FindFiltered to factor out id filtering for all cases that need it. 
git-svn-id: https://svn.eduke32.com/eduke32@6315 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-05 05:37:46 +00:00
hendricks266
d032721aa1 Menus: Improve handling of the color correction screen. 
git-svn-id: https://svn.eduke32.com/eduke32@6314 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-07-05 05:37:43 +00:00
hendricks266
4b15e4629e Menu stuff 
git-svn-id: https://svn.eduke32.com/eduke32@6289 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-27 01:50:55 +00:00
hendricks266
6487dc0db6 Fix standalone warnings. 
git-svn-id: https://svn.eduke32.com/eduke32@6288 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-27 01:50:48 +00:00
terminx
504b04067b Remove some Duke-specific screen displays from standalone builds 
git-svn-id: https://svn.eduke32.com/eduke32@6271 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-24 21:18:06 +00:00
hendricks266
adf62d216c scale(1<<##, b, c) --> divscale##(b, c) 
git-svn-id: https://svn.eduke32.com/eduke32@6256 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-24 09:20:42 +00:00
hendricks266
bd9abf33ad scale(a, b, 1<<##) --> mulscale##(a, b) 
git-svn-id: https://svn.eduke32.com/eduke32@6255 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-24 09:20:37 +00:00
hendricks266
4f5ea33917 Make internal gametext calls use MF_Bluefont fields in the menus and a newly introduced MF_BluefontGame elsewhere. 
git-svn-id: https://svn.eduke32.com/eduke32@6212 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-20 09:28:54 +00:00
hendricks266
cb8dc04660 Make menutext use MF_Redfont fields. 
git-svn-id: https://svn.eduke32.com/eduke32@6209 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:07:23 +00:00
hendricks266
334007d6c3 Optimize all menutext calls. 
git-svn-id: https://svn.eduke32.com/eduke32@6208 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:07:18 +00:00
hendricks266
7f6b26d362 Eliminate the RedfontGreen type and replace it with indentations (like "Apply Changes"). 
git-svn-id: https://svn.eduke32.com/eduke32@6207 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:07:12 +00:00
hendricks266
02256c51dd Eliminate the RedfontBlue type and replace it with the Disabled or LookDisabled flags. 
git-svn-id: https://svn.eduke32.com/eduke32@6206 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:07:09 +00:00
hendricks266
ecc60dec44 Add a new MenuEntryFlag to make an option appear disabled but still work. 
git-svn-id: https://svn.eduke32.com/eduke32@6205 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:07:05 +00:00
hendricks266
2e12d10cc6 Namespace all MenuEntryFlags_t. 
git-svn-id: https://svn.eduke32.com/eduke32@6204 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:07:01 +00:00
hendricks266
2afdaf5faf Move cursorPosition and cursorScale from MenuEntryFormat_t to MenuFont_t. 
git-svn-id: https://svn.eduke32.com/eduke32@6203 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:06:57 +00:00
hendricks266
da4081c2b6 Fix some indentation of the menu system. 
git-svn-id: https://svn.eduke32.com/eduke32@6201 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:06:48 +00:00
hendricks266
9abe8f7958 Factor some menu code. 
git-svn-id: https://svn.eduke32.com/eduke32@6200 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:06:45 +00:00
hendricks266
57b5a47b9d Scale menu spacers by font zoom. 
git-svn-id: https://svn.eduke32.com/eduke32@6199 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:06:41 +00:00
hendricks266
d85cbcc8cf Attach fonts to spacer menu entries. 
git-svn-id: https://svn.eduke32.com/eduke32@6198 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:06:37 +00:00
hendricks266
6221b0e74d Apply MenuFont_t.zoom to margins and indentations. 
git-svn-id: https://svn.eduke32.com/eduke32@6197 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:06:33 +00:00
hendricks266
72b7e30b19 Add zoom field to MenuFont_t. 
git-svn-id: https://svn.eduke32.com/eduke32@6196 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:06:29 +00:00
hendricks266
f2b7650305 Shrink the MenuFont_t struct. 
git-svn-id: https://svn.eduke32.com/eduke32@6195 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:06:25 +00:00
hendricks266
8e73029ecc Touch up some menu options. 
git-svn-id: https://svn.eduke32.com/eduke32@6194 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:06:21 +00:00
hendricks266
283c5c0644 Center the episode menu vertically like the skill menu. 
git-svn-id: https://svn.eduke32.com/eduke32@6193 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-19 23:06:17 +00:00
hendricks266
8deddc19b0 Clean up warnings in standalone mode. 
git-svn-id: https://svn.eduke32.com/eduke32@6190 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-17 11:42:20 +00:00
hendricks266
b0d9e94004 Remove an old hack from my menu system that upon closer inspection is no longer needed. 
git-svn-id: https://svn.eduke32.com/eduke32@6186 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-17 11:42:04 +00:00
hendricks266
a10893d75f Change the way gamefuncs are handled to support and ignore entries named as the empty string. 
git-svn-id: https://svn.eduke32.com/eduke32@6185 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-17 11:41:59 +00:00
hendricks266
6d11c01fd7 Don't store redundant copies of default gamefunc names, since the indices are all that matter. 
git-svn-id: https://svn.eduke32.com/eduke32@6184 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-06-17 11:41:54 +00:00
hendricks266
62a921c409 Remove the implicit "static" from our FORCE_INLINE macro. 
This will be important for C++ member functions.

git-svn-id: https://svn.eduke32.com/eduke32@6076 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-02-25 08:15:53 +00:00
hendricks266
aa04307ad1 Route all inclusion of libc headers and most of POSIX headers through compat.h. 
git-svn-id: https://svn.eduke32.com/eduke32@6074 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-02-25 08:15:36 +00:00
hendricks266
d43fb548cf Abolish all " ={ " when assigning a struct. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@6061 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-02-05 20:58:33 +00:00
hendricks266
417b047cf3 Bring the previous commit into effect. 
git-svn-id: https://svn.eduke32.com/eduke32@6056 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-02-01 10:20:54 +00:00
hendricks266
1cc9d13ccf The great repository rearrangement of 2017. 
Files moved but not modified. Changes to follow in a subsequent commit.

You down with CPP?

git-svn-id: https://svn.eduke32.com/eduke32@6055 1a8010ca-5511-0410-912e-c29ae57300e0
 2017-02-01 10:01:11 +00:00
Renamed from polymer/eduke32/source/menus.c (Browse further)