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

902 commits

Author SHA1 Message Date
James R cab089c5b1 Merge branch 'gl-colormap-update' into 'next' 
Fix animated skincolors in OpenGL (resolves #187, #247, #301, #370)

Closes #187, #247, #301, and #370

See merge request STJr/SRB2!1301
 2020-12-15 20:50:45 -05:00
James R e94bccc503 Merge branch 'apng-downscale' into 'next' 
Add aPNG downscaling

See merge request STJr/SRB2!1197
 2020-12-12 17:39:56 -05:00
James R 7b6675178e Merge branch 'oldguards' into 'next' 
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
 2020-12-12 17:34:04 -05:00
James R e55d842d7f Kill SEENAMES 2020-12-12 02:11:23 -08:00
Jaime Ita Passos 18ee97c583 Fix animated skincolors in OpenGL 2020-12-06 20:17:14 -03:00
GoldenTails 119d2e9e37 Remove the rest of the Playing() checks for GameQuit hook 2020-11-29 16:53:29 -06:00
GoldenTails b389700de3 Always call GameQuit when quitting via the Quit menu option on the title screen. 2020-11-29 08:32:04 -06:00
GoldenTails 59d2646593 Send a quitting argument to the GameQuit Lua hook 2020-11-29 08:30:50 -06:00
Nev3r bcf6823cbf Merge branch 'dehacked-hell' into 'next' 
Split dehacked.c into multiple files.

See merge request STJr/SRB2!1222
 2020-11-29 05:18:45 -05:00
GoldenTails 8fef61aa29 Split dehacked.c into multiple files. 2020-11-23 21:42:26 -06:00
Jaime Ita Passos 5293c52bca Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
GoldenTails 55f169f3c9 Move the GIF downscaling menu option up one to create some parity. 2020-11-19 13:45:04 -06:00
GoldenTails 12ac096a95 Add a menu option for aPNG downscaling. 2020-11-19 13:45:04 -06:00
Jaime Ita Passos 5e890ee6f8 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
lachwright bfbcc69108 Draw save files from outwards in 2020-10-31 18:21:14 +11:00
Jaime Passos b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
James R dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
James R be4c5751f8 Revert "Warn when going to OpenGL from the menu" 
This reverts commit 569453ee93.

And one line from b6089ccdaf.
 2020-10-02 15:37:23 -07:00
Lachlan Wright 86b7957b61 Merge branch 'clarity' into 'next' 
Add-on clarity from Kart

See merge request STJr/SRB2!1153
 2020-09-25 09:33:04 -04:00
Zippy_Zolton 62f379ec41 Add-on clarity from Kart 2020-09-20 13:07:28 -05:00
lachwright a78a0071f2 Save changes made to the bot's skin, and display it properly in save select 2020-09-17 19:00:49 +09:30
SteelT a033f482be Merge branch 'pictureformats' into 'next' 
PNG conversion refactoring

See merge request STJr/SRB2!675
 2020-09-10 15:58:18 -04:00
Jaime Passos dcaad758f4 Improved memory management for patches 2020-09-07 02:23:07 -03:00
James R c7c9ae3847 Disable update alert if this is a prerelease 2020-09-01 16:22:29 -07:00
James R a6e59cbb24 Do not do master server things when NOCURL 
(cherry picked from commit 7a05a8acf73ac0f012135339447c9a935e3b7939)
 2020-08-29 17:45:28 -07:00
James R 300436825d Cast UINT16 for unlockable_t.height -> alphaKey 2020-08-18 11:19:16 -07:00
James R beba43cffc Add a menu option for showjoinaddress 
I also had to make the "alphaKey" UINT16. Hopefully nothing breaks!
 2020-08-14 21:13:15 -07:00
Jaime Passos 78cc4a78d0 Refactor renderer switching 2020-08-14 22:27:16 -03:00
James R 3e8cf5ab06 Merge branch 'bt_spin' into 'next' 
Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request STJr/SRB2!982
 2020-08-09 21:03:17 -04:00
James R 23f218117c Merge branch 'http-mserv' into 'next' 
HTTP Based Master Server + Multithreading

See merge request STJr/SRB2!940
 2020-08-09 20:24:26 -04:00
James R 5153338bf5 Merge branch 'kill-dos' into 'next' 
Remove support for DOS

See merge request STJr/SRB2!1090
 2020-08-08 21:26:18 -04:00
James R 54e446199d Merge remote-tracking branch 'origin/next' into http-mserv 2020-08-08 15:05:03 -07:00
Jaime Passos 91ed56ef40 Refactor patch loading 2020-08-08 05:16:47 -03:00
James R 63b15f784f Merge branch 'musicpref-var' into 'next' 
Console variable to select music preference

See merge request STJr/SRB2!939
 2020-07-25 20:14:22 -04:00
Steel Titanium 0d48d4c833 WIP: Remove support for DOS 
WIP because I don't know if this wording is right for the error.
 2020-07-25 18:55:51 -04:00
Jaime Passos ca060a4372 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-21 22:25:00 -03:00
James R 93615b07be Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-13 08:58:43 -07:00
James R b9a24001d8 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
GoldenTails 999d8018ca Oops! Missed a couple... 2020-07-11 21:59:54 -05:00
James R 479bbeacbe Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
toaster 4c9cdcca0d Hopefully fix the issue, which I can't recreate, of live event backups being created even if they shouldn't. 2020-07-10 21:27:34 +01:00
toaster 1956e9e670 Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback. 2020-07-10 21:24:25 +01:00
toaster 274f649a02 M_RATHON header text. 2020-07-07 17:30:20 +01:00
Jaime Passos 7911deebf8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Jaime Passos 5c5d907251 gr_ -> gl_ 2020-07-06 01:15:08 -03:00
LJ Sonic 5ee94c8ce7 Merge branch 'patch-1' into 'next' 
Rename "Legacy" control scheme

See merge request STJr/SRB2!1029
 2020-07-04 06:50:15 -04:00
LJ Sonic 07bbebd9b0 Merge branch 'shift-when-hiding-in-1p-menu' into 'next' 
Tweak display of hidden items in "1 Player" menu

See merge request STJr/SRB2!1013
 2020-07-03 17:04:42 -04:00
colette 1cc2ab120d "Legacy controls" was a mistake of a name 2020-07-02 23:17:33 -04:00
Steel Titanium 612386aef0 Correct comment 2020-06-29 23:57:39 -04:00
Steel Titanium e641895268 Address compat with old-style names 2020-06-29 23:54:45 -04:00