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 |
|
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 |
|
Sally Coolatta
|
3e36e15628
|
Merge master
|
2020-06-08 00:52:37 -04:00 |
|
mazmazz
|
29c66c579c
|
CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package
|
2020-06-08 00:38:13 -04:00 |
|
mazmazz
|
167e889046
|
Fix OPENMPT deprecation error, openmpt_module_ctl_set
|
2020-06-08 00:09:29 -04:00 |
|
mazmazz
|
502de28d38
|
CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo
|
2020-06-08 00:01:15 -04:00 |
|
mazmazz
|
c74eed0a2c
|
Added SDL Mixer X to CMAKE (Windows only)
|
2020-06-08 00:01:15 -04:00 |
|
Zachary McAlpin
|
5495fef76c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-06-07 22:42:43 -05:00 |
|
Hannu Hanhi
|
8ea66e3813
|
OpenGL draw call batching system
|
2020-06-07 21:20:52 +03:00 |
|
Hannu Hanhi
|
6961bba693
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|