James R
|
8c3e2728d5
|
Merge branch 'gtr-fixes' into 'next'
Gametype fixes
See merge request STJr/SRB2!816
|
2020-06-24 23:01:11 -04:00 |
|
|
James R
|
067d9b9a63
|
Merge remote-tracking branch 'origin/next' into gtr-fixes
|
2020-06-24 19:31:19 -07:00 |
|
|
James R
|
207d8aee4b
|
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
|
95cc10d735
|
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
|
9eb8fd8ac8
|
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
|
2e827705b4
|
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
|
ac71bb76b6
|
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 |
|
|
Monster Iestyn
|
7d2de8394f
|
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
|
80e0d35391
|
Fix missing bruh string in lua side options. This is stupid.
|
2020-06-22 21:11:33 +02:00 |
|
|
sphere
|
e9e9cd6133
|
Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking.
|
2020-06-21 16:01:24 +02:00 |
|
|
Hannu Hanhi
|
f3212746d2
|
Don't repeatedly look for model texture files
|
2020-06-19 16:18:04 +03:00 |
|
|
lachwright
|
cab87b4632
|
lol should have tested before pushing
|
2020-06-19 15:59:09 +08:00 |
|
|
lachwright
|
47d9d87654
|
Fix the Eggman signpost's background color
|
2020-06-19 15:49:24 +08:00 |
|
|
Nev3r
|
8063814f1c
|
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
|
ffaffdf3e1
|
Faster and more correct OGL transparent surface sorting
|
2020-06-18 20:27:19 +03:00 |
|
|
Hannu Hanhi
|
9477d372b9
|
Backwards compatibility for shaderless hardware
|
2020-06-18 17:39:34 +03: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
Hannu Hanhi
|
0e521922c6
|
Change some unsigned ints to UINT32
|
2020-06-07 21:32:52 +03:00 |
|
|
Hannu Hanhi
|
abe13651d0
|
OpenGL draw call batching system
|
2020-06-07 21:20:52 +03:00 |
|
|
MascaraSnake
|
de7a806ec3
|
Merge branch 'nospinmovecut' into 'next'
Don't cut momentum if landing in a roll
See merge request STJr/SRB2!972
|
2020-06-07 13:24:19 -04:00 |
|
|
Hannu Hanhi
|
da98ea242e
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
|
SteelT
|
db32b01222
|
Merge branch 'renderstats' into 'sal-oglshaderport'
Render stats
See merge request STJr/SRB2!914
|
2020-06-07 12:29:58 -04:00 |
|
|
SteelT
|
176361de1e
|
Merge branch 'shader-skywalls' into 'sal-oglshaderport'
Fix outdated sky wall code in shader branch
See merge request STJr/SRB2!906
|
2020-06-07 12:28:07 -04:00 |
|
|
sphere
|
82200d80a9
|
Fix mouse being grabbed in the continue screen.
|
2020-06-07 00:40:33 +02:00 |
|