lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,305 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

3305 Commits

Author SHA1 Message Date
Jimita 6e4b42fc97
Merge branch 'next' into flashpals-on-screenshots 2019-03-15 16:38:33 -03:00
mazmazz f18103a473 Declare exitfadestarted properly 2019-03-15 11:01:41 -04:00
mazmazz 587a51a957 Fix end-of-level fading for cv_playersforexit 
(Code in p_user.c was from 2.2, where cv_playersforexit has different values so that the player exit check works differently)
 2019-03-15 03:47:30 -04:00
mazmazz a1ccb8512d Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel 2019-03-15 02:07:53 -04:00
Digiku c0782aa89e Merge branch 'public-musicplus-feature-interfadeout' into 'next' 
Fade out level music during intermission via level header

See merge request STJr/SRB2!470
 2019-03-15 01:40:23 -04:00
mazmazz 6b93ca9221 Intermission: Don't fade out level music when using win32 midi volume hack 2019-03-15 01:26:13 -04:00
mazmazz e098d6a8b8 Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel 2019-03-15 01:09:12 -04:00
mazmazz 6cf05a4613 Implement MUSICINTERFADEOUT level header 2019-03-15 01:05:52 -04:00
mazmazz ba77dfd546 Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel 2019-03-15 01:01:24 -04:00
mazmazz b5fc27c545 Implement MUSICINTERFADEOUT level header 2019-03-15 01:00:50 -04:00
mazmazz 773f9dc2ba Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel 2019-03-15 00:39:26 -04:00
Digiku dcd8669ec2 Merge branch 'public-musicplus-inter' into 'next' 
Custom intermission music by level header [by SteelTitanium]

See merge request STJr/SRB2!469
 2019-03-15 00:23:45 -04:00
mazmazz bd9e42ce6e Merge branch 'public-gl-next' into public-musicplus-inter 2019-03-14 23:42:16 -04:00
mazmazz fdde5f13c5 When resetting volume on same music, make it fade instead of a hard change 2019-03-13 23:55:30 -04:00
mazmazz 67e2857303 When changing to same music, reset the internal volume 2019-03-13 23:41:35 -04:00
mazmazz c021e29835 Restore MUSIC_RELOADRESET if block in g_game 2019-03-13 21:18:23 -04:00
mazmazz 2c75d4da69 Fix custom fade source bug for Change Music linedef 2019-03-13 19:53:16 -04:00
mazmazz aea18f36ba Remove MP3 warning 2019-03-13 19:51:45 -04:00
mazmazz 93626c2293 Merge remote-tracking branch 'public-gl/next' into public-musicplus-core 2019-03-13 19:45:07 -04:00
Alam Ed Arias 08784ce58d Merge branch 'master' into next 2019-03-09 20:37:17 -05:00
Alam Ed Arias cd39b951bb partly Revert "TravisCI: remove WFLAGS" 
This reverts commit 8780800e8e.
 2019-03-09 20:36:44 -05:00
Alam Ed Arias 8780800e8e TravisCI: remove WFLAGS 2019-03-09 20:17:14 -05:00
Alam Ed Arias 60ca6ae06b TravisCI: add option for GCC 8.1 2019-03-09 19:41:56 -05:00
Jimita the Cat 0186f6784b a 2019-03-06 21:40:38 -03:00
Alam Ed Arias 747995ae6a Merge branch 'master' into next 2019-03-04 17:15:04 -05:00
Alam Ed Arias 3fa1751706 CircleCi: we need SSH for buildbot 2019-03-04 16:51:39 -05:00
Alam Ed Arias 67e246cd53 No more errors for VC6 support 2019-03-04 16:46:14 -05:00
Alam Ed Arias 145ccfd405 no more floating constants warnings, and disable bad array bounds warnings 2019-03-04 16:46:14 -05:00
Steel Titanium 9542a47f7f New -noxinput and -nohidapi command line parameters. 2019-03-03 22:57:09 -05:00
Steel Titanium 15323328c5 Check using memcmp() 2019-03-03 22:43:21 -05:00
Steel Titanium 3d5d02fc15 Error if the lump is a PNG lump 2019-03-03 19:58:01 -05:00
Alam Ed Arias c2618fd987 Merge branch 'master' into next 2019-03-01 17:32:17 -05:00
Alam Ed Arias f823768699 Fix building without BLUA support 2019-03-01 17:31:32 -05:00
Monster Iestyn c9e8d34b9d Merge branch 'master' into next 2019-03-01 18:59:32 +00:00
Monster Iestyn 0051eb7039 Merge branch 'circleci' into 'master' 
CircleCI: test build SRB2 without network support

See merge request STJr/SRB2!462
 2019-03-01 12:56:52 -05:00
Monster Iestyn 008b0bf560 Merge branch 'master' into next 2019-03-01 16:23:51 +00:00
Monster Iestyn 67e721e983 Merge branch 'need-more-time' into 'master' 
Stop Linux servers from hanging every 34 hours

See merge request STJr/SRB2!465
 2019-03-01 11:22:32 -05:00
Monster Iestyn 4459ecdd90 Merge branch 'master' into next 2019-03-01 16:05:49 +00:00
Monster Iestyn 27adf300b2 Merge branch 'apng-backport' into 'master' 
aPNG backport from Kart

See merge request STJr/SRB2!464
 2019-03-01 11:04:08 -05:00
Monster Iestyn 4247f47ad9 Merge branch 'higher-maxnodes' into 'next' 
Upped MAXNETNODES

See merge request STJr/SRB2!463
 2019-03-01 09:15:47 -05:00
wolfy852 97de2ae4f6 Stop Linux servers from hanging every 34 hours 2019-03-01 00:07:58 -06:00
Alam Ed Arias 7cd60a544a Merge branch 'apng-oh-shit-fixes' into 'master' 
Compiling errors for apng fixed

See merge request KartKrew/Kart-Public!69
 2019-02-28 12:00:58 -08:00
wolfs 5620d0188e Merge branch 'apng' into 'master' 
Support aPNG in new versions of libpng

See merge request KartKrew/Kart-Public!63
 2019-02-28 12:00:58 -08:00
Steel Titanium fa990e8603 Remove double define 2019-02-27 16:05:43 -05:00
Steel Titanium e71977fe6a Merge branch 'next' into banip-command 2019-02-27 16:03:01 -05:00
Steel Titanium 15b27bb7d7 Upped MAXNETNODES 2019-02-27 15:59:50 -05:00
Monster Iestyn 0340eb0b99 Merge branch 'master' into next 2019-02-27 20:35:07 +00:00
Alam Arias d865b5660a CircleCI: test build SRB2 without network support 2019-02-27 14:37:31 -05:00
Monster Iestyn e86d0836a3 Merge branch 'updatelibgme' into 'master' 
Update game-emu-music lib to 0.6.2

See merge request STJr/SRB2!444
 2019-02-27 13:49:44 -05:00
Monster Iestyn d76e946b3e Merge branch 'sdl-new-windowicon' into 'master' 
SDL:Update XPM icon

See merge request STJr/SRB2!441
 2019-02-27 13:34:24 -05:00