Hannu Hanhi
|
ff9848befb
|
Better MF2_LINKDRAW support for OpenGL
|
2020-07-03 00:28:52 +03:00 |
|
James R
|
45c6018094
|
Merge branch 'gamequit-hook' into 'next'
GameQuit Hook
See merge request STJr/SRB2!847
|
2020-06-25 12:45:20 -04:00 |
|
Zachary McAlpin
|
fbe3c1a122
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-06-25 10:31:55 -05:00 |
|
James R
|
f2f68ca732
|
Merge branch 'ogl-sprite-qsort' into 'next'
Faster OGL sprite sorting algorithm
See merge request STJr/SRB2!1008
|
2020-06-24 23:22:06 -04:00 |
|
James R
|
22de612d65
|
Merge branch 'gtr-fixes' into 'next'
Gametype fixes
See merge request STJr/SRB2!816
|
2020-06-24 23:01:11 -04:00 |
|
James R
|
34eeb98cc4
|
Merge remote-tracking branch 'origin/next' into gtr-fixes
|
2020-06-24 19:31:19 -07: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
|
d5569c0924
|
Merge branch 'acz3-softlock-fix' into 'next'
ACZ3 softlock fix
See merge request STJr/SRB2!1015
|
2020-06-24 21:43:42 -04:00 |
|
James R
|
1a9b74a57c
|
Merge branch 'ogl-mdl-tex-repeat-search-fix' into 'next'
Don't repeatedly look for model texture files
See merge request STJr/SRB2!1009
|
2020-06-24 21:42:40 -04:00 |
|
James R
|
2a27e3839c
|
Merge branch 'fixeggsign' into 'next'
Fix the Eggman signpost's background color
See merge request STJr/SRB2!1007
|
2020-06-24 21:42:12 -04:00 |
|
James R
|
a3f9b9c302
|
Merge branch 'ogl-drawnode-fix' into 'next'
Faster and more correct OGL transparent surface sorting
See merge request STJr/SRB2!1005
|
2020-06-24 21:42:01 -04: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 |
|
Monster Iestyn
|
00f8c2ceff
|
Merge branch 'lua-side-enum-bruh' into 'next'
Fix missing bruh string in Lua side string options.
See merge request STJr/SRB2!1017
|
2020-06-22 15:23:34 -04:00 |
|
Latapostrophe
|
5d81856427
|
Fix missing bruh string in lua side options. This is stupid.
|
2020-06-22 21:11:33 +02:00 |
|
sphere
|
97ebb50e12
|
Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking.
|
2020-06-21 16:01:24 +02:00 |
|
Hannu Hanhi
|
20447c68a5
|
Don't repeatedly look for model texture files
|
2020-06-19 16:18:04 +03:00 |
|
Hannu Hanhi
|
75da8067dc
|
Faster OGL sprite sorting algorithm
|
2020-06-19 14:32:34 +03:00 |
|
lachwright
|
c54cb042ba
|
lol should have tested before pushing
|
2020-06-19 15:59:09 +08:00 |
|
lachwright
|
e1a8ea7663
|
Fix the Eggman signpost's background color
|
2020-06-19 15:49:24 +08:00 |
|
Nev3r
|
6f8a7da0a4
|
Merge branch 'shaderless-support-next' into 'next'
Backwards compatibility for shaderless hardware
See merge request STJr/SRB2!1003
|
2020-06-18 13:49:09 -04:00 |
|
Hannu Hanhi
|
b6ea242ba3
|
Faster and more correct OGL transparent surface sorting
|
2020-06-18 20:27:19 +03:00 |
|
Hannu Hanhi
|
a5f4c3eeb0
|
Backwards compatibility for shaderless hardware
|
2020-06-18 17:39:34 +03:00 |
|
SteelT
|
dbd5198ac2
|
Merge branch 'marathonmode' into 'next'
MARATHON RUN
See merge request STJr/SRB2!941
|
2020-06-17 19:36:10 -04:00 |
|
SteelT
|
91f8b95a2a
|
Merge branch 'sal-oglshaderport' into 'next'
OpenGL shaders
See merge request STJr/SRB2!724
|
2020-06-17 18:53:04 -04:00 |
|
Steel Titanium
|
12e85f54a1
|
A even more better fix for this
|
2020-06-17 18:40:56 -04:00 |
|
Steel Titanium
|
e5f704192e
|
Better fix for may be used uninitialized, maybe fixes GCC 4.x
|
2020-06-17 18:23:54 -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 |
|
Steel Titanium
|
e247ef0251
|
Fix facecolor may be used uninitialized.
|
2020-06-17 14:09:49 -04:00 |
|
Zachary McAlpin
|
8376c8e987
|
I forgot to pop the error handler
|
2020-06-12 07:50:57 -05: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 |
|
Nev3r
|
ef7a95e7d7
|
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
|
2986739fd7
|
Merge branch 'master' into next
|
2020-06-11 20:11:26 -04:00 |
|
SteelT
|
9e85267b36
|
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
|
75932c45d4
|
Updated LUAh_GameQuit to use new error handler
|
2020-06-11 15:11:01 -05: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 |
|
LJ Sonic
|
4eb8b25d1f
|
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 |
|
LJ Sonic
|
3203d4a62e
|
Merge branch 'next' into 'better-download'
# Conflicts:
# src/d_clisrv.c
|
2020-06-10 07:57:49 -04:00 |
|
LJ Sonic
|
5e7ffb055f
|
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
|
3a8e053d9d
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-06-09 19:54:47 -05:00 |
|
Steel Titanium
|
2b1b7b763f
|
Fix these "may be used uninitialized in this function" errors with batching
|
2020-06-08 20:18:32 -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 |
|
SteelT
|
025b883eb0
|
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
|
7e5a09ee3b
|
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 |
|
Digiku
|
cb99260b8a
|
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
|
885350dc9c
|
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 |
|