Commit graph

8112 commits

Author SHA1 Message Date
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
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
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
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
toaster
2f51c75931 Fix emerald coordinate overflow in failed SS tally (resolves #421). 2019-11-30 20:02:51 +00:00
toaster
562dfb8906 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
mazmazz
728c08d705 Clean up music error messages 2019-11-30 11:53:45 -05:00
toaster
51a5f918e9 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
toaster
cfa49f72ef Remove tracer nulling, likely a leftover from when P_LookForEnemies set tracer directly. 2019-11-30 15:28:50 +00:00
toaster
4f38017598 Wait, no, I'm an idiot. 2019-11-30 14:56:43 +00:00
toaster
390d40ba6d ...why is Metal overwriting his movecount to spawn explosions? 2019-11-30 14:37:21 +00:00
lachwright
65269d78cd Fix intro's BRITEGG/DARKEGG scale 2019-11-30 22:07:21 +08:00
MascaraSnake
cebd7df2fc Merge branch 'jumphood' into 'master'
Jumphood

See merge request STJr/SRB2Internal!573
2019-11-30 06:53:15 -05:00
MascaraSnake
8d69854752 Merge branch 'restoreskinsounds' into 'master'
Restore spindash sounds to DSSPNDSH

See merge request STJr/SRB2Internal!579
2019-11-30 06:52:53 -05:00
lachwright
41dc496551 Restore spindash sounds to DSSPNDSH 2019-11-30 19:30:58 +08:00
MascaraSnake
b1819355a3 Merge branch 'brakyeet2' into 'master'
Brakyeet2

See merge request STJr/SRB2Internal!578
2019-11-30 05:35:06 -05:00
toaster
d6ed463227 Make the fling always occur, and only have the horizontal momentum apply if not MTF_EXTRA. 2019-11-30 10:31:18 +00:00
toaster
7252546100 Fix the flung Brak not being removed on deathpits. 2019-11-30 10:29:51 +00:00
MascaraSnake
a0c10542dd Merge branch 'brakyeet' into 'master'
This Black Eggman? ***YEET*** (resolves #399)

Closes #399

See merge request STJr/SRB2Internal!575
2019-11-30 05:21:55 -05:00
MascaraSnake
a4621a5874 Merge branch 'goldstatue' into 'master'
Gold statue MTF_EXTRA

See merge request STJr/SRB2Internal!576
2019-11-30 05:19:27 -05:00
toaster
d453348577 Gold statue in config. 2019-11-30 10:14:59 +00:00
toaster
bffeb25e5b Discovered this was wrong when working on the config for brakyeet, MS objected to the hack so he's updating the tutorial map accordingly. 2019-11-30 10:12:45 +00:00
toaster
987aa7a5be (Temporary?) config name reversion to allow brakyeet merger 2019-11-30 05:07:33 -05:00
MascaraSnake
7189bc8fd2 Merge branch 'spd' into 'master'
Deton alert sound

See merge request STJr/SRB2Internal!491
2019-11-30 05:04:10 -05:00
MascaraSnake
0a105a364a Merge branch 'sandtnoflip' into 'master'
S&T no flip

See merge request STJr/SRB2Internal!571
2019-11-30 05:03:07 -05:00
MascaraSnake
fe622b582c Merge branch 'finalcountdown' into 'master'
The final countdown (resolves #400).

Closes #400

See merge request STJr/SRB2Internal!574
2019-11-30 04:03:07 -05:00
MascaraSnake
c714e0d861 Merge branch 'mapinter' into 'master'
Intermission Buffer Clear On Map Command (no funny name today)

See merge request STJr/SRB2Internal!570
2019-11-30 04:02:44 -05:00
MascaraSnake
2160101eb3 Merge branch 'newintro' into 'master'
New intro graphics

See merge request STJr/SRB2Internal!524
2019-11-30 04:01:51 -05:00
MascaraSnake
e8797471b2 Merge branch 'flagreturncomplete' into 'master'
Flag return completion (resolve #396).

Closes #396

See merge request STJr/SRB2Internal!572
2019-11-30 03:59:27 -05:00
lachwright
bd5b30b54e Make INTRO4 display at high res 2019-11-30 12:31:23 +08:00
lachwright
bc243beb3b Merge branch 'master' into newintro 2019-11-30 12:30:12 +08:00
toaster
cd2cc43bc4 Edit config to account for new behaviour (plus add gold mode for the Eggman Statue, which I forgot to add earlier). 2019-11-29 21:59:06 +00:00
toaster
e3c8f7bcd3 This Black Eggman? ***YEET***
Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.
2019-11-29 21:55:25 +00:00
toaster
0f287c9b30 Actually, wait; this is way better and cleaner. 2019-11-29 20:41:13 +00:00