lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3192 commits 1 branch 29 tags 122 MiB
Commit graph

3192 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Monster Iestyn d44cb36d53 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 a25f4b8194 Make sure that B_CheckRespawn can be called even if Tails is dead 2019-02-26 21:14:22 +00:00
Alam Ed Arias e36193e44e 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 2f8eadd211 Merge branch 'master' into next 2019-02-21 22:42:26 -05:00
Alam Ed Arias 7667122912 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 230faf15de Some small changes. 2019-02-21 19:48:49 -05:00
Steel Titanium bfbb83df23 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 bf2f6ebc09 Save ban list right after banning. 2019-02-21 19:47:00 -05:00
Steel Titanium c9d90f7688 Add command to ban an IP address. 2019-02-21 19:44:18 -05:00
Steel Titanium c1deea0714 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
Steel Titanium 76724c9c13
Show line number on error, also hide under devmode 2019-02-11 16:39:58 -05:00
Monster Iestyn ca176b6225 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 e6cb47e2f2 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 0aa965c59f How did I forget about this 2019-01-26 23:22:30 -05:00
Steel Titanium bce093fd06 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 74bf3164f8 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia 2019-01-26 00:51:39 -05:00
TehRealSalt 0d1c501664 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 74850fea17 Merge branch 'master' into next 2019-01-20 17:01:01 -05:00
Alam Ed Arias b8b605a9c7 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 b18a8dbc8d 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 356249dade Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08:00
Steel Titanium fad341b0e9 Fix skins overflow 2019-01-15 14:29:43 -05:00
fickleheart 7e026824a4 Fix rendering gaps on polys with upper/lower textures 2019-01-12 20:15:58 -05:00
Digiku 4f0be1b064 Update f_finale.c - Small credits update 2019-01-07 16:50:59 -05:00
Digiku 1c1331199d Update f_finale.c - Remove Torgo's real name by request 2019-01-07 03:41:25 -05:00
Digiku d5870e6f8a 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 c97dc5d3c4 Increase M_ChangecontrolResponse message buffer by 25 chars 2019-01-04 19:38:36 -05:00
mazmazz 2e4c139551 DD Compile fixes 2019-01-02 06:48:06 -05:00
mazmazz 2bd794c006 Remove S_MusicExists lua 2019-01-02 06:26:18 -05:00
Steel Titanium 827461cc36 Support for per-map intermission music 2019-01-02 05:15:23 -05:00
mazmazz e2e345988a Add safe lua music functions 
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
 2019-01-02 04:58:03 -05:00
mazmazz 1aacfee80c Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core 2019-01-02 03:47:51 -05:00
mazmazz 109dd70a53 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-02 02:15:16 -05:00
Alam Ed Arias 819e4ef2ae Merge branch 'master' into next 2019-01-01 23:00:39 -05:00
Digiku 393c64b8bc Merge branch 'expanded-nmuslist' into 'next' 
Expand NMUSList to include HUD changes

See merge request STJr/SRB2!388
 2019-01-01 15:06:04 -05:00
Digiku 5278d1ca20 Merge branch 'caps-lock-consistency-fix' into 'master' 
Update capslock state on window re-focus

See merge request STJr/SRB2!436
 2019-01-01 15:05:20 -05:00