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
mazmazz
707d649d67
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-15 01:17:33 -04:00
mazmazz
b2e3352c5a
Merge branch 'music-cleanup' into musicplus-core
2018-09-15 00:46:02 -04:00
mazmazz
00987dd7e5
Don't call I_StartupSound in SFX toggle
...
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
(cherry picked from commit c64d52c1f9
2018-09-14 16:43:48 -04:00
mazmazz
c64d52c1f9
Don't call I_StartupSound in SFX toggle
...
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
2018-09-14 16:39:10 -04:00
mazmazz
1b2d28bc7a
More unnecessary if conditions, toggle SFX menu
2018-09-14 13:54:41 -04:00
mazmazz
b767a0bfd1
Sound menu toggle fix: unnecessary if condition
2018-09-14 11:25:25 -04:00
mazmazz
e7d87ea486
Menu sound toggle fixes (and add starpost sfx to menu)
2018-09-14 11:24:28 -04:00
mazmazz
89dcae23a2
Play the opposite type music (Digital/MIDI) when toggling between them in menu
...
* S_MusicInfo method to retrieve name, flags, and looping
(cherry picked from commit f6ec93198f0dcfa1d053cca88172c3e3c7ba310c)
2018-09-14 10:38:32 -04:00
mazmazz
b51cf6c060
Toggle Digi/MIDI music in menu accurately; add S_MusicType
...
(cherry picked from commit 4aa100aa575cc7fc14a743085222c806ba2c714a)
2018-09-14 10:37:08 -04:00
mazmazz
23acc47b39
nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
...
(cherry picked from commit 07738fb0bcf640a4349337373f451fe68e024b2a)
2018-09-14 10:35:51 -04:00
mazmazz
f41ad3073d
Refactoring, music statues
...
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused
(cherry picked from commit f5f0b5e76c2fd405c8cc895dde653c5ed2652622)
2018-09-14 10:28:29 -04:00
mazmazz
9c56f953a5
Merge branch 'master' into musicplus-core
2018-09-13 13:24:46 -04:00
Monster Iestyn
dbff92ea30
Add "tutorialmode" var to help the game know when we're in a tutorial or not, add placeholder for tutorial HUD to test it works
2018-09-04 16:58:49 +01:00
Monster Iestyn
cc20eed183
Merge branch 'master' into tutorial-time
2018-09-04 15:54:50 +01:00
Monster Iestyn
46be411454
Fix compiler complaints, remove a slipup of mine from when I was dealing with merge conflicts
2018-08-29 22:07:38 +01:00
Monster Iestyn
d60ade9f95
Merge branch 'master' into hud-n-menu-tidbits
2018-08-29 21:28:11 +01:00
Monster Iestyn
6c85af79f6
Merge branch 'master' into hud-n-menu-tidbits
...
# Conflicts:
# src/m_menu.c
# src/screen.c
# src/st_stuff.c
2018-08-28 20:51:46 +01:00
