fc843c28ba
Merge branch 'maint'
2013-09-18 22:06:31 -05:00
75535fba72
Do not enter testing mode if a valid mode is not selected.
...
- It doesn't make much sense to "test" the current mode if a non-video
mode is selected in the menu, so don't.
2013-09-18 21:32:46 -05:00
e3741c8097
GetSelectedSize() needs to check for a valid selection.
...
- With mouse navigation, there's no guarantee that there even is a
selected item.
2013-09-18 21:29:19 -05:00
3e4678765b
Merge branch 'master' into scripting
...
Conflicts:
src/actor.h
src/thingdef/thingdef_codeptr.cpp
2013-08-18 12:18:59 +02:00
62830f7927
- added separate automap color for non-counting monsters.
...
- fixed: using a nonexistent CVAR in a ColorPicker menu item caused a crash.
2013-08-14 00:32:05 +02:00
c8b4fb0d3d
- added a 'closemenu' CCMD so that menu options that close the menu can be added.
2013-08-13 21:09:46 +02:00
3518b4dd28
- allow menu's back button and the pause sign to be animated.
2013-08-12 22:46:45 +02:00
bba092cc0b
Merge branch 'master' into scripting
...
Conflicts:
src/d_player.h
src/g_doom/a_archvile.cpp
src/thingdef/thingdef.h
src/thingdef/thingdef_properties.cpp
2013-08-09 13:03:28 +02:00
4ce0574b3f
- Use a more conformant C++ preprocessor macro identifier for Unix systems.
...
The 'unix' identifier isn't defined when '-std' is passed to the compiler (tested with gcc and clang), so use '__unix__' which is well enough documented.
2013-07-30 11:46:14 +02:00
eb5d57be06
- Fixed: crash when closing ZDoom in the save menu and a memory leak.
2013-07-29 18:35:19 -04:00
9c86f1c220
Merge branch 'master' into scripting for plugged userinfo memory leak
...
Conflicts:
src/d_player.h
src/p_interaction.cpp
src/thingdef/thingdef_codeptr.cpp
2013-07-23 21:01:13 -05:00
10dd75f902
- externalized "New save game" line for save screen.
2013-07-14 09:31:49 +02:00
459ad5abff
- Updated scripting branch to latest version in trunk.
...
SVN r4337 (scripting)
2013-06-07 03:31:30 +00:00
890dc71e0d
. added AFADoomer's patch to set a text highlight color for the list menu.
...
SVN r4301 (trunk)
2013-05-31 22:10:12 +00:00
787b84ef91
- Added CVARINFO lump support. This is a lump for defining mod-specific cvars and takes entries
...
of the form:
<scope> [noarchive] <type> <name> [= <defaultvalue>];
Where <scope> is one of:
* server: This cvar is shared by all players, and in network games, only select players can
change it.
* user: Each player has their own copy of this cvar, which they can change independently.
To prevent the cvar from being written to the config file, add noarchive to its definition.
<Type> is one of:
* int: An integral value. Defaults to 0.
* float: A value that can include a fraction. Defaults to 0.0.
* color: A color value. Default to black ("00 00 00").
* bool: A boolean value that can hold either true or false. Defaults to false.
* string: A string value. It's not too useful for mods but is included for completeness. Defaults to "".
<Name> is the cvar's name and must begin with a letter and may only include alphanumeric
characters and the underscore character.
If you wish a non-standard default add an = character after the cvar's name followed by the
default value you want to use. Example:
server int mymod_coolness = 10;
- Fixed: FStringCVar::SetGenericRepDefault() did not make a copy of the input string.
SVN r4280 (trunk)
2013-05-25 16:34:23 +00:00
2668988870
- Switched to a genericly extensible representation for userinfo.
...
- Fixed: The playerinfo CCMD did not range check the player number.
SVN r4253 (trunk)
2013-05-12 18:27:03 +00:00
be0845acf1
- Moved all BorderNeedRefresh and SB_state updating code into separate functions that won't crash if screen is NULL.
...
SVN r4167 (trunk)
2013-02-27 03:10:25 +00:00
602209d4a4
- Add NoRandomPlayerclass flag for MAPINFO.
...
SVN r4147 (trunk)
2013-02-19 02:50:47 +00:00
c4a4b9821d
- Fixed: The menu treated netdemos as actual netgames.
...
SVN r4052 (trunk)
2013-01-26 03:41:06 +00:00
5b97bf47de
- Fixed: The string displayed when attempting to start a new game during a netgame is "NEWGAME", not "NETGAME".
...
SVN r4051 (trunk)
2013-01-26 03:39:43 +00:00
22e52776e3
- In UpdateJoystickConfigMenu(), do not access joy before checking if it's NULL.
...
SVN r4019 (trunk)
2013-01-03 03:12:07 +00:00
424fcb4cba
- Initialize sprframe to NULL in FListMenuItemPlayerDisplay::Drawer().
...
SVN r4018 (trunk)
2013-01-03 03:08:45 +00:00
38d7b7d203
- Fixed errors and warnings when compiling with GCC. (Unfortunately, the VC++ debug builds
...
become ungodly slow when using mods with complex DECORATE. The GCC debug builds run just
fine, however. Hopefully this is something that can be fixed later with an assembly-optimized
version of the main VM loop, because I don't relish the thought of being stuck with GDB
for debugging.)
- Fixed: The ACS_Named* action specials were erroneously defined as taking strings instead of
names.
- Fixed: Copy-paste error caused FxMultiNameState::Emit to generate code that called
DecoNameToClass instead of DecoFindMultiNameState.
- Updated FxActionSpecialCall::Emit for named script specials.
- Fixed inverted asserts for FxMinusSign::Emit and FxUnaryNotBitwise::Emit.
SVN r3893 (scripting)
2012-10-18 03:19:27 +00:00
e7efa1d802
- Update to latest version in trunk.
...
SVN r3890 (scripting)
2012-10-17 04:24:54 +00:00
12e1901150
- Fixed: FListMenuItemPlayerDisplay::Drawer() used the sprite's scale but not the texture's scale.
...
SVN r3880 (trunk)
2012-10-05 03:48:51 +00:00
718d3f8d43
- Changed vid_tft's default to true. How many people still run 1280x1024 on a CRT these days?
...
- Fixed: M_InitVideoModesMenu() needs to call vid_tft's callback.
SVN r3816 (trunk)
2012-08-10 02:56:09 +00:00
56aeb85eee
- Fixed: menu_endgame showed no text during a netgame, nor did it block you from ending a netgame.
...
SVN r3791 (trunk)
2012-07-27 02:35:00 +00:00
10f1281977
- Remove LabelOffset from menus entirely and just compute things so that the console font and
...
small font, when mixed on the same line, align at their baselines.
SVN r3786 (trunk)
2012-07-26 05:27:37 +00:00
2b0cc30f7c
- Fixed: The label offset has no business being involved in the positioning of the options menu cursor. Also put the cursor towards the bottom of tall small fonts.
...
SVN r3785 (trunk)
2012-07-26 04:47:29 +00:00
d85604da19
- Update scripting branch to latest version of trunk.
...
SVN r3767 (scripting)
2012-07-17 02:53:53 +00:00
fcd4854714
- Fixed: FListMenuItemPlayerDisplay could crash at various points if a class does not have a See state.
...
SVN r3764 (trunk)
2012-07-15 03:33:28 +00:00
562cf04db2
- Update scripting branch to trunk.
...
SVN r3758 (scripting)
2012-07-14 03:04:41 +00:00
18839acddb
- added a check to the MENUDEF parser to prevent special menus from being replaced by something non-functional to counter attempts to cripple the engine's functionality.
...
SVN r3682 (trunk)
2012-06-09 11:05:25 +00:00
36d348dba6
- Don't record pointers to OptionValues outside of the OptionValues table, so that they can be redefined.
...
SVN r3675 (trunk)
2012-06-02 03:12:14 +00:00
171066388f
- last commit was broken. :(
...
SVN r3672 (trunk)
2012-05-31 08:51:40 +00:00
e28ecdda50
- fixed: Option value sets for the menu may not be redefined. An attempt to do so must produce a fatal error.
...
SVN r3671 (trunk)
2012-05-31 08:47:55 +00:00
71e02e2d9e
- Fixed: When the player setup menu cycles the random players, it needs to rebuild the translation for each one.
...
SVN r3657 (trunk)
2012-05-15 22:52:24 +00:00
6ea93d28e2
- Fixed: M_CreateMenus() is too soon to call UpdateJoystickMenu(). It needs to happen after
...
I_InitInput(), which happens during V_Init2().
SVN r3501 (trunk)
2012-04-01 03:03:53 +00:00
23e88c88c9
- Add 17:10 aspect ratio, for 1024x600 screens.
...
SVN r3482 (trunk)
2012-03-25 02:57:28 +00:00
4d64085c8a
- Fixed: The PlayerDisplay menu item ignored the FlipX property of the sprite frames.
...
SVN r3431 (trunk)
2012-03-12 01:41:19 +00:00
ddd5fe7535
- Fixed: If an episode skips the skill menu, it should also skip the confirm skill menu
...
if the default skill requests confirmation.
SVN r3347 (trunk)
2012-01-24 03:25:06 +00:00
9d67dc36e8
- Fixed: Episodes with NoSkillMenu defined had their own idea of default skill that differed
...
from episodes with skill menus (and completely ignored whichever skill is explicitly defined
as the default skill).
SVN r3346 (trunk)
2012-01-24 03:16:24 +00:00
4816b3182b
- Add compat_badangles to the menu.
...
SVN r3309 (trunk)
2011-11-02 02:44:01 +00:00
eafb9da2c1
- Backported GZDoom r1246:
...
* Fixed possible crash when texture for menu item patch cannot be loaded. (From Alexey's Mac OS X port.)
* Fixed iwadinfo.txt definitions of Hexen and Freedoom demos (also from Alexey's port.)
* Added missing LOF_NOJUMP definition.
SVN r3284 (trunk)
2011-08-23 02:39:20 +00:00
edfc16906a
- Disable the save game menu when not in a level.
...
SVN r3283 (trunk)
2011-08-19 07:56:43 +00:00
f84368677a
- updated OpenAL branch.
...
SVN r3269 (openal)
2011-07-08 22:00:23 +00:00
463c276014
- removed more r_ header dependencies from the rest of the code.
...
SVN r3260 (trunk)
2011-07-06 15:31:05 +00:00
fbff5ca932
- moved r_interpolate.cpp and r_translate.cpp to r_data.
...
- merged r_jpeg.h into jpegtexture.cpp because that's the only place where it's ever used.
SVN r3255 (trunk)
2011-07-06 08:50:15 +00:00
dc1f5f0220
- Add more information when trying to load old savegames.
...
- When loading a game from the menu, do not hide the fullscreen console until we know we can
load the save. Otherwise, the gamestate goes invalid if the save is no good.
SVN r3187 (trunk)
2011-04-17 17:27:31 +00:00
16878f6bb4
- fixed compile warnings in savegame menu code.
...
- fixed: plane specific lighting values were no longer used when generating the visplanes.
SVN r3133 (trunk)
2011-02-05 09:17:33 +00:00
82bac3ad22
- fixed: Actions in the saee menu need to do full range checks for the number of currently selected item.
...
SVN r3126 (trunk)
2011-01-30 11:20:08 +00:00
7ed7e9f755
- Enable menu mouse navigation on SDL systems.
...
SVN r3112 (trunk)
2011-01-22 03:02:58 +00:00
5e5ddd8cc8
- fixed: The help screens were stretched on 16:9 displays
...
- fixed: The bunny scroller did not advance its animation to the end when aborted.
SVN r3102 (trunk)
2011-01-14 09:22:09 +00:00
f35b3b84af
- fixed: The player setup menu set the playerlass CVAR to the actual class name, not the display name as expected.
...
SVN r3078 (trunk)
2010-12-26 09:01:36 +00:00
b42952b85c
- added a 'restart' CCMD that allows restarting the engine with different WADs being loaded without quitting first
...
SVN r3042 (trunk)
2010-12-15 11:45:39 +00:00
770a879f6a
- fixed: The TouchedActors array in the Dehacked parser was not freed after parsing was done.
...
- Initialize the alt HUD explicitly in D_DoomMain.
- don't let S_UnloadReverbDef leave a broken list of sound environments behind.
- Added more code to explicitly delete data before initializing it.
SVN r3039 (trunk)
2010-12-15 00:09:31 +00:00
f0f17e531c
- move static AM color initialization into the AM_StaticInit function.
...
- move D_LoadWadSettings to keysections.cpp.
- made some more data reloadable.
- data structures filled by P_SetupLevel should be cleared before loading the level. They can remain non-empty in case of an error. There's probably more to fix here...
- fixed: MidiDevices and MusicAliases were not cleared before reloading local SNDINFOs.
- fixed signed/unsigned warnings in AddSwitchPair for real (GCC really allows -1u? MSVC prints a warning for that.)
SVN r3036 (trunk)
2010-12-14 00:50:02 +00:00
5bc4bc90bb
- fixed: A new episode definition for a map that already had one defined did not replace the old definition.
...
- fixed: Skipping the skill menu did not work because it checked the number of episodes, not skills.
SVN r3017 (trunk)
2010-12-02 13:57:05 +00:00
c02339501c
- fixed: The message for trying to quickload in netgames used the wrong display mode for the message menu.
...
SVN r2977 (trunk)
2010-11-03 23:33:57 +00:00
0604d308d5
- Fixed: Pressing left or right on a video mode option line should play "menu/cursor", not "menu/change".
...
SVN r2974 (trunk)
2010-11-03 02:33:22 +00:00
1287c9419a
- Fixed: Controller buttons were still translated to menu buttons when the controls menu was
...
waiting for a button press, making it impossible to bind buttons that have special meaning to
the menu from the menu.
SVN r2967 (trunk)
2010-10-24 17:46:48 +00:00
fe0c7bc7f9
- Let FPlayerNameBox::DrawBorder decide what graphics to use based on actual presence in the WADs, not the gamemode.
...
SVN r2953 (trunk)
2010-10-17 08:29:21 +00:00
eded2ef345
- Each IWAD can now define its own config section. Hacx, Harmony and Action Doom2 now do that.
...
- moved IWAD identification data into a lump in zdoom.pk3.
- rewrote IWAD checking code
SVN r2943 (trunk)
2010-10-15 15:13:53 +00:00
7e362819e4
- made the different cursor characters for Raven's and the other small fonts a property of the font instead deciding based on the game.
...
SVN r2935 (trunk)
2010-10-12 08:43:15 +00:00
352a926ddf
- made all references to the GameNames array an inline function call to allow easier modification later
...
- changed all parsers that check for the current game to use the same function for the game check.
- fixed: The TEAMINFO parser handled 'game Any' incorrectly.
SVN r2934 (trunk)
2010-10-12 07:14:31 +00:00
dd17c35d89
- removed gamemode check for shareware message. It also uses LANGUAGE conditionals now.
...
SVN r2931 (trunk)
2010-10-11 22:10:15 +00:00
2eac96143e
- added conditionals to LANGUAGE parser so that the special messages for Chex Quest can be handled in the definition lumps instead of the code.
...
SVN r2930 (trunk)
2010-10-11 19:16:09 +00:00
d9970ab9b6
- merged finale branch back into trunk.
...
SVN r2911 (trunk)
2010-10-06 10:44:03 +00:00
024bbeb171
- changed 'load game' menu so that it preselects the last used savegame, either for loading or saving.
...
SVN r2867 (trunk)
2010-09-29 22:24:55 +00:00
64784b2dc8
- fixed: DOptionMenu::FirstSelectable should not be called when the menu already has a valid selection.
...
SVN r2863 (trunk)
2010-09-29 00:54:14 +00:00
6014250f3a
- fixed: Option menus with no selectable items crashed.
...
SVN r2861 (trunk)
2010-09-28 16:28:44 +00:00
77709f1847
- fixed: The loadgame menu responder did not check for an empty list of savegames.
...
SVN r2857 (trunk)
2010-09-27 22:36:47 +00:00
cf9792ed53
- fixed: The order of items in the main menu was wrong. Doom is supposed to have 'Options' in second place. Many vanilla-compatible mods with special one-patch menus would not work correctly due to this. Fortunately the only mod I could find that relied on ZDoom's order was Action Doom 2, which as an IWAD can easily be handled by a simple configuration option.
...
- added 'else' blocks to MENUDEF parser.
SVN r2854 (trunk)
2010-09-26 06:53:40 +00:00
3f69b63873
- fixed: Backing out of a skill confirmation message screen caused that skill to be used for the next game if the menu wasn't fully closed first.
...
SVN r2851 (trunk)
2010-09-25 23:28:44 +00:00
917e93e633
- fixed: The check for savegames without picture was reversed.
...
- fixed: Savegames that were saved without picture did not display the 'No picture' message because the empty PNG container was still recognized as image.
SVN r2847 (trunk)
2010-09-23 06:14:30 +00:00
16fa8cc249
- Am I the only one who thinks that static_casts can create really clunky code? (Thanks, GCC, for your overly paranoid warning settings that necessitate such ugliness. :( )
...
SVN r2844 (trunk)
2010-09-22 06:52:48 +00:00
15d74dab56
- Fixed: GCC warnings.
...
SVN r2843 (trunk)
2010-09-21 20:35:40 +00:00
a3e98eb4ab
- added automatic centering of Hexen's skill menu so that it can adjust automatically to the different player classes.
...
SVN r2840 (trunk)
2010-09-21 12:58:59 +00:00
583cbd49a6
- try to encapsulate access to the player class's display name for printing purposes.
...
SVN r2839 (trunk)
2010-09-21 09:43:54 +00:00
e1de9f0633
- fixed: The newly accelerated mousewheel scrolling code did not check for the end of the list and could scroll one item too far. It also incremented VisBottom by 3 instead of 2.
...
- changed lock failsound lookup so that for each sound it tries to resolve it as a player sound before deciding if it is valid.
SVN r2830 (trunk)
2010-09-19 06:34:15 +00:00
c4c69df6dc
- Fixed: FOptionMenuItemJoyMap::SetSelection() did not convert from menu selection number to joyaxis number.
...
SVN r2829 (trunk)
2010-09-19 04:04:34 +00:00
503ae5a9ee
- Scroll two rows at a time with the mouse wheel in the options menu.
...
SVN r2828 (trunk)
2010-09-19 03:52:18 +00:00
3090ad7be6
- we don't need to include lists.h any longer.
...
SVN r2817 (trunk)
2010-09-17 22:57:04 +00:00
eeab5ba0e4
- reintegrate savegame menu changes back into trunk
...
SVN r2816 (trunk)
2010-09-17 22:48:55 +00:00
e385de010d
- fixed: FValueTextItem::MenuEvent must eat all MKEY_Enter events so that the menu doesn't try to activate the item which results in an attempt to create an invalid submenu.
...
SVN r2807 (trunk)
2010-09-17 10:11:39 +00:00
fa062aa141
- fixed: DPlayerMenu::ClassChanged needs to call PickPlayerClass before setting the playerclass CVAR.
...
SVN r2806 (trunk)
2010-09-17 08:19:02 +00:00
ae3c60454f
- fixed: M_Ticker should not run any code when the menu is off.
...
SVN r2805 (trunk)
2010-09-17 06:20:08 +00:00
35aa6e7847
- fixed: The player name input box did not 0-terminate the string when temporarily appending an underscore for the cursor display.
...
SVN r2804 (trunk)
2010-09-16 23:16:06 +00:00
6db772b4e5
- fixed the player class selection fix from r2798.
...
SVN r2800 (trunk)
2010-09-16 17:01:42 +00:00
4da5ce74ca
- fixed: The menu should not override the user's player class if there is no player class menu.
...
SVN r2798 (trunk)
2010-09-16 16:20:39 +00:00
ee87fdc58e
- some layout tweaks for the option menu system, in particular to shorten the sliders if the menu is too wide.
...
- allow specifying the fractional precision for the numbers behind the sliders.
- took all HUD related options out of the display options menu and created a seaparate one for them.
- added several more display and HUD options to the menu.
- created a new 'Miscellaneous options' menu for a few items that should be accessible but don't fit anywhere else.
SVN r2795 (trunk)
2010-09-16 10:59:40 +00:00
c948fd08f2
- fixed: GUI mouse events did not take letterboxing into account.
...
SVN r2788 (trunk)
2010-09-15 21:53:12 +00:00
5dfc57336e
- fixed: The class selection menu crashed when no item in the menu was selected.
...
SVN r2786 (trunk)
2010-09-15 20:11:32 +00:00
d64fcbd01e
- applied Chris's latest OpenAL patch.
...
SVN r2781 (openal)
2010-09-15 13:45:08 +00:00
d5f9b0874e
- fixed: Lines in the option menu that covered the same vertical space as the back button rendered the back button inoperable.
...
SVN r2779 (trunk)
2010-09-15 10:22:38 +00:00
087979d6cc
- fixed: skipping the skill menu locked up the menu sequence for starting a game.
...
SVN r2777 (trunk)
2010-09-14 22:00:02 +00:00
ecb34b8302
- relaxed conditions for shortening the sliders so that they remain at full size at 800x600.
...
SVN r2771 (trunk)
2010-09-14 19:08:21 +00:00
579502ab74
- merged menu branch back into trunk.
...
SVN r2768 (trunk)
2010-09-14 17:28:18 +00:00
Randy Heit
Christoph Oelckers
Edoardo Prezioso
Braden Obrzut