zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-08 14:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity
4951 commits 2 branches 1 tag 128 MiB
Commit graph

432 commits

Author SHA1 Message Date
helixhorned
a0a4006d85 menus.c: fix C build. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4951 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-02-04 21:32:53 +00:00
hendricks266
3018dee77c Menus: Mouse, touch, and pointer controls now take the origin into account. 
git-svn-id: https://svn.eduke32.com/eduke32@4946 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-25 12:17:10 +00:00
hendricks266
93a3ff34e8 Add events EVENT_DISPLAYINACTIVEMENU and EVENT_DISPLAYINACTIVEMENUREST and userdef members m_origin_x and m_origin_y. 
This allows for CON screen display code to use menu animations. The following is an example of how to adapt screen features that should animate.

before:

onevent EVENT_DISPLAYMENUREST
    ifvare current_menu 0 // main menu
    {
        setvar x 1
        setvar y 1
        rotatesprite x y zoom ang tilenum shade pal orientation 0 0 xdim ydim
    }
endevent

after:

state DisplayMenuCommon
    ifvare RETURN 0 // main menu
    {
        getuserdef[THISACTOR].m_origin_x x
        getuserdef[THISACTOR].m_origin_y y
        addvar x 65536
        addvar y 65536
        rotatesprite16 x y zoom ang tilenum shade pal orientation 0 0 xdim ydim
    }
ends

onevent EVENT_DISPLAYMENUREST state DisplayMenuCommon endevent
onevent EVENT_DISPLAYINACTIVEMENUREST state DisplayMenuCommon endevent

git-svn-id: https://svn.eduke32.com/eduke32@4945 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-25 12:16:58 +00:00
hendricks266
7fb76291ee Make my menu animation code a little bit more modular. 
git-svn-id: https://svn.eduke32.com/eduke32@4944 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-25 12:16:34 +00:00
hendricks266
6048f9d766 Simplify the macros used for distinguishing between OS X and iOS. 
git-svn-id: https://svn.eduke32.com/eduke32@4942 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-25 12:16:10 +00:00
hendricks266
3c8b06c688 Fix "textsize.x may be used uninitialized". 
git-svn-id: https://svn.eduke32.com/eduke32@4940 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-25 12:15:37 +00:00
hendricks266
86e7a97ef7 Fix a crash exposed by animating the menu back button. 
git-svn-id: https://svn.eduke32.com/eduke32@4927 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-17 00:27:46 +00:00
terminx
4c883f81b6 MSVC build fix... guess it was upset about the macro expansion 
git-svn-id: https://svn.eduke32.com/eduke32@4921 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-15 06:45:24 +00:00
terminx
cdaa25ef07 Implement better fade-out for quotes and for the mouse cursor in the menu. 
git-svn-id: https://svn.eduke32.com/eduke32@4919 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-15 06:45:14 +00:00
hendricks266
2d161b1bf7 Menus: Implement better back button. 
git-svn-id: https://svn.eduke32.com/eduke32@4918 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-13 12:57:29 +00:00
hendricks266
c42faee32e Menus: Make black background boxes translucent again. 
git-svn-id: https://svn.eduke32.com/eduke32@4917 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-13 12:57:11 +00:00
hendricks266
c1c672032b Menus: Add proper edging for the tops and bottoms of scrolling lists. 
git-svn-id: https://svn.eduke32.com/eduke32@4916 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-13 12:56:54 +00:00
hendricks266
49ba033faa Convert some multi-line UI messages to single G_ScreenText calls with line breaks. 
git-svn-id: https://svn.eduke32.com/eduke32@4914 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-13 12:56:19 +00:00
hendricks266
1f3ce84585 Menus: Disable the spinning nuke icon back button on Android. 
git-svn-id: https://svn.eduke32.com/eduke32@4885 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-01-08 15:14:18 +00:00
hendricks266
d73c7f1afe Menus: Amend r4862 so that touch devices, which do not display the crosshair as a cursor, are not completely prevented from using touch input by the lack of a crosshair tile. 
git-svn-id: https://svn.eduke32.com/eduke32@4870 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-28 21:36:09 +00:00
hendricks266
fcbd0737bb Menus: Fix the Screen Size slider so that it works properly after the screen size has been modified in-game with [-]/[+]. 
git-svn-id: https://svn.eduke32.com/eduke32@4869 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-28 21:35:56 +00:00
hendricks266
aa9f767052 Menus: Fix selecting "None" for Anisotropy. 
git-svn-id: https://svn.eduke32.com/eduke32@4868 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-28 21:35:44 +00:00
hendricks266
3bc47565a3 Menus: Fix opening a MenuEntryOptionList when the option's value is "Custom". 
git-svn-id: https://svn.eduke32.com/eduke32@4867 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-28 21:35:32 +00:00
hendricks266
6797e8a3d5 Menus: Convert MenuRange*_t's "displaytype" field to "flags", add a flag to enforce clamping to the defined intervals, and apply this flag to the Screen Size slider. 
git-svn-id: https://svn.eduke32.com/eduke32@4866 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-28 21:35:20 +00:00
hendricks266
a74317a104 Menus: When pressing left or right on a slider that has moved by the mouse to a position between the defined intervals, do not round to the nearest interval and then increment or decrement. Instead, check if rounding will satisfy the movement before moving further. 
git-svn-id: https://svn.eduke32.com/eduke32@4865 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-28 21:35:07 +00:00
hendricks266
571a44cd8d Menus: Mouse controls now respect MenuEntry_t's disabled flag. 
git-svn-id: https://svn.eduke32.com/eduke32@4864 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-28 21:34:54 +00:00
helixhorned
7033205fcf Menus: disable mouse pointer if CROSSHAIR is void. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4862 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-28 19:48:20 +00:00
hendricks266
4bc4735480 If you save over an autonamed savegame and change the name, don't overwrite your edit with another autofill. 
git-svn-id: https://svn.eduke32.com/eduke32@4858 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-27 20:39:30 +00:00
hendricks266
8a68f2d5a9 Menus: Enumify the "status" parameter of M_MenuText into MenuTextFlags_t. 
git-svn-id: https://svn.eduke32.com/eduke32@4857 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-27 18:37:39 +00:00
hendricks266
7a1e94440a Menus: Implement mouse/touch/pointer controls for all widgets. 
git-svn-id: https://svn.eduke32.com/eduke32@4856 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-27 18:37:27 +00:00
hendricks266
6ac1850482 Menus: Replace the "disabled" member of MenuEntry_t with "flags" so that the other 31 bits can be utilized. 
git-svn-id: https://svn.eduke32.com/eduke32@4855 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-27 18:37:12 +00:00
hendricks266
4f9831d45c Menus: Disable normal left-click/touch menu functionality when the mouse is active. 
git-svn-id: https://svn.eduke32.com/eduke32@4854 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-27 18:36:58 +00:00
hendricks266
598e33319c Add the necessary plumbing to sdlayer to detect mousedown, mouseup, and dragging. 
git-svn-id: https://svn.eduke32.com/eduke32@4853 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-27 18:36:43 +00:00
hendricks266
bfb3614b92 Introduce preprocessor token EDUKE32_TOUCH_DEVICES that covers both Android and iOS, and replace selected instances of __ANDROID__ with it. 
git-svn-id: https://svn.eduke32.com/eduke32@4852 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-27 18:36:14 +00:00
hendricks266
b010dfd2ee Menus: Add scrollbars to the FileSelect menu type. 
git-svn-id: https://svn.eduke32.com/eduke32@4851 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-27 18:35:48 +00:00
hendricks266
1c3043bf50 Tabs to spaces in menus.c. 
git-svn-id: https://svn.eduke32.com/eduke32@4850 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-27 18:35:34 +00:00
hendricks266
399c062326 Refactor menus in preparation for touch functionality. 
git-svn-id: https://svn.eduke32.com/eduke32@4849 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-27 18:35:21 +00:00
helixhorned
584ed7982a Convert voxels to models only when starting or changing to Polymost. 
Analogously to the way models are processed in a deferred manner for Polymer.

git-svn-id: https://svn.eduke32.com/eduke32@4836 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-26 17:29:53 +00:00
helixhorned
3a741de9fe menus.c: Reset next-viewscreen-redraw counter from M_CloseMenu(). 
git-svn-id: https://svn.eduke32.com/eduke32@4832 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-21 15:51:50 +00:00
hendricks266
ac4bbaf0f1 Wii: Display all hat directions in the joystick buttons menu instead of just up. 
git-svn-id: https://svn.eduke32.com/eduke32@4828 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-18 18:16:29 +00:00
hendricks266
eca33954db Fix the MAXJOYBUTTONS discrepancy between _control.h and gamedefs.h. 
git-svn-id: https://svn.eduke32.com/eduke32@4826 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-18 18:15:51 +00:00
hendricks266
dbcca52303 Polish up the video menu a bit. 
git-svn-id: https://svn.eduke32.com/eduke32@4823 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-18 18:14:45 +00:00
hendricks266
933ffc92ce Fix "bright red" player color. 
git-svn-id: https://svn.eduke32.com/eduke32@4822 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-18 18:14:27 +00:00
hendricks266
8ec58a208d Wii: Tweaks. 
*Move the FPS display down from the top of the screen, as we do for quotes.
*Don't show a non-functional mouse cursor in the center of the screen.
*Don't display the "Startup window" option in Game Settings.
*Display the IR pointer crosshair in addition to the aiming crosshair, not instead of it.
*Eliminate some assumptions from wiibuild.bat.
*DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4818 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-17 13:00:54 +00:00
hendricks266
9a7bf9e72e Remove the blackout when starting a new game on episode 4. 
git-svn-id: https://svn.eduke32.com/eduke32@4788 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-02 06:15:33 +00:00
hendricks266
44844bb4cc Fix USE_OPENGL=0 build error in r4779. 
git-svn-id: https://svn.eduke32.com/eduke32@4787 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-12-02 06:15:19 +00:00
hendricks266
20e18ef41d Open the load and save menus with the last used slot highlighted. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4782 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-11-30 04:59:34 +00:00
hendricks266
19396e39e6 Fix names of savegames. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4781 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-11-30 04:56:09 +00:00
hendricks266
f8d4b6c9ef Fix displaying a savegame preview shot when in OpenGL and/or when the selected slot is empty. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4780 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-11-30 04:23:22 +00:00
hendricks266
050f2b36f4 Re-allow the player color option to take effect. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4779 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-11-30 03:37:56 +00:00
hendricks266
4f1f23c566 Menu structure revision. Structs reordered to eliminate slop. MenuGroup_t eliminated. MenuPos_t split into MenuMenuFormat_t and MenuEntryFormat_t. DROIDMENU build fixed. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4778 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-11-30 02:04:36 +00:00
hendricks266
60a91c6c79 Fix oversight in mouse cursor code. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4760 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-11-24 06:03:58 +00:00
terminx
1bbb077fca Add missing "break" to M_RunMenuInput(), revert android gltexapplyprops() menu fuckery. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4751 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-11-22 12:34:11 +00:00
terminx
bf3c0de73a Mainly misc cleanups (and a fix for the C++ build), but there are a few important changes in here. 
VM_OnEvent() has become VM_OnEvent(), VM_OnEventWithReturn(), VM_OnEventWithDist(), and VM_OnEventWithBoth() (the latter of which is only ever used once...). Of course, this required every call to VM_OnEvent() be changed.

memberlabel_t and vmstate_t have been changed to use the regular "int" type versus explicitly specifying int32_t as they did previously. The rationale for this change is simply that it looks cleaner, and I think we should move toward just using "int" in most cases where there's no particular reason to specify an explicit data type.

Also changes CON_KILLIT to just "return" instead of "continue". DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4745 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-11-22 12:29:25 +00:00
hendricks266
a0e4692d59 Fix minor menu bugs. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4739 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-11-17 08:14:33 +00:00