thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-12 06:06:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11044 commits 2 branches 14 tags 206 MiB
Commit graph

862 commits

Author SHA1 Message Date
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
lachwright
6fa06c4523 Update ICNS icon for macOS 
Replaced some of the lower resolution variants with some smoother downscales. The 16x16 one is even Sonic's 1-up icon from the game!
 2020-10-01 02:47:24 +10:00
SteelT
6a168ac5e9 Merge branch 'pictureformats' into 'next' 
PNG conversion refactoring

See merge request STJr/SRB2!675
 2020-09-10 15:58:18 -04:00
James R
d78befc713 Merge branch 'master' into next 2020-08-31 16:10:05 -07:00
James R
e4b7257ec9 Fix NOHW compiling 2020-08-31 16:09:41 -07:00
James R
7cbc9add07 Kill NOHS 
(cherry picked from commit a79316b375)
 2020-08-31 16:06:40 -07:00
James R
1818693d71 Fix NOGME compiling 
(cherry picked from commit d52a35e5b6)
 2020-08-31 16:04:09 -07:00
James R
288a6c1431 Merge branch 'fix-file-downloading' into 'next' 
Fix bug where SRB2 would check size of disk from current directory instead of srb2home

See merge request STJr/SRB2!1121
 2020-08-19 18:16:22 -04:00
GoldenTails
2a27628232 Fix bug where SRB2 would check size of current directory instead of srb2home 
Hopefully that fixes that one bug with weird filesize issues too
 2020-08-18 17:34:32 -05:00
James R
4acc3e6d0c Strip a few more instances of SONIC ROBO BLAST 2 KART 2020-08-14 22:18:51 -07:00
James R
b771ff2426 Add http-mserv to fuck 
(cherry picked from commit 8e493bddc3)
 2020-08-09 23:34:16 -07:00
James R
fa18f819b0 Merge branch 'clipboard-crash-fix-2' into 'next' 
Fix buffer overrun in I_ClipboardPaste (resolves #205)

Closes #205

See merge request STJr/SRB2!1105
 2020-08-09 21:06:18 -04:00
James R
f9e74e8ba2 Merge branch 'kill-cd-support' into 'next' 
Kill CD support

See merge request STJr/SRB2!1102
 2020-08-09 20:48:25 -04:00
James R
2e3b0ae4c8 Merge remote-tracking branch 'origin/next' into http-mserv 2020-08-08 15:05:03 -07:00
Jaime Passos
ed068a7664 Fix buffer overrun in I_ClipboardPaste 2020-08-08 15:36:01 -03:00
Steel Titanium
913c07959e Kill CD support 2020-08-07 17:06:19 -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
95a6e194e1 Merge remote-tracking branch 'origin/master' into next 2020-07-16 19:00:21 -07:00
James R
47719474ef Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-13 08:58:43 -07:00
James R
6efedfc756 Merge remote-tracking branch 'origin/master' into cmake-adjustments 2020-07-12 16:24:24 -07:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
James R
84d9aa93c7 Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
Steel Titanium
b53e6e834d Update version number 2020-07-10 17:29:03 -04:00
SteelT
5242d77c12 Merge branch '225-prep' into 'next' 
2.2.5 preparation

See merge request STJr/SRB2!1039
 2020-07-07 14:55:06 -04:00
Lachlan Wright
a050f04cd0 Merge branch 'remove-tricks' into 'next' 
Remove Software tricks

See merge request STJr/SRB2!1036
 2020-07-07 13:47:33 -04:00
Steel Titanium
d53d65b798 Update the version number 2020-07-06 21:29:02 -04:00
Jaime Passos
c385eca5d2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Steel Titanium
29d6b5c758 Merge branch 'master' into next 2020-07-06 12:13:00 -04:00
Jaime Passos
9788afa820 Remove Software tricks 2020-07-06 01:26:56 -03:00
Jaime Passos
abc4f22a3e Delete hw_glide.h 2020-07-06 00:27:34 -03:00
Zachary McAlpin
bad02950e8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-24 20:55:08 -05:00
James R
0dcba91c4f Merge branch 'gme-cleanup-fixes' into 'next' 
GME cleanup and fixes

See merge request STJr/SRB2!1001
 2020-06-24 21:41:49 -04:00
Zachary McAlpin
feb56fc3b6 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-24 19:47:52 -05:00
SteelT
dbd5198ac2 Merge branch 'marathonmode' into 'next' 
MARATHON RUN

See merge request STJr/SRB2!941
 2020-06-17 19:36:10 -04:00
Steel Titanium
06f76f07f4 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
 2020-06-17 18:15:07 -04:00
Steel Titanium
55bace797f Use SAMPLERATE for consistency with the rest of the code 2020-06-17 14:50:22 -04:00
Steel Titanium
26a2677863 Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong 2020-06-17 14:31:49 -04:00
Steel Titanium
aab378fe1a Reduce code duplication by creating get_zlib_error function 
Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong
Return false if it fails to decompress VGZ data in some form.
 2020-06-17 14:19:19 -04:00
Zachary McAlpin
1ed6d49931 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-12 07:32:44 -05:00
Steel Titanium
2986739fd7 Merge branch 'master' into next 2020-06-11 20:11:26 -04:00
Zachary McAlpin
1b831c0bbe Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-11 15:02:31 -05:00
lachwright
62183201c9 Allow macOS builds to be launched through Steam 2020-06-12 01:19:06 +08:00
LJ Sonic
3203d4a62e Merge branch 'next' into 'better-download' 
# Conflicts:
#   src/d_clisrv.c
 2020-06-10 07:57:49 -04:00
Zachary McAlpin
3a8e053d9d Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-09 19:54:47 -05:00
mazmazz
121d4c87e3 CMAKE: Fix toggle fullscreen breakage due to missing define 
This is lazy. The correct solution is to eliminate the define in the program code
 2020-06-09 17:32:14 -04:00
Steel Titanium
468a9b96b7 Fix no previous prototype for TimeFunction 2020-06-08 19:56:24 -04:00
Steel Titanium
b8bbf5d9f4 Merge branch 'next' into sal-oglshaderport 2020-06-08 19:36:23 -04:00
mazmazz
0ce8bdaea1 Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments 2020-06-08 11:57:57 -04:00
Lachlan Wright
d7e7d977e6 Merge branch 'fix-continuing-mouse' into 'next' 
Fix mouse being grabbed in continue screen

See merge request STJr/SRB2!983
 2020-06-08 05:25:24 -04:00
mazmazz
29c66c579c CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package 2020-06-08 00:38:13 -04:00