Commit graph

511 commits

Author SHA1 Message Date
SinnamonLat
66c62b38da Various fixes in charsel / charswitch menus 2022-04-13 00:53:27 +02:00
SinnamonLat
4f919f883d Bandaid fix for trigger mapping, not super consistent but it helps most of the time... 2022-04-12 16:38:40 +02:00
SinnamonLat
7132a1be10 Profiles: Followers support 2022-04-12 00:58:57 +02:00
toaster
ff5992e3c4 Rework the entire G_PlayerInputAnalog system.
* Previous control checking flow:
    * Current controller/keyboard (userbound controls).
    * If on a menu:
        * Current controller/keyboard (default controls).
        * All controllers not in use by a player (default controls).
* New control checking flow:
    * Current controller/keyboard (userbound controls).
    * If player 0 and just checked a controller, check keyboard (userbound controls).
    * If on a menu:
        * Check all controllers not in use by a player (userbound controls).
        * If keys are inaccessible/unbound and keybind is necessary to navigate menus, repeat eveyrhting with default controls.
* Instead of duplicated code, control the flow in a finer fashion.
* Now able to detect if gamepad inputs are possible to recieve (via checking deviceID), instead of assuming they are.
* If a keybind is set but inaccessible by the above metric, make it flash on the Profile Controls screen.
* Fix out-of-order key mappings for a given bind being invisible on the Profile Controls menu.
2022-04-01 20:51:37 +01:00
toaster
4cc587b5b2 * Make the scrolling text on the menu interpolate.
* Replace the shitty vidwait option with Sal's shiny new fpscap option.
* Update the item toggles menu for all the new items (and re-enable shitsfree for the new empty spots).
2022-03-29 21:08:36 +01:00
toaster
73dabaeab6 Merge branch 'master' into new-menus
# Conflicts:
#	src/d_clisrv.c
#	src/deh_soc.c
#	src/lua_baselib.c
#	src/m_cheat.c
#	src/m_menu.h
#	src/y_inter.c
2022-03-29 17:14:38 +01:00
SinnamonLat
2696effe7a Make message boxes separate overlays 2022-02-27 00:15:31 +01:00
SinnamonLat
f5bd0dc3e4 Make typing submenu into a struct 2022-02-26 17:15:45 +01:00
SinnamonLat
ed5005cb05 Add kickstartaccel on profile controls 2022-02-26 15:09:39 +01:00
SinnamonLat
5801d67706 Add profile # and player name on the card 2022-02-20 15:23:08 +01:00
SinnamonLat
94c18f535a Map 4 keys per button. Detect device when mapping 2022-02-20 09:40:36 +01:00
James R
27a97f03d9 Fix declaration after label 2022-02-19 19:34:25 -08:00
SinnamonLat
b9a494551e Don't display empty profiles on player setup 2022-02-19 21:49:08 +01:00
SinnamonLat
2b74b7188f profiles: they work(?) now 2022-02-19 18:57:17 +01:00
SinnamonLat
3aadf1bff0 Allow creating new profiles 2022-02-19 16:08:50 +01:00
SinnamonLat
ebc2156b7e Profiles: control setup (wip but does what it needs to for now) 2022-02-19 13:26:02 +01:00
SinnamonLat
5601fa4c22 profiles: character/colour select 2022-02-18 13:46:32 +01:00
SinnamonLat
0ac0efda70 Add typing menu overlay for controller parity 2022-02-17 15:05:22 +01:00
SinnamonLat
8efba24df7 profiles: start on edit menu (it does nothing) 2022-02-16 23:57:06 +01:00
SinnamonLat
c44300d39f Use mockup design for cards, allow moving around and getting out of the profile menu. Still can't make/edit profiles 2022-02-16 10:29:01 +01:00
SinnamonLat
aea066b70f Update menus to use the new input system all over... 2022-02-15 23:30:51 +01:00
SinnamonLat
8c53108d17 Start on profiles menu (does nothing and softlocks) 2022-02-15 01:28:57 +01:00
Sally Coolatta
b5e16a5202 Add 4PREADY graphic 2021-12-28 22:16:37 -05:00
Sally Coolatta
38122e4fa5 Fix cursor appearing before P1 has pressed start 2021-12-28 05:39:50 -05:00
Sally Coolatta
e628894b47 Merge branch 'new-menus' into profiles 2021-12-25 06:09:53 -05:00
SinnamonLat
cdb3b1ca98 Difficulty select before GP, match race & netgames 2021-12-11 18:22:56 +01:00
SinnamonLat
841649c7ea opengl: fake the pause fade background 2021-12-11 11:23:48 +01:00
SinnamonLat
9de737682d extras: replay hut 2021-12-10 20:30:09 +01:00
SinnamonLat
75df86da2f extras menu: addons 2021-12-10 16:15:54 +01:00
SinnamonLat
2e79d84f4a Extras menu barebones start, it does nothing 2021-12-10 16:07:36 +01:00
Sally Coolatta
d067c1ddef First pass on character select device select
Ultra mega hacked in, by saving all "discarded" joysticks to an array so they don't get totally closed & we can still poll them. Events now properly send the device number instead of the player number, which means we can store all controllers pressing buttons, and thus, can detect when ANY controller is pressing anything, and THUS we can make the character select work like we wanted to :V

Did not bother fixing any of the bugs, however. First of all, the opening menus do not properly fallback to default controls. Yet again, we may need a more robust system -- storing all keys from gamekeydown separately? Additionally it seems like when I input gamepad it makes me use keyboard anyway, so I think something fishy is up.
2021-12-06 17:43:52 -05:00
SinnamonLat
2e875eb3f0 Options menu background + sounds 2021-11-27 21:11:00 +01:00
SinnamonLat
c377ea1186 options: data & manual 2021-11-26 16:36:15 +01:00
SinnamonLat
76bba0fc9c options: gameplay 2021-11-26 10:18:50 +01:00
SinnamonLat
3449064b8b options menu + video options (res & ogl) 2021-11-25 23:36:42 +01:00
SinnamonLat
17e45d92c5 Pause: addons menu 2021-11-19 23:58:35 +01:00
SinnamonLat
a64f97da7b Tiny prep work for splitscreen spectate/join to implement later 2021-11-18 22:05:22 +01:00
SinnamonLat
55b9489af0 pause menu: spectate + exit game 2021-11-18 20:47:52 +01:00
SinnamonLat
e560bffcf7 Pause menu start + map switching 2021-11-18 15:19:25 +01:00
SinnamonLat
88aec4e7db Fix misaligned button on HOST submenu 2021-11-17 13:49:20 +01:00
SinnamonLat
c3a3a001b0 Make join by IP menu less shitty looking 2021-11-17 13:39:26 +01:00
SinnamonLat
1412b96b20 EXPERIMENTAL: Save last 3 IPs manually joined to allow rejoining them later 2021-11-16 23:03:46 +01:00
SinnamonLat
fdf778c72f Allow hosting and joining by IP 2021-11-14 21:24:09 +01:00
SinnamonLat
feb0868292 Small continuation of the MP menus, this allows us to reach CORE/MODDED split 2021-11-13 19:32:12 +01:00
SinnamonLat
04bd3efd5b First attempt at multiplayer menus 2021-11-13 18:08:34 +01:00
toaster
b4af07ffed Merge branch 'master' into new-menus
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/v_video.c
#	src/y_inter.c
2021-10-18 01:18:37 +01:00
Sally Coolatta
8289bf252f Chengi's menu selectors
- Menu BG image is defined by menu option
- Menu BG image slides in
- Gamemode menu options are now like Chengi's mockup
2021-01-13 01:16:14 -05:00
Sally Coolatta
521eff868c Chengi's new background added 2021-01-11 01:02:16 -05:00
Sally Coolatta
2af75a2bd1 Fix merge conflicts 2021-01-11 00:06:34 -05:00
Sally Coolatta
3e36e15628 Merge master 2020-06-08 00:52:37 -04:00