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
84e7672cca
Temporary fix for the fade timeout
2019-12-03 12:02:14 +01:00
0c048d2667
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
f9460434f8
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
c30886a47f
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
c1d5f411e0
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
ab400e926a
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
ba0dc5c884
Merge branch 'ideyagun' into 'master'
...
Ideyagun (resolves #406 ).
Closes #406
See merge request STJr/SRB2Internal!582
2019-12-03 02:15:26 -05:00
19f49b0613
libpng: rebuild 32-bit libpng static lib with GCC 3.4.5
2019-12-02 13:07:12 -05:00
2fed1274e5
libs: clean up libpng
2019-12-02 12:29:11 -05:00
b5738620c1
Fixup compiling errors
2019-12-02 12:12:26 -05:00
be3d7b7dcd
- 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
2bc67bf813
Allow re-grabbing Tails AI mid-flight ( resolves #428 )
2019-12-01 13:31:33 +00:00
f21ebaea0c
Nail a likely culprit in papersprite rendering for #427 and #375 .
2019-12-01 13:21:41 +00:00
ae2594e5ce
Merge branch 'metalfix' into 'master'
...
Boss Scream fix
See merge request STJr/SRB2Internal!581
2019-12-01 02:26:24 -05:00
97fdc5aaf0
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
728838c245
Merge remote-tracking branch 'origin/master' into credits-update
2019-12-01 00:56:16 +01:00
231d387aa3
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
ec3548c7f4
Merge remote-tracking branch 'origin/master' into credits-update
2019-12-01 00:32:01 +01:00
f662ef9454
Fix emerald coordinate overflow in failed SS tally ( resolves #421 ).
2019-11-30 20:02:51 +00:00
d9a88ec10c
Promote some programmers, add Blade & CoatRack to texture artists.
2019-11-30 18:23:57 +01:00
515600c4d0
Attempt to detect Tailsbot and Sonic spawning at the same coords and restrict some undesirable stuff happening, just in case we miss any situations (or for the sake of mods).
2019-11-30 16:54:51 +00:00
be44f0701e
Clean up music error messages
2019-11-30 11:53:45 -05:00
6e278c1138
Change the order of operations such that savedata info is loaded before mapthings are spawned, so that if you have all the emeralds, the emerald objects won't spawn in BCZ2 if you use the SP savefile's level select to go to it directly.
2019-11-30 15:52:41 +00:00
3267a98fe9
Remove tracer nulling, likely a leftover from when P_LookForEnemies set tracer directly.
2019-11-30 15:28:50 +00:00
9d442ae6ea
Wait, no, I'm an idiot.
2019-11-30 14:56:43 +00:00
MascaraSnake