Commit graph

3308 commits

Author SHA1 Message Date
Alam Arias
0ea2177a4e CircleCI: test build SRB2 without network support 2019-02-27 14:37:31 -05:00
Monster Iestyn
4933e1de51 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
ea0c251a92 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
Monster Iestyn
9ddad37455 Merge branch 'tails-bot-dead-forever-fix' into 'next'
Tails bot dead forever fix

See merge request STJr/SRB2!461
2019-02-27 12:39:56 -05:00
Monster Iestyn
e7952e4de7 Make sure that B_CheckRespawn can be called even if Tails is dead 2019-02-26 21:14:22 +00:00
Alam Ed Arias
482bfd0804 Merge branch 'hide-error-devmode' into 'next'
Show line number on error, also hide under devmode

See merge request STJr/SRB2!458
2019-02-21 23:05:09 -05:00
Alam Ed Arias
887a26f971 Merge branch 'master' into next 2019-02-21 22:42:26 -05:00
Alam Ed Arias
7a09161e69 Merge branch 'gcc8-statement-warning' into 'master'
GCC8: Disable multi statement macros errors.

See merge request STJr/SRB2!459
2019-02-21 22:32:38 -05:00
Steel Titanium
a2820e0f51 Some small changes. 2019-02-21 19:48:49 -05:00
Steel Titanium
512b001aa0 Save when quitting the game.
Also use default reason if not custom reason is given.
2019-02-21 19:48:15 -05:00
Steel Titanium
deb58b0e68 Save ban list right after banning. 2019-02-21 19:47:00 -05:00
Steel Titanium
4f5d698d80 Add command to ban an IP address. 2019-02-21 19:44:18 -05:00
Steel Titanium
45e9e3f7f9 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
Steel Titanium
93bed5f40d Show line number on error, also hide under devmode 2019-02-11 16:39:58 -05:00
Monster Iestyn
38546ba6d1 Merge branch 'polyobj_fix_vanilia' into 'master'
Fix rendering gaps on polys with upper/lower textures

See merge request STJr/SRB2!453
2019-02-11 15:05:44 -05:00
Monster Iestyn
4b8b8f90f4 Merge branch 'fix_skins_overflow' into 'next'
Fix skin overflow error

See merge request STJr/SRB2!455
2019-02-11 15:05:00 -05:00
Steel Titanium
221ec15af0 How did I forget about this 2019-01-26 23:22:30 -05:00
Steel Titanium
34920c2951 Setup the tables even eariler.
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
2019-01-26 23:16:49 -05:00
Steel Titanium
31a884e542 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia 2019-01-26 00:51:39 -05:00
TehRealSalt
bcdfe2eb14 Update the SP menu stuff to use MAXSKINS
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-26 00:22:05 -05:00
Alam Ed Arias
2f65d2860a Merge branch 'master' into next 2019-01-20 17:01:01 -05:00
Alam Ed Arias
94748c3921 Merge branch 'apng-conditional-disable' into 'master'
Disable the APNG code if the version of libpng is greater than 1.4.

See merge request STJr/SRB2!457
2019-01-20 17:00:50 -05:00
Sryder
517a32e96d Disable the APNG code if the version of libpng is greater than 1.4.
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
2019-01-20 18:50:28 +00:00
james
e4a1470116 Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08:00
Jimita
683bc8fb34 Merge branch 'next' into flashpals-on-screenshots 2019-01-16 05:59:05 -02:00
Steel Titanium
123b97c5ed Fix skins overflow 2019-01-15 14:29:43 -05:00
fickleheart
81c73032e4 Fix rendering gaps on polys with upper/lower textures 2019-01-12 20:15:58 -05:00
Digiku
8e862b3c98 Update f_finale.c - Small credits update 2019-01-07 16:50:59 -05:00
Digiku
e45c54dc60 Update f_finale.c - Remove Torgo's real name by request 2019-01-07 03:41:25 -05:00
mazmazz
5db9b3082f Remove unnecessary version info call 2019-01-05 19:56:27 -05:00
mazmazz
4ba352e590 Remove zlib from release brew packages
(it was never in the original travis script)
2019-01-05 19:49:25 -05:00
mazmazz
51ad724513 Use standard OSX brew bottles to speed up test buildbots 2019-01-05 19:43:37 -05:00
mazmazz
43fa1f0ee1 OS X set CFLAGS+="-march=core2" for compatible binaries with old Macs 2019-01-05 19:34:39 -05:00
mazmazz
342e7768f5 * Add homebrew tap mazmazz/srb2
* Use sdl2_mixer from mazmazz/srb2 due to removed options from homebrew-core
* Use `brew install --build-bottle` to build compatible libraries for old Macs
2019-01-05 19:20:58 -05:00
mazmazz
d9d2f6e23f Don't terminate in after_success because it halts the log abruptly 2019-01-05 10:17:33 -05:00
mazmazz
4ee642e2ab Revised comments 2019-01-05 09:54:45 -05:00
mazmazz
cae6a842de Merge remote-tracking branch 'public-gl/master' into travis-deployer 2019-01-05 09:08:34 -05:00
Marco Z
67d829174e Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC 2019-01-04 21:18:55 -05:00
Marco Z
d284b877f6 Add LibGME to DD vc10 project 2019-01-04 20:43:45 -05:00
Marco Z
35f8ff191a Add GME to VC10 SRB2SDL project 2019-01-04 20:43:42 -05:00
Digiku
031e234d86 Merge branch 'changecontrol-text-overflow-fix' into 'master'
Resolve buffer overflow crash when configuring System Menu and GIF controls

See merge request STJr/SRB2!445
2019-01-04 19:39:17 -05:00
Digiku
e42e1178ed Increase M_ChangecontrolResponse message buffer by 25 chars 2019-01-04 19:38:36 -05:00
mazmazz
3e5cfc4d65 Add __DPL_ACTIVE condition to optional asset download 2019-01-02 20:48:46 -05:00
mazmazz
a873b8517c Correct asset directory for travis 2019-01-02 18:38:02 -05:00
mazmazz
c5e9d6c97f DD Compile fixes 2019-01-02 06:48:06 -05:00
mazmazz
5807384dbd Remove S_MusicExists lua 2019-01-02 06:26:18 -05:00
Steel Titanium
2ba11a6d69 Support for per-map intermission music 2019-01-02 05:15:23 -05:00
mazmazz
0724d042bc Add safe lua music functions
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
2019-01-02 04:58:03 -05:00
mazmazz
6086a9f238 Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core 2019-01-02 03:47:51 -05:00
mazmazz
e244b34093 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-02 02:15:16 -05:00