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 |
|
Steel Titanium
|
2986739fd7
|
Merge branch 'master' into next
|
2020-06-11 20:11:26 -04:00 |
|
LJ Sonic
|
3203d4a62e
|
Merge branch 'next' into 'better-download'
# Conflicts:
# src/d_clisrv.c
|
2020-06-10 07:57:49 -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
|
167e889046
|
Fix OPENMPT deprecation error, openmpt_module_ctl_set
|
2020-06-08 00:09:29 -04:00 |
|
sphere
|
de73af46e2
|
Fix mouse being grabbed in the continue screen.
|
2020-06-07 00:40:33 +02:00 |
|
Monster Iestyn
|
4aa626eeda
|
Merge branch 'master' into next
|
2020-06-06 20:50:12 +01:00 |
|
Monster Iestyn
|
0dd462c17c
|
use void rather than VOID, because the logging init code isn't exclusively Win32, whoops
|
2020-06-06 20:49:12 +01:00 |
|
Monster Iestyn
|
3a7417c8fe
|
Merge branch 'master' into next
|
2020-06-06 20:35:48 +01:00 |
|
Monster Iestyn
|
b493010b5e
|
Merge branch 'cppcheck-fixes' into 'master'
Cppcheck fixes
See merge request STJr/SRB2!967
|
2020-06-06 15:28:48 -04:00 |
|
Monster Iestyn
|
fedbac6f64
|
Merge branch 'master' into next
|
2020-06-06 17:39:43 +01:00 |
|
Monster Iestyn
|
7dd0ba0f45
|
added liolib.c to the VC10 project files, since it was missing from them
|
2020-06-06 17:38:35 +01:00 |
|
Monster Iestyn
|
d6ef2625f5
|
sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
c90b8c583b
|
sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code
|
2020-06-03 20:47:49 +01:00 |
|
LJ Sonic
|
05e8d12427
|
Merge branch 'next' into 'better-download'
# Conflicts:
# src/sdl/i_system.c
# src/win32/win_sys.c
|
2020-06-01 08:16:53 -04:00 |
|
SwitchKaze
|
afe56667b8
|
Update to 2.2.4
|
2020-05-22 16:47:51 -05:00 |
|
Louis-Antoine
|
362adf4576
|
Allow resuming the most recent file transfer
|
2020-05-19 11:28:24 +02:00 |
|
MascaraSnake
|
7ea005fdc1
|
Merge branch 'fix-window-icon' into 'master'
Fix window icon being reset when switching renderers on non-Windows platforms
See merge request STJr/SRB2!898
|
2020-05-13 04:14:51 -04:00 |
|
James R
|
ffd88746da
|
Update version names, SUBVERSION, MODVERSION
|
2020-05-11 14:41:36 -07:00 |
|
Monster Iestyn
|
398770b952
|
Fix logging on Mac
These fixes were suggested by Sveciaost on #mac-users on Discord
|
2020-05-10 16:47:01 +01:00 |
|
Monster Iestyn
|
f218920395
|
Update version number to 2.2.3 in all the usual files, also updated MODVERSION
|
2020-05-10 16:02:23 +01:00 |
|
Steel Titanium
|
3a4a8cd948
|
Fix window icon being reset when switching renderers on non-Windows platforms
|
2020-04-26 18:46:43 -04:00 |
|
Louis-Antoine
|
71d445a59e
|
Fix mouse being grabbed in intermission and cutscenes
|
2020-04-24 18:33:35 +02:00 |
|
James R
|
81a01041e8
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-09 17:04:04 -07:00 |
|
James R
|
0b91ef071f
|
Merge branch 'sdlglcontext' into 'master'
Only initialise OpenGL if the user intends to load it (for real this time)
See merge request STJr/SRB2!796
|
2020-04-09 19:51:20 -04:00 |
|
Monster Iestyn
|
ffb2674a6e
|
Merge branch 'next' into demos-refactor
# Conflicts:
# src/g_game.c
(also update g_demo.c)
|
2020-03-20 17:48:31 +00:00 |
|
Monster Iestyn
|
8ae098a1e3
|
update Makefile, CMakeLists.txt and MSVC project files
|
2020-03-19 20:13:39 +00:00 |
|
Louis-Antoine
|
46df2b9551
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
Monster Iestyn
|
12468abff5
|
update Makefile, CMakeLists.txt and MSVC project files
|
2020-03-08 19:48:23 +00:00 |
|
SteelT
|
800d277dec
|
Merge branch 'fix-ogllib' into 'master'
Fix -OGLlib
See merge request STJr/SRB2!794
|
2020-03-02 15:21:50 -05:00 |
|
SwitchKaze
|
99a1840101
|
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
|
2020-02-23 11:50:13 -05:00 |
|
Steel Titanium
|
c7778af7d6
|
Update version number to 2.2.2
|
2020-02-22 16:37:13 -05:00 |
|
James Hale
|
51137837c4
|
Custom skincolors
|
2020-02-21 21:56:39 -05:00 |
|
James R
|
2274129f57
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Jaime Passos
|
f8f812be34
|
Set the palette :)
|
2020-02-17 22:31:34 -03:00 |
|
Jaime Passos
|
43abd53c55
|
Fix what !785 tried to fix, but correctly
|
2020-02-17 21:58:32 -03:00 |
|
Jaime Passos
|
fd23294cc4
|
Rename stuff around
|
2020-02-17 21:11:56 -03:00 |
|
Jaime Passos
|
f189e0425f
|
add -nogl parm
|
2020-02-17 12:14:51 -03:00 |
|
Jaime Passos
|
abd7c3e503
|
Don't center the window when changing renderers
|
2020-02-17 01:15:18 -03:00 |
|
Jaime Passos
|
21cdca5d6d
|
Don't call HWR_Switch twice
|
2020-02-17 01:15:11 -03:00 |
|
Jaime Passos
|
df19b64edd
|
Remove redundant check
|
2020-02-17 01:15:04 -03:00 |
|
Jaime Passos
|
e16173a82d
|
Always load the GL library!
|
2020-02-17 01:13:13 -03:00 |
|
Jaime Passos
|
88e99fed57
|
Only initialise OpenGL if you actually intend to use it.
|
2020-02-17 01:12:53 -03:00 |
|
Jaime Passos
|
edb7d20290
|
Missing comment
|
2020-02-17 01:08:55 -03:00 |
|
Jaime Passos
|
1d92fa38f6
|
Fallback to Software if the renderer version doesn't match
|
2020-02-17 01:08:41 -03:00 |
|
Jaime Passos
|
5c1b3baf18
|
Fix -OGLlib
|
2020-02-17 01:08:15 -03:00 |
|
Jaime Passos
|
1c48480944
|
Clear setrenderneeded after calling VID_CheckRenderer
|
2020-02-17 00:36:10 -03:00 |
|
Monster Iestyn
|
0a4a879b96
|
Updated version number to 2.2.1, increment MODVERSION.
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
|
2020-02-05 19:55:40 +00:00 |
|