239242f513
Merge branch 'stretch-credits' into 'master'
...
Lengthen credits for msuic parity
See merge request STJr/SRB2Internal!620
2019-12-06 17:19:17 -05:00
78de32b623
Merge branch 'creditweak' into 'master'
...
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.
See merge request STJr/SRB2Internal!621
2019-12-06 17:18:54 -05:00
5f9f255f77
Correct comment
2019-12-06 17:10:14 -05:00
66bd864592
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.
2019-12-06 22:06:35 +00:00
8f2d81ec74
Lengthen credits for msuic parity
2019-12-07 05:59:26 +08:00
a0ebb32912
Merge branch 'introskiptext' into 'master'
...
Add "Press ENTER to skip..." text to the intro's first scene
See merge request STJr/SRB2Internal!619
2019-12-06 16:48:29 -05:00
a3549cc8f2
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
f3fd5a50cb
Merge branch 'signpost-cleanup' into 'master'
...
Signpost fixes
See merge request STJr/SRB2Internal!602
2019-12-06 15:58:46 -05:00
674fcd7923
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
f4c89c2dac
Merge branch 'analogfixes' into 'master'
...
Small analog mode fixes
See merge request STJr/SRB2Internal!604
2019-12-06 15:32:10 -05:00
f304931ac4
get lua_blockmaplib.c too
2019-12-06 15:27:20 -05:00
86cd363d16
Merge branch 'datestuff' of git.magicalgirl.moe:STJr/SRB2Internal into datestuff
2019-12-06 15:23:02 -05:00
f02418e70c
Fix copy+paste goof
2019-12-06 15:21:41 -05:00
fcc4427de6
Update r_patch.h
2019-12-06 17:07:57 -03:00
c4518cce9d
Update r_patch.c
2019-12-06 17:05:36 -03:00
201cdef381
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
1f183e1c1f
Not dealing with size_t mess with SDL code
2019-12-06 14:42:47 -05:00
e105c2f749
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
d7bfe7d652
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
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
f576e61753
OpenGL cast to float, not store in double
2019-12-06 13:45:11 -05:00
2e77970526
Fix whitespace issues from when I was new to this shit
2019-12-07 02:31:31 +08:00
4a26aec031
Actually fix F12 issues
2019-12-07 02:27:48 +08:00
e8f634e99a
Update DLL-README.txt
2019-12-06 13:22:03 -05:00
e7574957bc
Hopefully fix F12 issues
2019-12-07 01:52:40 +08:00
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
c4f48ee979
Make Buggles spawn immediately breathable bubbles
2019-12-06 16:29:52 +08:00
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
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
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
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
MascaraSnake