thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-09 16:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8177 commits 2 branches 14 tags 206 MiB
Commit graph

8177 commits

This branch
This branch
All branches
Author SHA1 Message Date
MascaraSnake
460f832932 Merge branch 'notutclear' into 'master' 
Fix clearing maps/unlockables causing crashes and hangs.

See merge request STJr/SRB2Internal!609
 2019-12-05 17:02:10 -05:00
MascaraSnake
2f1e17da56 Merge branch 'nightslevsel' into 'master' 
NiGHTS Attack left-right level selection

See merge request STJr/SRB2Internal!608
 2019-12-05 16:53:21 -05:00
MascaraSnake
1f5ed0884c Merge branch 'wordwrapfix' into 'master' 
Fix V_WordWrap and the new additional text colour codes.

See merge request STJr/SRB2Internal!612
 2019-12-05 16:32:30 -05:00
MascaraSnake
21aa6fe3e7 Merge branch 'tailsbubblefix' into 'master' 
Tails Bubble Fix

See merge request STJr/SRB2Internal!606
 2019-12-05 16:20:24 -05:00
MascaraSnake
5e8f7886cd Merge branch 'paperfix2' into 'master' 
Another potential papersprite crash fix

Closes #456

See merge request STJr/SRB2Internal!605
 2019-12-05 16:19:33 -05:00
Alam Ed Arias
95010fd2c2 Merge branch 'MSVC_fixes' into 'master' 
Msvc fixes

See merge request STJr/SRB2Internal!610
 2019-12-05 15:51:59 -05:00
Alam Ed Arias
ef5b680011 frameFrame is unsigned, let set it to 0xFF 2019-12-05 15:50:44 -05:00
toaster
444ac16839 Fix V_WordWrap and the new additional text colour codes. 2019-12-05 19:43:37 +00:00
toaster
8276cbc04c Fix unlockable checklist literally hanging if any unlockables are cleared. 2019-12-05 18:40:30 +00:00
Alam Ed Arias
c87acdeac1 Fix compiling Mingw binaries on an Unix host 2019-12-05 12:50:14 -05:00
Alam Ed Arias
8a37eaeaa0 Fix compiling for MSVC 2019-12-05 12:38:50 -05:00
Alam Ed Arias
ed33758b5f Fix building libpng and zlib with MSVC 2019-12-05 12:33:18 -05:00
Alam Ed Arias
c1b29fb1a1 Merge branch 'public_next' into private 2019-12-05 11:18:33 -05:00
Alam Ed Arias
8d11557eed Merge branch 'master' into next 2019-12-05 10:52:17 -05:00
Alam Ed Arias
2982082dbf Fix building with MSVC 2019-12-05 10:51:55 -05:00
toaster
20cf020458 Fix clearing maps making the Tutorial option on the SP menu crash. 2019-12-05 13:42:08 +00:00
toaster
dbe1d4ebc5 Allow the NiGHTS Attack menu to have the levels selectable left-and-right-wise, just like Record Attack. 2019-12-05 11:12:35 +00:00
toaster
8c2d889157 Make Tails' "I'll give you a hand!" bubble a hnext chain instead of a target set, which is way less likely to be clobbered in standard gameplay. 
Should resolve both #440 and #458, which are two sides of the same issue - target being overwritten.
 2019-12-05 09:36:58 +00:00
toaster
2fec610328 Another potential papersprite crash fix, but way more confident about this one. 2019-12-05 09:28:28 +00:00
MascaraSnake
0058b92a8c Merge branch 'minusoneframes' into 'master' 
Minus One Frames

See merge request STJr/SRB2Internal!593
 2019-12-04 17:15:51 -05:00
MascaraSnake
3ee7b0e944 Merge branch 'freemipmapcolormap-momento-irmao' into 'master' 
Fix FreeMipmapColormap yet again

See merge request STJr/SRB2Internal!597
 2019-12-04 17:10:06 -05:00
MascaraSnake
4b6b39956d Merge branch 'timeoverrings' into 'master' 
Time Over rings (resolves #446).

Closes #446

See merge request STJr/SRB2Internal!596
 2019-12-04 17:09:32 -05:00
MascaraSnake
0dd9a3a58b Merge branch 'nullplayerslopelaunch' into 'master' 
Fix slope launch with NULL player causing SIGSEGV.

See merge request STJr/SRB2Internal!595
 2019-12-04 17:07:04 -05:00
MascaraSnake
2908335e17 Merge branch 'tokenultimate' into 'master' 
Fix tokens not spawning in ultimate mode

See merge request STJr/SRB2Internal!594
 2019-12-04 17:06:43 -05:00
MascaraSnake
731d839f5f Merge branch 'credits-update' into 'master' 
Credits update

See merge request STJr/SRB2Internal!484
 2019-12-04 16:59:46 -05:00
MascaraSnake
be59b0187a Merge branch 'have_png-compile-fix' into 'master' 
NO_PNG_LUMPS compile fix

See merge request STJr/SRB2Internal!598
 2019-12-04 16:59:13 -05:00
MascaraSnake
d2dc9f4be0 Merge branch 'spsmshgular' into 'master' 
sfx_spsmsh (hhz spikeball) is now singular

Closes #451

See merge request STJr/SRB2Internal!599
 2019-12-04 16:58:56 -05:00
toaster
8fd8f56832 sfx_spsmsh (hhz spikeball) is now singular 2019-12-04 20:32:46 +00:00
Jaime Passos
eb18ee8a97 Fix FreeMipmapColormap yet again 2019-12-04 15:50:17 -03:00
Jaime Passos
34436fa87b Merge remote-tracking branch 'origin/master' into have_png-compile-fix 2019-12-04 15:44:12 -03:00
Alam Ed Arias
713935ad88 Someone wants PNGLCONF_H 2019-12-04 13:42:14 -05:00
Jaime Passos
64f6f5a84a fix Ploadflat warning 2019-12-04 15:41:29 -03:00
Jaime Passos
3b2b84ce24 fix ErrorIfPNG errors 2019-12-04 15:26:51 -03:00
toaster
61262ad228 Make rings 0 in competition winner selection if you gamed or timed over, and use the MAXSCORE macro instead of a hardcoded value. 2019-12-04 17:32:47 +00:00
Alam Ed Arias
c46640b940 change from shifting bits to multi for a OLD video function marco 2019-12-04 10:43:33 -05:00
Alam Ed Arias
bbce679a73 Libs: move pngconf.h out of top level libpng source folder 2019-12-04 10:41:54 -05:00
toaster
415e172059 Fix slope launch with NULL player causing SIGSEGV. 2019-12-04 12:13:27 +00:00
Steel Titanium
63980dce60 Merge branch 'fade-timeout-fix' into 'master' 
Temporary fix for the fade timeout

See merge request STJr/SRB2Internal!592
 2019-12-03 20:19:33 -05:00
toaster
efa87d95ce Spawn tokens in ultimate mode now they no longer give you rings on successful special stage completion. 2019-12-03 23:21:36 +00:00
MascaraSnake
9c1b50e3bd Added Sev to the Art section of the credits 2019-12-04 00:07:56 +01:00
MascaraSnake
9da4b4680f Added more people to the credits and reorganized them slightly 2019-12-04 00:02:47 +01:00
MascaraSnake
55dea263fc A few more credits additions/adjustments 2019-12-03 22:22:48 +01:00
toaster
b08823cbfa Semi-hacky fix to R_AddSpriteDefs printing Added -1 frames in 0 sprites: if the start marker is equal to or beyond the end marker, none of r_things' for (l = startlump; l < endlump; l++) loops will run, so just assume no sprites. 
Simply put, `W_CheckNumForFolderStartPK3` and its `End` equivalent will never return INT16_MAX for nonexistence, and I don't want to break any assumptions elsewhere by modifying those functions directly, so this is the simplest possible fix.
 2019-12-03 21:05:05 +00:00
MascaraSnake
646905f292 Merge branch 'creditsart' into 'master' 
New credits art + credits header support

See merge request STJr/SRB2Internal!591
 2019-12-03 14:28:51 -05:00
Louis-Antoine
d3ba98a753 Temporary fix for the fade timeout 2019-12-03 12:02:14 +01:00
MascaraSnake
0031494f07 Merge branch 'tailsbotdetect' into 'master' 
Attempt to detect Tailsbot and Sonic spawning on top of each other

See merge request STJr/SRB2Internal!584
 2019-12-03 02:20:30 -05:00
MascaraSnake
ee9e1aaafb Merge branch 'savedatareorder' into 'master' 
Savedata load order of operations change

See merge request STJr/SRB2Internal!583
 2019-12-03 02:18:06 -05:00
MascaraSnake
547de4b364 Merge branch 'botregrab' into 'master' 
Allow re-grabbing Tails AI mid-flight (resolves #428)

Closes #428

See merge request STJr/SRB2Internal!590
 2019-12-03 02:17:37 -05:00
MascaraSnake
560fb7ba04 Merge branch 'paperfixes' into 'master' 
Nail a likely culprit in papersprite rendering resolving #427 and #375.

Closes #427 and #375

See merge request STJr/SRB2Internal!589
 2019-12-03 02:16:26 -05:00
MascaraSnake
b8e0a61371 Merge branch 'emeraldfall' into 'master' 
Fix emerald coordinate overflow in failed SS tally (resolves #421).

Closes #421

See merge request STJr/SRB2Internal!586
 2019-12-03 02:15:47 -05:00