Commit graph

10541 commits

Author SHA1 Message Date
Zippy_Zolton
74ece42ee2 Jet Jaw Sounds 2020-06-25 00:38:07 -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
toaster
3b3256be8f Special saves!
All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts.

Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear...

One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 19:00:47 +01:00
GoldenTails
40520302cd More people ought to know what modulo is...
Or modulous if your prefer.
2020-06-22 04:14:42 -05:00
GoldenTails
5942c4f7b8 Stop resetting cusval cause that's annoying 2020-06-21 23:21:42 -05:00
GoldenTails
2d937925f8 Make it so Linedef type 422 instead sets cusval when the titlemap is in action.
I have no idea why it wasn't like this before, but oh well.
2020-06-21 22:20:06 -05:00
Zwip-Zwap Zapony
fa9a140a45 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
97ebb50e12 Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking. 2020-06-21 16:01:24 +02:00
Zwip-Zwap Zapony
940689d3ae 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
86022608d2 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
f3a9ba447b t_lspr 2020-06-20 14:16:22 -05:00
Zippy_Zolton
9c194f4186 Thanks for the feedback, I have fixed your issues. 2020-06-20 02:04:18 -05:00
Zippy_Zolton
50f51715a7 New Debris for CEZ3 2020-06-20 02:02:13 -05:00
kaysrishaq
18281fd511 Whoops, switched these for no reason 2020-06-19 11:11:19 -04:00
kaysrishaq
6f859fd44d FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements) 2020-06-19 11:11:18 -04: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
kaysrishaq
248cd81ee9 brak missile fix, pw_ignorelatch, small Recycler fix 2020-06-18 17:09:29 -04: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
lachwright
575fafedaa Fix Dragonbomber z positioning 2020-06-19 00:52:24 +08:00
Hannu Hanhi
a5f4c3eeb0 Backwards compatibility for shaderless hardware 2020-06-18 17:39:34 +03:00
James R
6cddbf7afb Forgot a comma 2020-06-17 22:58:11 -07:00
James R
2a059632a1 Makefile: Move the PREFIX stuff up so version detection can take advantage of 2020-06-17 22:52:19 -07:00
James R
9963d38ce2 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
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
lachwright
47b9a296b3 Whoops, forgot hu_stuff.c 2020-06-17 05:27:42 +08:00
lachwright
ab7b4a29e5 Add SF_NOSUPERSPRITES 2020-06-17 04:53:42 +08:00
lachwright
2215505c2b Merge branch 'next' into more-platform-fixes 2020-06-17 01:53:19 +08:00