Sally Coolatta
|
0dc21106e5
|
Lua stuff is done
|
2020-08-15 07:47:18 -04:00 |
|
Sally Coolatta
|
f12501dfb6
|
SDL files
|
2020-08-15 06:02:39 -04:00 |
|
James R
|
4acc3e6d0c
|
Strip a few more instances of SONIC ROBO BLAST 2 KART
|
2020-08-14 22:18:51 -07:00 |
|
Jaime Passos
|
cb3660331a
|
Refactor renderer switching
|
2020-08-14 22:27:16 -03:00 |
|
James R
|
7be58ca3ee
|
Use AsciiChar to get the input from windows console window
|
2020-08-13 21:57:36 -07:00 |
|
Sally Coolatta
|
f9ca40e673
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
Sally Coolatta
|
7b4d84c3f3
|
Merge remote-tracking branch 'public/master'
|
2020-08-12 18:55:43 -04:00 |
|
SteelT
|
0fed8c2ee3
|
Merge sdl/hwsym_sdl.c
|
2020-08-10 15:28:15 -04:00 |
|
SteelT
|
fd000248b7
|
Merge sdl/i_video.c
|
2020-08-10 13:03:41 -04:00 |
|
James R
|
b771ff2426
|
Add http-mserv to fuck
(cherry picked from commit 8e493bddc3)
|
2020-08-09 23:34:16 -07:00 |
|
James R
|
8e493bddc3
|
Add http-mserv to fuck
|
2020-08-09 23:32:43 -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 |
|
Sally Coolatta
|
e296e1309a
|
YAY, round 2
|
2020-08-09 21:02:56 -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 |
|
Jaime Passos
|
a7f3dd7eff
|
Refactor patch loading
|
2020-08-08 05:16:47 -03:00 |
|
Jaime Passos
|
368e550ab1
|
Shader code cleanup
|
2020-08-07 18:17:05 -03:00 |
|
Steel Titanium
|
913c07959e
|
Kill CD support
|
2020-08-07 17:06:19 -04:00 |
|
James R
|
559029511b
|
Update sounds with correct volume
|
2020-08-07 13:10:13 -07:00 |
|
James R
|
aedc5ae7af
|
Kill MIDI more >:)
|
2020-08-07 13:00:04 -07:00 |
|
James R
|
9077a4ff03
|
Kill MIDI
|
2020-08-07 12:39:08 -07:00 |
|
James R
|
374d032a6b
|
Clean up stuff, make volume work again
|
2020-08-07 12:29:37 -07:00 |
|
James R
|
7adf2159f6
|
Reduce songs and sounds to 1/4 volume, add a musicdef option for volume
|
2020-08-06 21:24:41 -07: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 |
|
James R
|
0349cc4127
|
Merge remote-tracking branch 'origin/master' into http-mserv
|
2020-06-12 23:36:39 -07: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 |
|