Commits · public-musicplus-jingle · mazmazz / SRB2

Mar 15, 2019
- Merge branch 'public-gl-next' into public-musicplus-jingle · 8317155c
  Marco Z authored Mar 15, 2019
  
  8317155c
- Merge branch 'public-musicplus-feature-interfadeout' into 'next' · c0782aa8
  mazmazz authored Mar 15, 2019
  
  Fade out level music during intermission via level header See merge request STJr/SRB2!470
  c0782aa8
- Intermission: Don't fade out level music when using win32 midi volume hack · 6b93ca92
  Marco Z authored Mar 15, 2019
  
  6b93ca92
- Implement MUSICINTERFADEOUT level header · 6cf05a46
  Marco Z authored Mar 15, 2019
  
  6cf05a46
- Merge branch 'public-musicplus-inter' into 'next' · dcd8669e
  mazmazz authored Mar 15, 2019
  
  Custom intermission music by level header [by SteelTitanium] See merge request STJr/SRB2!469
  dcd8669e
- Merge branch 'public-gl-next' into public-musicplus-inter · bd9e42ce
  Marco Z authored Mar 14, 2019
  
  bd9e42ce
Mar 14, 2019
- When resetting volume on same music, make it fade instead of a hard change · fdde5f13
  Marco Z authored Mar 13, 2019
  
  fdde5f13
- When changing to same music, reset the internal volume · 67e28573
  Marco Z authored Mar 13, 2019
  
  67e28573
- Restore MUSIC_RELOADRESET if block in g_game · c021e298
  Marco Z authored Mar 13, 2019
  
  c021e298
Mar 13, 2019
- Fix custom fade source bug for Change Music linedef · 2c75d4da
  Marco Z authored Mar 13, 2019
  
  2c75d4da
- Remove MP3 warning · aea18f36
  Marco Z authored Mar 13, 2019
  
  aea18f36
- Merge remote-tracking branch 'public-gl/next' into public-musicplus-core · 93626c22
  Marco Z authored Mar 13, 2019
  
  93626c22
Mar 10, 2019
- Merge branch 'master' into next · 08784ce5
  Alam Ed Arias authored Mar 09, 2019
  
  08784ce5
- partly Revert "TravisCI: remove WFLAGS" · cd39b951
  Alam Ed Arias authored Mar 09, 2019
  
  This reverts commit 8780800e.
  cd39b951
- TravisCI: remove WFLAGS · 8780800e
  Alam Ed Arias authored Mar 09, 2019
  
  8780800e
- TravisCI: add option for GCC 8.1 · 60ca6ae0
  Alam Ed Arias authored Mar 09, 2019
  
  60ca6ae0
Mar 04, 2019
- Merge branch 'master' into next · 747995ae
  Alam Ed Arias authored Mar 04, 2019
  
  747995ae
- CircleCi: we need SSH for buildbot · 3fa17517
  Alam Ed Arias authored Mar 04, 2019
  
  3fa17517
- No more errors for VC6 support · 67e246cd
  Alam Ed Arias authored Mar 04, 2019
  
  67e246cd
- no more floating constants warnings, and disable bad array bounds warnings · 145ccfd4
  Alam Ed Arias authored Mar 04, 2019
  
  145ccfd4
Mar 01, 2019
- Merge branch 'master' into next · c2618fd9
  Alam Ed Arias authored Mar 01, 2019
  
  c2618fd9
- Fix building without BLUA support · f8237686
  Alam Ed Arias authored Mar 01, 2019
  
  f8237686
- Merge branch 'master' into next · c9e8d34b
  Monster Iestyn authored Mar 01, 2019
  
  c9e8d34b
- Merge branch 'circleci' into 'master' · 0051eb70
  Monster Iestyn authored Mar 01, 2019
  
  CircleCI: test build SRB2 without network support See merge request STJr/SRB2!462
  0051eb70
- Merge branch 'master' into next · 008b0bf5
  Monster Iestyn authored Mar 01, 2019
  
  008b0bf5
- Merge branch 'need-more-time' into 'master' · 67e721e9
  Monster Iestyn authored Mar 01, 2019
  
  Stop Linux servers from hanging every 34 hours See merge request STJr/SRB2!465
  67e721e9
- Merge branch 'master' into next · 4459ecdd
  Monster Iestyn authored Mar 01, 2019
  
  4459ecdd
- Merge branch 'apng-backport' into 'master' · 27adf300
  Monster Iestyn authored Mar 01, 2019
  
  aPNG backport from Kart See merge request STJr/SRB2!464
  27adf300
- Merge branch 'higher-maxnodes' into 'next' · 4247f47a
  Monster Iestyn authored Mar 01, 2019
  
  Upped MAXNETNODES See merge request STJr/SRB2!463
  4247f47a
- Stop Linux servers from hanging every 34 hours · 97de2ae4
  wolfs authored Mar 01, 2019
  
  97de2ae4
Feb 28, 2019
- Merge branch 'apng-oh-shit-fixes' into 'master' · 7cd60a54
  Alam Ed Arias authored Feb 19, 2019 and James R. committed Feb 28, 2019
  
  Compiling errors for apng fixed See merge request KartKrew/Kart-Public!69
  7cd60a54
- Merge branch 'apng' into 'master' · 5620d018
  wolfs authored Feb 16, 2019 and James R. committed Feb 28, 2019
  
  Support aPNG in new versions of libpng See merge request KartKrew/Kart-Public!63
  5620d018
Feb 27, 2019
- Remove double define · fa990e86
  SteelT authored Feb 27, 2019
  
  fa990e86
- Upped MAXNETNODES · 15b27bb7
  SteelT authored Feb 27, 2019
  
  15b27bb7
- Merge branch 'master' into next · 0340eb0b
  Monster Iestyn authored Feb 27, 2019
  
  0340eb0b
- CircleCI: test build SRB2 without network support · d865b566
  Alam Arias authored Feb 27, 2019
  
  d865b566
- Merge branch 'updatelibgme' into 'master' · e86d0836
  Monster Iestyn authored Feb 27, 2019
  
  Update game-emu-music lib to 0.6.2 See merge request STJr/SRB2!444
  e86d0836
- Merge branch 'sdl-new-windowicon' into 'master' · d76e946b
  Monster Iestyn authored Feb 27, 2019
  
  SDL:Update XPM icon See merge request STJr/SRB2!441
  d76e946b
- Merge branch 'tails-bot-dead-forever-fix' into 'next' · d44cb36d
  Monster Iestyn authored Feb 27, 2019
  
  Tails bot dead forever fix See merge request STJr/SRB2!461
  d44cb36d
Feb 26, 2019
- Make sure that B_CheckRespawn can be called even if Tails is dead · a25f4b81
  Monster Iestyn authored Feb 26, 2019
  
  a25f4b81