Commit graph

8193 commits

Author SHA1 Message Date
toaster
c5a9a0c246 Add "Press ENTER to skip..." text to the intro's first scene, for new players who might otherwise sit through a load of (polished) crap. :P 2019-12-06 20:50:41 +00:00
MascaraSnake
dc3d68bf22 Merge branch 'f12fix' into 'master'
Fix F12 issues

Closes #356 and #377

See merge request STJr/SRB2Internal!616
2019-12-06 15:01:28 -05:00
Alam Ed Arias
f36fa64b57 Not dealing with size_t mess with SDL code 2019-12-06 14:42:47 -05:00
MascaraSnake
44b6cc1056 Merge branch 'undo_double' into 'master'
OpenGL cast to float, not store in double

See merge request STJr/SRB2Internal!617
2019-12-06 14:28:41 -05:00
Jaime Passos
4f0c201e20 Merge branch 'lt-extraneous-parameters' into 'master'
Remove unnecessary function parameters from title card code

See merge request STJr/SRB2Internal!603
2019-12-06 14:22:39 -05:00
Alam Ed Arias
25806d93e0 OpenGL cast to float, not store in double 2019-12-06 13:45:11 -05:00
lachwright
ea20a1a118 Fix whitespace issues from when I was new to this shit 2019-12-07 02:31:31 +08:00
lachwright
415b6663c9 Actually fix F12 issues 2019-12-07 02:27:48 +08:00
lachwright
e2d4c9e8a7 Hopefully fix F12 issues 2019-12-07 01:52:40 +08:00
MascaraSnake
8aa0ba0a70 Merge branch 'bugglebop' into 'master'
Make Buggles spawn immediately breathable bubbles

See merge request STJr/SRB2Internal!613
2019-12-06 04:21:39 -05:00
lachwright
47dfb2046b Make Buggles spawn immediately breathable bubbles 2019-12-06 16:29:52 +08:00
MascaraSnake
351677e74a Merge branch 'rockcrumblefix' into 'master'
Edit some rock crumble states to match new sprites.

See merge request STJr/SRB2Internal!601
2019-12-05 17:10:34 -05:00
MascaraSnake
110351521c Merge branch 'perfectra' into 'master'
Record Attack perfect bonus stuff

Closes #457

See merge request STJr/SRB2Internal!607
2019-12-05 17:02:38 -05:00
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
2e4cf3f5b6 Fix #457 and another bug I just realised in one fell swoop.
That is to say, MV_PERFECT can be applied in singleplayer, but that doesn't update your best rings on the map in record attack, so the thing being yellow doesn't make sense if your rings are (none). Therefore, make it a two-flag, two-bit process.
2019-12-05 09:47:29 +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
Jaime Passos
0fa1525749 Remove unnecessary function parameters from title card code 2019-12-05 01:58:19 -03:00
sphere
589eeb1eb7 Edit some rock crumble states to match new sprites. 2019-12-05 02:22:25 +01: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