stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 10:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
3036 commits 172 branches 41 tags 280 MiB
Commit graph

3036 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Steel Titanium
fad341b0e9 Fix skins overflow 2019-01-15 14:29:43 -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
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
Digiku
900a439c11 Merge branch 'appveyor-installer-revise' into 'master' 
Make AppVeyor installer paths consistent with Travis installer paths

See merge request STJr/SRB2!446
 2019-01-01 11:52:42 -05:00
mazmazz
528c6f771a Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer) 2019-01-01 11:51:17 -05:00
Digiku
bbd878e520 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
Digiku
ce7875b133 Merge branch 'appveyor-64' into 'mingw-64bit-cpu-target-revise' 
Add 64-bit job to Appveyor

See merge request STJr/SRB2!442
 2019-01-01 10:14:37 -05:00
Digiku
bd81c3190e Merge branch 'appveyor-deployer' into 'appveyor-64' 
Add Windows installer building to AppVeyor

See merge request STJr/SRB2!443
 2019-01-01 10:14:25 -05:00
mazmazz
f00cfb7b3f Use optional asset archive instead of file 2018-12-31 17:31:25 -05:00
mazmazz
d61eb7edee Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:43:47 -05:00
mazmazz
e1300d5173 Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 10:43:17 -05:00
mazmazz
941e29780c Implement install building for appveyor (deployer) 2018-12-30 03:42:55 -05:00
mazmazz
bef0bc82e4 Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64 2018-12-29 23:46:16 -05:00
mazmazz
e7165444b4 Add 64-bit DD buildbot 2018-12-29 23:16:08 -05:00
mazmazz
0fc07ebaae Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-29 23:15:09 -05:00
mazmazz
2aa7ee70fe Disable UPX by default in appveyor 2018-12-29 22:51:10 -05:00
mazmazz
34534428fd Add 64-bit SDL builds to appveyor config 2018-12-29 22:17:41 -05:00
mazmazz
3d2e58861d Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz
4cfacf5cde 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
80e30c6aaa 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
d048e7cbec Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
Steel Titanium
5ba0863876 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium
4a05fd5f26 More explict check 2018-12-27 18:54:10 -05:00
Steel Titanium
6dddf61265 Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00
james
0b857f127f Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
Digiku
da9447342c 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
ebb4c65d92 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
60bdc056f8 Also hide Chat Options if NONET 2018-12-26 16:41:39 -05:00
mazmazz
894c139bf1 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz
814db7e371 Hide SRB2-CHAT behind #ifndef NONET 2018-12-26 16:20:17 -05:00
Monster Iestyn
e39c6b47e7 Merge branch 'vanilia-savegame-fix' into 'master' 
Fix saving game progress on a unmodified game

See merge request STJr/SRB2!433
 2018-12-26 16:05:16 -05:00
Steel Titanium
4f18ec60bc Fix saving progress on vanilia 2018-12-26 15:47:12 -05:00
Digiku
98e46f5b1c Merge branch 'large-room-msvc-fix' into 'next' 
Fix -ANGLE_180 because MSVC complains

See merge request STJr/SRB2!432
 2018-12-25 01:15:02 -05:00
mazmazz
fa6f791ec3 Fix -ANGLE_180 because MSVC complains 
-ANGLE_180 evaluates equal to ANGLE_180.
 2018-12-25 01:14:05 -05:00
Digiku
26f956acea Merge branch '2122-version' into 'next' 
Update code versions to 2.1.22

See merge request STJr/SRB2!402
 2018-12-25 00:45:14 -05:00
mazmazz
73a67fc9f5 Merge branch 'ctf-enemy-flag-sound' into 2122-version 2018-12-25 00:27:08 -05:00