Monster Iestyn
e4062e1dc0
Merge branch 'master' into next
2019-03-01 16:23:51 +00:00
Monster Iestyn
8d124101f4
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
659e8e8162
Merge branch 'master' into next
2019-03-01 16:05:49 +00:00
wolfy852
cc7112eaf5
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
Alam Ed Arias
3cbb1204ad
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
8a6f4b6405
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
c748882d04
Remove double define
2019-02-27 16:05:43 -05:00
Steel Titanium
7fc180604b
Upped MAXNETNODES
2019-02-27 15:59:50 -05:00
Monster Iestyn
538605117e
Merge branch 'master' into next
2019-02-27 20:35:07 +00: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
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
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
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
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
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
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
Alam Ed Arias
13e3a975d8
Merge branch 'master' into next
2019-01-01 23:00:39 -05:00
Digiku
764e6e7659
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
4560b4cb41
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
Digiku
80dc98624b
Merge branch 'mingw-64bit-cpu-target-revise' into 'master'
...
MinGW64:Target nocona for 64-bit builds [revision]
See merge request STJr/SRB2!440
2019-01-01 11:15:34 -05:00
mazmazz
61e8685713
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:43:47 -05:00
Steel Titanium
07f1d495a4
Inclue PNG file
2018-12-29 23:10:45 -05:00
Steel Titanium
b6538c966e
Update XPM icon
2018-12-29 22:52:04 -05:00
mazmazz
deec4550d3
Rename M5 to ARCHOPTS; allow override by command line
2018-12-29 21:55:35 -05:00
mazmazz
44d2340a5b
Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile
2018-12-29 21:14:50 -05:00
Digiku
1517c16c4d
Merge branch 'MSVC-ARM' into 'master'
...
ARM and ARM64 support with MSVC toolchain
See merge request STJr/SRB2!412
2018-12-28 01:05:40 -05:00
Steel Titanium
f61c8fa279
Don't set if LINUX64 is defined
2018-12-27 21:17:02 -05:00
Steel Titanium
46d3e06576
Stupid restrictions
2018-12-27 19:00:18 -05:00
Steel Titanium
3ca95acc56
More explict check
2018-12-27 18:54:10 -05:00
Steel Titanium
faaf298c4f
Target nocona for 64-bit builds
2018-12-27 00:56:33 -05:00
james
77a5a31135
Update capslock state on window re-focus
2018-12-26 15:49:57 -08:00
Digiku
1358a8dd8f
Merge branch '2123-version' into 'master'
...
Update code versions to 2.1.23
See merge request STJr/SRB2!435
2018-12-26 17:14:58 -05:00
Digiku
7e923333b9
Merge branch 'srb2-chat-nonet' into 'master'
...
Hide SRB2-CHAT behind #ifndef NONET
See merge request STJr/SRB2!434
2018-12-26 17:13:23 -05:00
mazmazz
a25c755a6b
Also hide Chat Options if NONET
2018-12-26 16:41:39 -05:00
mazmazz
7deac7e603
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
mazmazz
bd4874aa53
Hide SRB2-CHAT behind #ifndef NONET
2018-12-26 16:20:17 -05:00
Steel Titanium
73dc40a0b1
Fix saving progress on vanilia
2018-12-26 15:47:12 -05:00
mazmazz
91abcd66b7
Fix -ANGLE_180 because MSVC complains
...
-ANGLE_180 evaluates equal to ANGLE_180.
2018-12-25 01:14:05 -05:00