thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-10 01:52:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
10464 commits 2 branches 14 tags 206 MiB
Commit graph

10464 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
Lachlan Wright
5263b8cf63 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
f9c3a93cf3 Merge branch 'dashmode-fixes' into 'next' 
Dashmode fixes

See merge request STJr/SRB2!909
 2020-06-08 05:25:30 -04:00
Lachlan Wright
d7e7d977e6 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
167e889046 Fix OPENMPT deprecation error, openmpt_module_ctl_set 2020-06-08 00:09:29 -04:00
mazmazz
b62497911c Fix OSX null-pointer-arithmetic error 2020-06-08 00:08:07 -04:00
Zachary McAlpin
5495fef76c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-07 22:42:43 -05:00