Zwip-Zwap Zapony
ae474b6945
Fix re-opening 1 Player menu re-lowering options
...
If an add-on disabled an option, re-opening the 1 Player menu
multiple times would lower the above options multiple times
Also fix Marathon Run and Tutorial being "perma-(un)lock"-able
2020-06-21 16:16:12 +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
Zwip-Zwap Zapony
5655db11ab
Tweak display of hidden items in "1 Player" menu
...
If an option in the "1 Player" menu is unavailable in an add-on,
lower the above options to close the gap from the invisible option
Also make Marathon Run display as question marks if locked
And also change "sploadgame" to "spstartgame"
2020-06-21 09:30:55 +02:00
Louis-Antoine
65054bd0aa
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into increase-input-buffer-more
2020-06-21 01:20:39 +02:00
Zippy_Zolton
ca7fc22388
t_lspr
2020-06-20 14:16:22 -05:00
James R
7ec0b6c792
I meant consvar_number_of_netids to be exclusive :V
2020-06-20 00:53:51 -07:00
Zippy_Zolton
fc68134938
Thanks for the feedback, I have fixed your issues.
2020-06-20 02:04:18 -05:00
Zippy_Zolton
bfa1382736
New Debris for CEZ3
2020-06-20 02:02:13 -05:00
James R
3e52764935
Actually print a warning if the old demo id collides
2020-06-19 19:59:14 -07:00
James R
db34d70faa
Cvar compatibility with older demos
2020-06-19 18:04:20 -07:00
James R
32134a01fe
Save cvar names in demos; refactor cvar loading
2020-06-19 17:58:42 -07:00
James R
32773b71e0
Use ordered ids instead of hashes for cvar netid
...
Originally 6acd99c0a4
2020-06-19 16:36:36 -07:00
kaysrishaq
c74a607c54
Whoops, switched these for no reason
2020-06-19 11:11:19 -04:00
kaysrishaq
cad1f57b1e
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-19 11:11:18 -04:00
Hannu Hanhi
f3212746d2
Don't repeatedly look for model texture files
2020-06-19 16:18:04 +03:00
Hannu Hanhi
6f9b9aacf4
Faster OGL sprite sorting algorithm
2020-06-19 14:32:34 +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
kaysrishaq
682791a024
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 17:09:29 -04: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
lachwright
7b2e54b426
Fix Dragonbomber z positioning
2020-06-19 00:52:24 +08:00
Hannu Hanhi
9477d372b9
Backwards compatibility for shaderless hardware
2020-06-18 17:39:34 +03:00
James R
193c45aa2f
Forgot a comma
2020-06-17 22:58:11 -07:00
James R
489bb81d00
Makefile: Move the PREFIX stuff up so version detection can take advantage of
2020-06-17 22:52:19 -07:00
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
