Commit graph

8316 commits

Author SHA1 Message Date
lachwright
42b9af5b3b Fix diagonal input acceleration and glide directioning in analog mode 2019-12-05 15:59:16 +08:00
lachwright
a908cf41c4 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
0fa1525749 Remove unnecessary function parameters from title card code 2019-12-05 01:58:19 -03:00
lachwright
65478633ce Merge branch 'master' into signpost-cleanup 2019-12-05 12:37:03 +08:00
lachwright
dc011d2fd3 Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode 2019-12-05 12:36:25 +08: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
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
MascaraSnake
322831a448 Merge branch 'ideyagun' into 'master'
Ideyagun (resolves #406).

Closes #406

See merge request STJr/SRB2Internal!582
2019-12-03 02:15:26 -05:00
Alam Ed Arias
b23877cada libpng: rebuild 32-bit libpng static lib with GCC 3.4.5 2019-12-02 13:07:12 -05:00
Alam Ed Arias
f926e55b37 libs: clean up libpng 2019-12-02 12:29:11 -05:00
Alam Ed Arias
b869d29580 Fixup compiling errors 2019-12-02 12:12:26 -05:00
lachwright
c65b02896b - Remove y coordinate from struct for credits_pics
- Update x coordinates for credits_pics entries
- Reorder credits_pics entries (what even was the previous order lol)
- Add zig zag graphics to credits roll
- Attempt to scale the y positions of credits graphics with the length of the credits roll
- New escape character for credits entries: \2, which centers the text and makes it yellow
- Add support for colored text to V_DrawStringAtFixed
2019-12-02 22:24:05 +08:00
toaster
9861750068 Allow re-grabbing Tails AI mid-flight (resolves #428) 2019-12-01 13:31:33 +00:00
toaster
00da2b3265 Nail a likely culprit in papersprite rendering for #427 and #375. 2019-12-01 13:21:41 +00:00
MascaraSnake
16703a6752 Merge branch 'metalfix' into 'master'
Boss Scream fix

See merge request STJr/SRB2Internal!581
2019-12-01 02:26:24 -05:00
MascaraSnake
f85d491ece Merge branch 'introfix' into 'master'
Fix intro's BRITEGG/DARKEGG scale

See merge request STJr/SRB2Internal!580
2019-12-01 02:25:22 -05:00
sphere
e058c3a8f4 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:56:16 +01:00
Digiku
36cfbc9da2 Merge branch 'music-error-cleanup' into 'master'
Clean up music error messages

Closes #407

See merge request STJr/SRB2Internal!585
2019-11-30 18:50:54 -05:00
sphere
c9d82328d5 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
toaster
2f51c75931 Fix emerald coordinate overflow in failed SS tally (resolves #421). 2019-11-30 20:02:51 +00:00