LJ Sonic
|
38c7c718ac
|
Add rejointimeout to the server options
|
2021-02-15 16:23:57 +01:00 |
|
James R
|
ef3102e75a
|
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
|
55bc602dbd
|
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
|
956fd338f0
|
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
|
41f1b3b97c
|
Kill SEENAMES
|
2020-12-12 02:11:23 -08:00 |
|
Jaime Ita Passos
|
f928709fa5
|
Fix animated skincolors in OpenGL
|
2020-12-06 20:17:14 -03:00 |
|
GoldenTails
|
d8ab3a75ed
|
Remove the rest of the Playing() checks for GameQuit hook
|
2020-11-29 16:53:29 -06:00 |
|
GoldenTails
|
7c8a447d8f
|
Always call GameQuit when quitting via the Quit menu option on the title screen.
|
2020-11-29 08:32:04 -06:00 |
|
GoldenTails
|
ded87cb54c
|
Send a quitting argument to the GameQuit Lua hook
|
2020-11-29 08:30:50 -06:00 |
|
Nev3r
|
17955311b9
|
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
|
d673604b48
|
Split dehacked.c into multiple files.
|
2020-11-23 21:42:26 -06:00 |
|
Jaime Ita Passos
|
490758eac2
|
Remove SHORT macros for referencing patch width/height/offsets
|
2020-11-22 20:02:47 -03:00 |
|
GoldenTails
|
9f6a980c7b
|
Move the GIF downscaling menu option up one to create some parity.
|
2020-11-19 13:45:04 -06:00 |
|
GoldenTails
|
320b5db5eb
|
Add a menu option for aPNG downscaling.
|
2020-11-19 13:45:04 -06:00 |
|
Jaime Ita Passos
|
be274a4fa9
|
Merge branch 'next' into spritestuff2
|
2020-11-19 00:52:43 -03:00 |
|
lachwright
|
7be608c6aa
|
Draw save files from outwards in
|
2020-10-31 18:21:14 +11:00 |
|
Jaime Passos
|
b44837324f
|
Merge branch 'next' into patch-stuff-again-2
|
2020-10-10 17:01:10 -03:00 |
|
James R
|
b7c4a82a0f
|
Replace C90's junk with a modest macro
|
2020-10-06 23:04:23 -07:00 |
|
James R
|
e42eb9aba8
|
Revert "Warn when going to OpenGL from the menu"
This reverts commit 3883d44bb5.
And one line from 5c1b3baf18.
|
2020-10-02 15:37:23 -07:00 |
|
Lachlan Wright
|
1ec61bb8f4
|
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
|
bf857e1c59
|
Add-on clarity from Kart
|
2020-09-20 13:07:28 -05:00 |
|
lachwright
|
2d3eae9ee1
|
Save changes made to the bot's skin, and display it properly in save select
|
2020-09-17 19:00:49 +09:30 |
|
SteelT
|
6a168ac5e9
|
Merge branch 'pictureformats' into 'next'
PNG conversion refactoring
See merge request STJr/SRB2!675
|
2020-09-10 15:58:18 -04:00 |
|
Jaime Passos
|
98c6b54994
|
Improved memory management for patches
|
2020-09-07 02:23:07 -03:00 |
|
James R
|
a7d7933c5a
|
Disable update alert if this is a prerelease
|
2020-09-01 16:22:29 -07:00 |
|
James R
|
d31fb748b2
|
Do not do master server things when NOCURL
(cherry picked from commit b681b6e9e6)
|
2020-08-29 17:45:28 -07:00 |
|
James R
|
d082e42d48
|
Cast UINT16 for unlockable_t.height -> alphaKey
|
2020-08-18 11:19:16 -07:00 |
|
James R
|
c660a86b8d
|
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
|
cb3660331a
|
Refactor renderer switching
|
2020-08-14 22:27:16 -03:00 |
|
James R
|
0a85046b22
|
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
|
42dbdd8c4a
|
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
|
9955ff1357
|
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
|
2e3b0ae4c8
|
Merge remote-tracking branch 'origin/next' into http-mserv
|
2020-08-08 15:05:03 -07:00 |
|
Jaime Passos
|
a7f3dd7eff
|
Refactor patch loading
|
2020-08-08 05:16:47 -03:00 |
|
James R
|
38d9fddac2
|
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
|
62c85ea4a5
|
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
|
10189ecdc0
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-21 22:25:00 -03:00 |
|
James R
|
47719474ef
|
Merge remote-tracking branch 'origin/next' into http-mserv
|
2020-07-13 08:58:43 -07:00 |
|
James R
|
e09a430804
|
Merge remote-tracking branch 'origin/next' into remove-glide-2
|
2020-07-12 16:05:15 -07:00 |
|
GoldenTails
|
50fd9de9d8
|
Oops! Missed a couple...
|
2020-07-11 21:59:54 -05:00 |
|
James R
|
84d9aa93c7
|
Merge remote-tracking branch 'origin/next' into http-mserv
|
2020-07-11 17:41:46 -07:00 |
|
toaster
|
517b243cb7
|
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
|
3c3143effa
|
Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback.
|
2020-07-10 21:24:25 +01:00 |
|
toaster
|
0f1280025d
|
M_RATHON header text.
|
2020-07-07 17:30:20 +01:00 |
|
Jaime Passos
|
c385eca5d2
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-06 19:29:14 -03:00 |
|
Jaime Passos
|
615c7121ed
|
gr_ -> gl_
|
2020-07-06 01:15:08 -03:00 |
|
LJ Sonic
|
79857ea9e8
|
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
|
e4b5d85f31
|
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
|
da537d8695
|
"Legacy controls" was a mistake of a name
|
2020-07-02 23:17:33 -04:00 |
|
Steel Titanium
|
db559d73d0
|
Correct comment
|
2020-06-29 23:57:39 -04:00 |
|