James R
|
bf90fbb91f
|
Detect the compiler version and set the correct GCC flag
If the version is not supported by the Makefile, the flag for the latest
version supported is set instead.
|
2020-06-17 22:49:12 -07:00 |
|
SteelT
|
bff6b19056
|
Merge branch 'marathonmode' into 'next'
MARATHON RUN
See merge request STJr/SRB2!941
|
2020-06-17 19:36:10 -04:00 |
|
SteelT
|
5a52f9cbf4
|
Merge branch 'sal-oglshaderport' into 'next'
OpenGL shaders
See merge request STJr/SRB2!724
|
2020-06-17 18:53:04 -04:00 |
|
Steel Titanium
|
8365d975d3
|
A even more better fix for this
|
2020-06-17 18:40:56 -04:00 |
|
Steel Titanium
|
1e655fb2c1
|
Better fix for may be used uninitialized, maybe fixes GCC 4.x
|
2020-06-17 18:23:54 -04:00 |
|
Steel Titanium
|
3946309ece
|
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
|
5708325d2b
|
Use SAMPLERATE for consistency with the rest of the code
|
2020-06-17 14:50:22 -04:00 |
|
Steel Titanium
|
f626b9f4d9
|
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
|
a34be0e370
|
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
|
d3d5496a78
|
Fix facecolor may be used uninitialized.
|
2020-06-17 14:09:49 -04:00 |
|
lachwright
|
7d92631d97
|
Whoops, forgot hu_stuff.c
|
2020-06-17 05:27:42 +08:00 |
|
lachwright
|
edfd64877c
|
Add SF_NOSUPERSPRITES
|
2020-06-17 04:53:42 +08:00 |
|
lachwright
|
e403de7459
|
Merge branch 'next' into more-platform-fixes
|
2020-06-17 01:53:19 +08:00 |
|
lachwright
|
29738fcdd0
|
Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain
|
2020-06-17 01:46:36 +08:00 |
|
lachwright
|
38e2c999c5
|
Platform fixes
|
2020-06-14 12:17:30 +08:00 |
|
Zachary McAlpin
|
6eccc7030d
|
I forgot to pop the error handler
|
2020-06-12 07:50:57 -05:00 |
|
Zachary McAlpin
|
965d42f974
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-06-12 07:32:44 -05:00 |
|
Nev3r
|
2322644488
|
Merge branch 'dofile' into 'next'
Add dofile() to Lua
See merge request STJr/SRB2!969
|
2020-06-12 02:32:16 -04:00 |
|
Steel Titanium
|
b056bf1d6c
|
Merge branch 'master' into next
|
2020-06-11 20:11:26 -04:00 |
|
SteelT
|
c810ea3945
|
Merge branch 'next-lc-uint16' into 'next'
Custom skincolor bugfixes
See merge request STJr/SRB2!971
|
2020-06-11 20:08:50 -04:00 |
|
Zachary McAlpin
|
0d70e16b0b
|
Updated LUAh_GameQuit to use new error handler
|
2020-06-11 15:11:01 -05:00 |
|
Zachary McAlpin
|
08e9efee76
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-06-11 15:02:31 -05:00 |
|
lachwright
|
fad82265e0
|
Allow macOS builds to be launched through Steam
|
2020-06-12 01:19:06 +08:00 |
|
LJ Sonic
|
38a8fe2baa
|
Merge branch 'better-download' into 'next'
Improvements to the in-game file downloader
See merge request STJr/SRB2!976
|
2020-06-11 13:02:13 -04:00 |
|
mazmazz
|
8fc414536f
|
CMAKE: Move launch-c into more sensible location
|
2020-06-10 15:08:09 -04:00 |
|
LJ Sonic
|
7ffee074d8
|
Merge branch 'next' into 'better-download'
# Conflicts:
# src/d_clisrv.c
|
2020-06-10 07:57:49 -04:00 |
|
LJ Sonic
|
bc2edb2ae4
|
Merge branch 'snake' into 'next'
Add a Snake minigame to the file transfer screen
See merge request STJr/SRB2!903
|
2020-06-10 07:38:37 -04:00 |
|
Zachary McAlpin
|
291479e3e8
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-06-09 19:54:47 -05:00 |
|
mazmazz
|
46b383acda
|
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 |
|
MascaraSnake
|
a76c8af60c
|
Compiling fix
|
2020-06-09 22:10:02 +02:00 |
|
mazmazz
|
36e17006b7
|
CMAKE: Fix OS X ccache scripts
|
2020-06-09 11:12:52 -04:00 |
|
MascaraSnake
|
d07c376f6d
|
Adapt POF_SPLAT to UDMF setup
|
2020-06-09 09:44:49 +02:00 |
|
MascaraSnake
|
4a0206b38d
|
Merge branch 'next' into udmf-next
# Conflicts:
# src/p_mobj.c
# src/p_polyobj.c
|
2020-06-09 09:38:01 +02:00 |
|
Steel Titanium
|
2abdc86537
|
Fix these "may be used uninitialized in this function" errors with batching
|
2020-06-08 20:18:32 -04:00 |
|
Steel Titanium
|
3dd89f67fa
|
Fix no previous prototype for TimeFunction
|
2020-06-08 19:56:24 -04:00 |
|
Steel Titanium
|
62d73968e2
|
Merge branch 'next' into sal-oglshaderport
|
2020-06-08 19:36:23 -04:00 |
|
SteelT
|
ce17cc4855
|
Merge branch 'ogl-batching' into 'sal-oglshaderport'
OpenGL draw call batching
See merge request STJr/SRB2!986
|
2020-06-08 18:10:18 -04:00 |
|
SteelT
|
405f1550a5
|
Merge branch 'shaders-224-next-merge' into 'sal-oglshaderport'
Shaders next merge
See merge request STJr/SRB2!985
|
2020-06-08 18:07:53 -04:00 |
|
mazmazz
|
01ff46326f
|
Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments
|
2020-06-08 11:57:57 -04:00 |
|
Digiku
|
70eb5ba634
|
Merge branch 'buffer-offset-fix' into 'master'
Strike null-pointer-arithmetic error in BUFFER_OFFSET
See merge request STJr/SRB2!989
|
2020-06-08 11:56:48 -04:00 |
|
Digiku
|
a41e68362e
|
Merge branch 'openmpt-deprecated-fix' into 'master'
Fix OPENMPT deprecation error, openmpt_module_ctl_set
See merge request STJr/SRB2!990
|
2020-06-08 10:37:46 -04:00 |
|
Lachlan Wright
|
191e2e094d
|
Merge branch 'fix-spawn-desynch' into 'next'
Fix desynch when a player spawns
See merge request STJr/SRB2!977
|
2020-06-08 05:25:41 -04:00 |
|
Lachlan Wright
|
614a98bd9d
|
Merge branch 'dashmode-fixes' into 'next'
Dashmode fixes
See merge request STJr/SRB2!909
|
2020-06-08 05:25:30 -04:00 |
|
Lachlan Wright
|
590dfca582
|
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
|
f3c1db0650
|
CMAKE: Fix OSX CCache error
|
2020-06-08 03:08:58 -04:00 |
|
mazmazz
|
efba50c83c
|
CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package
|
2020-06-08 00:38:13 -04:00 |
|
mazmazz
|
aef9a1b522
|
CMAKE: Add CCACHE support
|
2020-06-08 00:35:31 -04:00 |
|
mazmazz
|
a5f7f9a534
|
Fix OPENMPT deprecation error, openmpt_module_ctl_set
|
2020-06-08 00:09:29 -04:00 |
|
mazmazz
|
2cefe82950
|
Fix OSX null-pointer-arithmetic error
|
2020-06-08 00:08:07 -04:00 |
|
mazmazz
|
c63ead5abb
|
CMAKE: Configurable CPACK generator
|
2020-06-08 00:01:15 -04:00 |
|