MusicPlus feature: Fade out at end of level
Fades out the level music when you exit the stage.
Also adds a level header MUSICINTERFADEOUT = milliseconds
: instead of playing the intermission music, fade out the level music by milliseconds. Works for single player and co-op intermission screens.
Edited by mazmazz
Merge request reports
Activity
Filter activity
added 941 commits
-
0bc6b2e4...e2e34598 - 865 commits from branch
public-musicplus-core
- d7321fd8 - Pull expanded NMUSlist from 2.2
- 1b7a9aaa - 2.1 Score/Time/Rings lump name
- a7b96ab8 - Update XPM icon
- 0ebe5b25 - Inclue PNG file
- f73501fd - Update libgme to 0.6.2
- d61eb7ed - Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
- 393c64b8 - Merge branch 'expanded-nmuslist' into 'next'
- 819e4ef2 - Merge branch 'master' into next
- 827461cc - Support for per-map intermission music
- 2bd794c0 - Remove S_MusicExists lua
- 2e4c1395 - DD Compile fixes
- c97dc5d3 - Increase M_ChangecontrolResponse message buffer by 25 chars
- d5870e6f - Merge branch 'changecontrol-text-overflow-fix' into 'master'
- 1c133119 - Update f_finale.c - Remove Torgo's real name by request
- 4f0be1b0 - Update f_finale.c - Small credits update
- 7e026824 - Fix rendering gaps on polys with upper/lower textures
- fad341b0 - Fix skins overflow
- b18a8dbc - Disable the APNG code if the version of libpng is greater than 1.4.
- b8b605a9 - Merge branch 'apng-conditional-disable' into 'master'
- 74850fea - Merge branch 'master' into next
- 0d1c5016 - Update the SP menu stuff to use MAXSKINS
- 74bf3164 - Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia
- bce093fd - Setup the tables even eariler.
- 0aa965c5 - How did I forget about this
- e6cb47e2 - Merge branch 'fix_skins_overflow' into 'next'
- ca176b62 - Merge branch 'polyobj_fix_vanilia' into 'master'
- 76724c9c - Show line number on error, also hide under devmode
- c1deea07 - Disable multi statement macros errors.
- 76671229 - Merge branch 'gcc8-statement-warning' into 'master'
- 2f8eadd2 - Merge branch 'master' into next
- e36193e4 - Merge branch 'hide-error-devmode' into 'next'
- a25f4b81 - Make sure that B_CheckRespawn can be called even if Tails is dead
- d44cb36d - Merge branch 'tails-bot-dead-forever-fix' into 'next'
- d76e946b - Merge branch 'sdl-new-windowicon' into 'master'
- e86d0836 - Merge branch 'updatelibgme' into 'master'
- d865b566 - CircleCI: test build SRB2 without network support
- 0340eb0b - Merge branch 'master' into next
- 15b27bb7 - Upped MAXNETNODES
- fa990e86 - Remove double define
- 5620d018 - Merge branch 'apng' into 'master'
- 7cd60a54 - Merge branch 'apng-oh-shit-fixes' into 'master'
- 97de2ae4 - Stop Linux servers from hanging every 34 hours
- 4247f47a - Merge branch 'higher-maxnodes' into 'next'
- 27adf300 - Merge branch 'apng-backport' into 'master'
- 4459ecdd - Merge branch 'master' into next
- 67e721e9 - Merge branch 'need-more-time' into 'master'
- 008b0bf5 - Merge branch 'master' into next
- 0051eb70 - Merge branch 'circleci' into 'master'
- c9e8d34b - Merge branch 'master' into next
- f8237686 - Fix building without BLUA support
- c2618fd9 - Merge branch 'master' into next
- 145ccfd4 - no more floating constants warnings, and disable bad array bounds warnings
- 67e246cd - No more errors for VC6 support
- 3fa17517 - CircleCi: we need SSH for buildbot
- 747995ae - Merge branch 'master' into next
- 60ca6ae0 - TravisCI: add option for GCC 8.1
- 8780800e - TravisCI: remove WFLAGS
- cd39b951 - partly Revert "TravisCI: remove WFLAGS"
- 08784ce5 - Merge branch 'master' into next
- 93626c22 - Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
- aea18f36 - Remove MP3 warning
- 2c75d4da - Fix custom fade source bug for Change Music linedef
- c021e298 - Restore MUSIC_RELOADRESET if block in g_game
- 67e28573 - When changing to same music, reset the internal volume
- fdde5f13 - When resetting volume on same music, make it fade instead of a hard change
- bd9e42ce - Merge branch 'public-gl-next' into public-musicplus-inter
- dcd8669e - Merge branch 'public-musicplus-inter' into 'next'
- 773f9dc2 - Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel
- b5fc27c5 - Implement MUSICINTERFADEOUT level header
- ba77dfd5 - Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
- 6cf05a46 - Implement MUSICINTERFADEOUT level header
- e098d6a8 - Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
- 6b93ca92 - Intermission: Don't fade out level music when using win32 midi volume hack
- c0782aa8 - Merge branch 'public-musicplus-feature-interfadeout' into 'next'
- a1ccb851 - Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel
- 587a51a9 - Fix end-of-level fading for cv_playersforexit
Toggle commit list-
0bc6b2e4...e2e34598 - 865 commits from branch
playersforexit bug is fixed.
Feature is confirmed working in these scenarios:
- Single player
- Co-op with playersforexit One
- Co-op with playersforexit All
- Race when all players finish
- Race when player finishes during the countdown (exits immediately, no fade)
- Race when player does not reach the end (countdown music finishes, does not fade)
- Ringslinger (does not fade; should we support this?)
For merging into 2.2, don't forget to change the
p_user.c
check to 2.2. Checking againstplayer->exiting > 1*TICRATE
is the key.
Please register or sign in to reply