Commit Graph

8536 Commits

Author SHA1 Message Date
toaster fd6ecb4425 Make modid 18 to match Rob's work. 2019-12-06 17:23:55 +00:00
toaster 1684cf76bd Make modversion 40 to match Rob's work. 2019-12-06 17:19:42 +00:00
toaster 9e38af7421 * Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461).
* Update md5s.
* Update modversion.

TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?
2019-12-06 17:14:51 +00:00
MascaraSnake 0672db9e44 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 c4f48ee979 Make Buggles spawn immediately breathable bubbles 2019-12-06 16:29:52 +08:00
MascaraSnake c468ae5239 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 69da1a7733 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 bbc5d33266 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 87843365fc 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 6393542dc3 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 adfbf3630c Merge branch 'tailsbubblefix' into 'master'
Tails Bubble Fix

See merge request STJr/SRB2Internal!606
2019-12-05 16:20:24 -05:00
MascaraSnake 114753e2fe 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 545410bcae 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 c0ec90901e frameFrame is unsigned, let set it to 0xFF 2019-12-05 15:50:44 -05:00
toaster b2e9e8fb18 Fix V_WordWrap and the new additional text colour codes. 2019-12-05 19:43:37 +00:00
Jaime Passos 7765dd538c Merge remote-tracking branch 'origin/master' into wipes2 2019-12-05 16:26:50 -03:00
Jaime Passos ed34cb8d79 Change st_overlay to cv_showhud.value 2019-12-05 16:25:19 -03:00
toaster 7bd5d291ce Fix unlockable checklist literally hanging if any unlockables are cleared. 2019-12-05 18:40:30 +00:00
Alam Ed Arias f10f526562 Fix compiling Mingw binaries on an Unix host 2019-12-05 12:50:14 -05:00
Alam Ed Arias 3120c99eeb Fix compiling for MSVC 2019-12-05 12:38:50 -05:00
Alam Ed Arias 0ca87560ab Fix building libpng and zlib with MSVC 2019-12-05 12:33:18 -05:00
Alam Ed Arias f1d2968c19 Merge branch 'public_next' into private 2019-12-05 11:18:33 -05:00
Alam Ed Arias b1571f81b1 Merge branch 'master' into next 2019-12-05 10:52:17 -05:00
Alam Ed Arias 0a24c82346 Fix building with MSVC 2019-12-05 10:51:55 -05:00
toaster 7f6c98f046 Fix clearing maps making the Tutorial option on the SP menu crash. 2019-12-05 13:42:08 +00:00
toaster 848d7ad819 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 2b5957fd1c 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 25eacbffb8 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 7c7f258c2d Another potential papersprite crash fix, but way more confident about this one. 2019-12-05 09:28:28 +00:00
lachwright cffc6a0e46 Fix diagonal input acceleration and glide directioning in analog mode 2019-12-05 15:59:16 +08:00
Jaime Passos 13c6b38b13 Merge remote-tracking branch 'origin/lt-extraneous-parameters' into wipes2 2019-12-05 02:03:09 -03:00
lachwright 28fbdab3d4 Make signpost camera distance consistent in analog mode & don't target signpost in 2D mode 2019-12-05 12:58:44 +08:00
Jaime Passos c0cc742fb8 Remove unnecessary function parameters from title card code 2019-12-05 01:58:19 -03:00
Jaime Passos b5d5749bfb Merge remote-tracking branch 'origin/master' into wipes2 2019-12-05 01:48:58 -03:00
Jaime Passos 7384522aef Fix Continue game state wipes 2019-12-05 01:47:51 -03:00
lachwright fdf3944f60 Merge branch 'master' into signpost-cleanup 2019-12-05 12:37:03 +08:00
lachwright 8ddfdf2d0f Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode 2019-12-05 12:36:25 +08:00
sphere d1b456b893 Edit some rock crumble states to match new sprites. 2019-12-05 02:22:25 +01:00
Jaime Passos 6adb957f0f Slap colormap fades everywhere 2019-12-04 19:25:39 -03:00
MascaraSnake e6f1b82cc4 Merge branch 'minusoneframes' into 'master'
Minus One Frames

See merge request STJr/SRB2Internal!593
2019-12-04 17:15:51 -05:00
MascaraSnake 6b344b9ddf 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 a7884e479a 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 6928763961 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 01da9f7f16 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 5662f8de00 Merge branch 'credits-update' into 'master'
Credits update

See merge request STJr/SRB2Internal!484
2019-12-04 16:59:46 -05:00
MascaraSnake 6a811515db 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 77d446cc04 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 fe0b92d01a sfx_spsmsh (hhz spikeball) is now singular 2019-12-04 20:32:46 +00:00
Jaime Passos 81cfca29d8 Fix FreeMipmapColormap yet again 2019-12-04 15:50:17 -03:00
Jaime Passos 928bd2385d Merge remote-tracking branch 'origin/master' into have_png-compile-fix 2019-12-04 15:44:12 -03:00