stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-26 20:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity
9623 commits 173 branches 41 tags 298 MiB
Commit graph

9623 commits

This branch
This branch
All branches
Author SHA1 Message Date
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
Alam Ed Arias
19f49b0613 libpng: rebuild 32-bit libpng static lib with GCC 3.4.5 2019-12-02 13:07:12 -05:00
Alam Ed Arias
2fed1274e5 libs: clean up libpng 2019-12-02 12:29:11 -05:00
Alam Ed Arias
b5738620c1 Fixup compiling errors 2019-12-02 12:12:26 -05:00
lachwright
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
toaster
2bc67bf813 Allow re-grabbing Tails AI mid-flight (resolves #428) 2019-12-01 13:31:33 +00:00
toaster
f21ebaea0c Nail a likely culprit in papersprite rendering for #427 and #375. 2019-12-01 13:21:41 +00:00
MascaraSnake
ae2594e5ce Merge branch 'metalfix' into 'master' 
Boss Scream fix

See merge request STJr/SRB2Internal!581
 2019-12-01 02:26:24 -05:00
MascaraSnake
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
sphere
728838c245 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:56:16 +01:00
Digiku
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
sphere
ec3548c7f4 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
toaster
f662ef9454 Fix emerald coordinate overflow in failed SS tally (resolves #421). 2019-11-30 20:02:51 +00:00
sphere
d9a88ec10c Promote some programmers, add Blade & CoatRack to texture artists. 2019-11-30 18:23:57 +01:00
toaster
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
mazmazz
be44f0701e Clean up music error messages 2019-11-30 11:53:45 -05:00
toaster
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
toaster
3267a98fe9 Remove tracer nulling, likely a leftover from when P_LookForEnemies set tracer directly. 2019-11-30 15:28:50 +00:00
toaster
9d442ae6ea Wait, no, I'm an idiot. 2019-11-30 14:56:43 +00:00
toaster
2eb8e6be49 ...why is Metal overwriting his movecount to spawn explosions? 2019-11-30 14:37:21 +00:00
lachwright
6613286f1c Fix intro's BRITEGG/DARKEGG scale 2019-11-30 22:07:21 +08:00
MascaraSnake
e664e8b7f3 Merge branch 'jumphood' into 'master' 
Jumphood

See merge request STJr/SRB2Internal!573
 2019-11-30 06:53:15 -05:00
MascaraSnake
c422ef3c4e 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
d46f022837 Restore spindash sounds to DSSPNDSH 2019-11-30 19:30:58 +08:00
MascaraSnake
cfe8166998 Merge branch 'brakyeet2' into 'master' 
Brakyeet2

See merge request STJr/SRB2Internal!578
 2019-11-30 05:35:06 -05:00
toaster
85e3180056 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
0d4158bbd0 Fix the flung Brak not being removed on deathpits. 2019-11-30 10:29:51 +00:00
MascaraSnake
0d433b9e51 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
b22e8c809f Merge branch 'goldstatue' into 'master' 
Gold statue MTF_EXTRA

See merge request STJr/SRB2Internal!576
 2019-11-30 05:19:27 -05:00
toaster
f28c134c28 Gold statue in config. 2019-11-30 10:14:59 +00:00
toaster
c2bd91af50 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
7909d48391 (Temporary?) config name reversion to allow brakyeet merger 2019-11-30 05:07:33 -05:00
MascaraSnake
23b0b03d4d Merge branch 'spd' into 'master' 
Deton alert sound

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

See merge request STJr/SRB2Internal!571
 2019-11-30 05:03:07 -05:00
MascaraSnake
6bbc412eac 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
8a3c7da1d2 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
3bddd4365a Merge branch 'newintro' into 'master' 
New intro graphics

See merge request STJr/SRB2Internal!524
 2019-11-30 04:01:51 -05:00
MascaraSnake
526a75d20a 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
916fec2c41 Make INTRO4 display at high res 2019-11-30 12:31:23 +08:00
lachwright
d88eef3e95 Merge branch 'master' into newintro 2019-11-30 12:30:12 +08:00
toaster
60006e20fb 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
339907fd5d 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
fdcc8c912a Actually, wait; this is way better and cleaner. 2019-11-29 20:41:13 +00:00
toaster
ed0529b9d5 Match final countdown timer to timer (resolves #400). 2019-11-29 20:35:59 +00:00
toaster
0db38d213b Make Cobalt-picked sound effect audible from far away, like the original. 2019-11-29 20:04:14 +00:00