Monster Iestyn
a6a4b74692
Merge branch '21-controls' into 'next'
...
Default control changes for 2.1.21
See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
Digiku
dcba8ab654
"Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk
2018-11-26 15:48:08 -05:00
mazmazz
0d9749f418
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-25 19:03:22 -05:00
mazmazz
cc90becce7
Remove unused menu hierarchy methods
2018-11-25 15:09:25 -05:00
mazmazz
f3914583c6
Rearranged menu presentation methods
...
* Menu parameter retrieval and hierarchy in m_menu
* Presentation logic (background display) in f_finale
2018-11-25 15:08:12 -05:00
Steel Titanium
157502310f
Save sound toggles to config
2018-11-25 14:22:52 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
mazmazz
21095ad813
Added chasefreecam to menu
2018-11-22 17:32:03 -05:00
mazmazz
340b5e9d4f
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
mazmazz
472caaf277
Adjust menu for movement and camera controls
2018-11-22 14:13:28 -05:00
mazmazz
e72df07c6c
Change camera control names to Look
2018-11-22 11:28:32 -05:00
mazmazz
21a3121b95
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 10:58:07 -05:00
mazmazz
3bb75690c4
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
mazmazz
e682fb919f
Draw connection screen correctly; make scroll speed inherit global setting
2018-11-20 18:13:18 -05:00
mazmazz
c65ff66383
Performance improvements
...
* Don't loop every frame for menu drawing parameters
* Fixed in-game escape menu not dimming correctly
* Fixed glitches on default title screen parameters
2018-11-20 17:28:26 -05:00
Monster Iestyn
cfa4bbd75b
change return type of M_CheckMODVersion to boolean
2018-11-19 17:47:23 +00:00
mazmazz
e3a8c70a94
Mirror a wipe if it's forced off and the counter-wipe is specified
2018-11-18 04:39:34 -05:00
mazmazz
d95ccd371c
Compiler fixes
2018-11-18 04:32:38 -05:00
mazmazz
03141456b1
Allow inherited wipes when switching menus without a common ancestor (Multiplayer > Server Settings)
2018-11-18 03:32:19 -05:00
mazmazz
53ef38980a
Fix MN_SPECIAL check for menu meta state
2018-11-18 03:19:07 -05:00
mazmazz
1dcfd14b90
Allow backgrounds for player select
2018-11-18 02:49:08 -05:00
mazmazz
3334df7ac4
More title screen features; menu meta state implementation (active and previous menu types)
...
* Draw background over titlemap
* HIDEBACKGROUND to show titlemap
* Specify NOMUSIC or IGNOREMUSIC (to not change music)
* Linedef execs implemented for tree hierarchy, including bubbling (NOENTERBUBBLE/NOEXITBUBBLE)
* Specify ENTERWIPE and EXITWIPE
* Menuid hierarchy fixes (Control mapping, joystick setup)
* Time attack handling fixes
* Specify custom wipes on runtime for D_Display and P_SetupLevel (for titlemap)
* Allow for forcing and skipping a wipe
* Wipe utility functions F_GetWipeLength and F_WipeExists
2018-11-17 19:08:30 -05:00
mazmazz
b22538beb9
Implemented features
...
* M_SkyScroll optimization with still speeds; refactor background drawing
* Music (in time attack screens so far)
* FadeStrength
* HideTitlePics
* Scrolling backgrounds in Time Attack (moved F_SkyScroll to m_menu)
2018-11-17 01:21:21 -05:00
mazmazz
a046718c47
Implement scrolling menu backgrounds
2018-11-16 18:26:26 -05:00
mazmazz
b1b747bf6f
Menumeta iterators
2018-11-16 14:16:41 -05:00
mazmazz
54266a52e5
Title screen menu SOC
2018-11-16 12:07:47 -05:00
mazmazz
c26d800caa
Refactor MM_ menu types to MN_
2018-11-16 09:56:22 -05:00
mazmazz
8413b12c4e
Use bitshifting for menu IDs and hierarchy instead
2018-11-16 09:22:27 -05:00
mazmazz
ff7213679a
Add MM menutype flags to menu defs
2018-11-15 19:41:27 -05:00
mazmazz
4b63f20e9d
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-11-13 14:34:40 -05:00
mazmazz
3c168afc60
Check specifically for gcs_fps when starting tutorial
2018-11-13 01:57:51 -05:00
mazmazz
5cb72f7071
tutorial-time gclist -> gcl refactor
2018-11-12 23:25:49 -05:00
mazmazz
14199fd516
First time tutorial prompt fixes
2018-11-12 19:10:41 -05:00
mazmazz
8b1624576f
Merge branch 'tutorial-time' into tutorial-time-firstprompt
2018-11-12 18:08:48 -05:00
mazmazz
658ecce249
->defalutvalue -- .defaultvalue adjustment
2018-11-12 17:37:54 -05:00
mazmazz
eb5f05848c
Also set cv_analog for tutorialgcs
...
* M_TutorialSaveControlResponse CV_Set adjustment
2018-11-12 17:34:56 -05:00
mazmazz
dfb395ab37
Change mouse cv vars temporarily alongside control scheme
2018-11-12 17:30:21 -05:00
mazmazz
5944411c26
Restrict control changes if tutorialgcs is active
2018-11-12 16:56:06 -05:00
mazmazz
8bd5b62a9d
Fix CopyControls not firing when starting tutorial while keeping current controls
2018-11-11 23:42:02 -05:00
mazmazz
4e004571b6
Merge branch 'tutorial-time' into tutorial-time-firstprompt
2018-11-11 09:37:36 -05:00
mazmazz
54265477b4
Check reduced control set for tutorial time; change the entire tutorial control set when prompted
2018-11-11 09:37:19 -05:00
mazmazz
b60335fd57
Merge branch 'tutorial-time' into tutorial-time-firstprompt
2018-11-11 09:21:10 -05:00
mazmazz
bef8f2dbce
Tutorial control message adjustments
2018-11-11 09:15:43 -05:00
mazmazz
6d6776a4d8
Merge branch 'control-selector' into tutorial-time
2018-11-11 08:46:06 -05:00
mazmazz
86168a1d80
Tutorial mode support for control switching
2018-11-11 08:20:08 -05:00
mazmazz
59417ecd4a
WIP: First-time tutorial prompt
2018-11-10 02:30:21 -05:00
mazmazz
d406809ee8
Hide Tutorial menu option if no tutorialmap
2018-11-10 01:17:11 -05:00
mazmazz
acbbe3daf8
Merge remote-tracking branch 'origin/master' into tutorial-time
2018-11-03 10:58:11 -04:00
Monster Iestyn
a0c822fec8
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
mazmazz
85c6715188
musicplus-libopenmpt 2.2 -> 2.1 backport
2018-09-18 12:31:47 -04:00
