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
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
adfbf3630c
Merge branch 'tailsbubblefix' into 'master'
...
Tails Bubble Fix
See merge request STJr/SRB2Internal!606
2019-12-05 16:20:24 -05:00
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
545410bcae
Merge branch 'MSVC_fixes' into 'master'
...
Msvc fixes
See merge request STJr/SRB2Internal!610
2019-12-05 15:51:59 -05:00
c0ec90901e
frameFrame is unsigned, let set it to 0xFF
2019-12-05 15:50:44 -05:00
b2e9e8fb18
Fix V_WordWrap and the new additional text colour codes.
2019-12-05 19:43:37 +00:00
7bd5d291ce
Fix unlockable checklist literally hanging if any unlockables are cleared.
2019-12-05 18:40:30 +00:00
f10f526562
Fix compiling Mingw binaries on an Unix host
2019-12-05 12:50:14 -05:00
3120c99eeb
Fix compiling for MSVC
2019-12-05 12:38:50 -05:00
0ca87560ab
Fix building libpng and zlib with MSVC
2019-12-05 12:33:18 -05:00
f1d2968c19
Merge branch 'public_next' into private
2019-12-05 11:18:33 -05:00
b1571f81b1
Merge branch 'master' into next
2019-12-05 10:52:17 -05:00
0a24c82346
Fix building with MSVC
2019-12-05 10:51:55 -05:00
7f6c98f046
Fix clearing maps making the Tutorial option on the SP menu crash.
2019-12-05 13:42:08 +00:00
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
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
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
7c7f258c2d
Another potential papersprite crash fix, but way more confident about this one.
2019-12-05 09:28:28 +00:00
cffc6a0e46
Fix diagonal input acceleration and glide directioning in analog mode
2019-12-05 15:59:16 +08:00
28fbdab3d4
Make signpost camera distance consistent in analog mode & don't target signpost in 2D mode
2019-12-05 12:58:44 +08:00
c0cc742fb8
Remove unnecessary function parameters from title card code
2019-12-05 01:58:19 -03:00
fdf3944f60
Merge branch 'master' into signpost-cleanup
2019-12-05 12:37:03 +08:00
8ddfdf2d0f
Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode
2019-12-05 12:36:25 +08:00
d1b456b893
Edit some rock crumble states to match new sprites.
2019-12-05 02:22:25 +01:00
e6f1b82cc4
Merge branch 'minusoneframes' into 'master'
...
Minus One Frames
See merge request STJr/SRB2Internal!593
2019-12-04 17:15:51 -05:00
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
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
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
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
5662f8de00
Merge branch 'credits-update' into 'master'
...
Credits update
See merge request STJr/SRB2Internal!484
2019-12-04 16:59:46 -05:00
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
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
fe0b92d01a
sfx_spsmsh (hhz spikeball) is now singular
2019-12-04 20:32:46 +00:00
81cfca29d8
Fix FreeMipmapColormap yet again
2019-12-04 15:50:17 -03:00
928bd2385d
Merge remote-tracking branch 'origin/master' into have_png-compile-fix
2019-12-04 15:44:12 -03:00
82cbd953fb
Someone wants PNGLCONF_H
2019-12-04 13:42:14 -05:00
b646922967
fix Ploadflat warning
2019-12-04 15:41:29 -03:00
839251633c
fix ErrorIfPNG errors
2019-12-04 15:26:51 -03:00
e8ac1c391c
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
c432f86624
change from shifting bits to multi for a OLD video function marco
2019-12-04 10:43:33 -05:00
0751f8987a
Libs: move pngconf.h out of top level libpng source folder
2019-12-04 10:41:54 -05:00
7f82d7451d
Fix slope launch with NULL player causing SIGSEGV.
2019-12-04 12:13:27 +00:00
41210708e2
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
c843f22a24
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
20c1a0158d
Added Sev to the Art section of the credits
2019-12-04 00:07:56 +01:00
c2577b6eb3
Added more people to the credits and reorganized them slightly
2019-12-04 00:02:47 +01:00
602ba32ecc
A few more credits additions/adjustments
2019-12-03 22:22:48 +01:00
e75490c99d
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
7a8d1b4d4b
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
MascaraSnake