Commit graph

7629 commits

Author SHA1 Message Date
toaster
297f1ad9a6 Metal Sonic battle improvements.
* Tweaked to use new sprites.
* Jet fume behaves much closer to Lach's wonderful work.
* Instead of clobbering tracer to spawn powerup overlay, use hprev.
* Change timings. One second less to charge up, but two seconds less to spin them out.
* Remove terrible pinch overlay in favour of new dashmode-mimic flashing.
2019-10-29 23:11:12 +00:00
toaster
42d380328c Finish the Metal demo if the Metal playback object is dead. 2019-10-29 18:17:04 +00:00
toaster
91d2beebfa * Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following...
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
toaster
f3ba2c9339 I was right on the money - SendWeaponPref seems to have been delayed compared to earlier in development. Doesn't matter a lick for regular gameplay (net or otherwise), but absolutely mandatory to get it sorted ASAP in Record Attack. 2019-10-29 15:59:59 +00:00
toaster
d7c84c06cb * Add thok auras to Metal playback.
* Add height changes to demos and Metal playback (to properly place thok aura relative to object).
* Fix followmobj recordings in reverse gravity (done via more strenuous flag setting + info height serialisation).
* Make RA ghosts fade in from start tic, and go colorized on their final one.
* Fix thok auras potentially doing bad things if they're set to MT_NULL.
* Add sprite change support to Metal playback.
* Re-enable some stuff I previously disabled for Metal recording/playback.
* Make ALL objects spawned with skins properly acknowledge that their spawnstate's frame is a sprite2, rather than just specific objects.
* Fix placement of Metal Sonic fume in reverse gravity.
* Since not backwards compatible with the previous test build, increment DEMOVERSION again. (Don't worry, we've got like 65524 more versions allowed before we run out of possible DEMOVERSIONs...)
2019-10-29 15:32:22 +00:00
Jaime Passos
2e1ecda3fa Use doomtype.h types instead of libpng types 2019-10-29 00:15:33 -03:00
Steel Titanium
938ed06173 Update SDL2 to 2.0.10 2019-10-28 22:48:19 -04:00
Jaime Passos
34f1dc20b1 Fix warnings when NOPNG=1 2019-10-28 23:46:33 -03:00
toaster
22b413e84c * Improve the Metal Sonic recording/playback system.
* Make the skin to record with Metal rather than Flesh Sonic. (Allowed even if not unlocked!)
    * Make the object that plays back the recording actually use the Metal skin, rather than just a seperate spriteset. (The boss will still need the spriteset, though.)
    * Actively record the player's sprite2, frame, and followmobj, just like regular ghosts do.
    * Disable dashmode while recording, for a fairer race.
    * Fix a probably long-standing bug where, while recording, being "hurt" would get Metal stuck in pain frames until they physically left the area of hurt.
    * Always start Metal recording in wait frames for bonus taunting.

Other relevant changes:
* Increment DEMOVERSION *again*.
* Improve the Record Attack ghost followmobj recording to accomodate Metal's jet.
* Increase the datatype width of spritenum_t read/write for Record Attack ghosts because SUGOI 4: Back With A Revengance will probably also use more than 255 sprites alone.
* Return to standing frames (or prolong them if you're in them, rather than going to wait frames) if the player rotates on the spot with enough force.
    * This was specifically done *for* Metal recording, but I decided it looked good enough to enable all the time.
2019-10-28 22:12:47 +00:00
Louis-Antoine
027c60d47d Fix some intro fades displaying text in all-caps 2019-10-28 16:10:22 +01:00
lachwright
55cc3cf590 Merge branch 'master' into knuxstuff 2019-10-28 22:25:32 +08:00
lachwright
e92cdfe26e Slow climbing down underwater 2019-10-28 22:21:20 +08:00
toaster
0fb972e1c5 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmodecut 2019-10-28 14:19:25 +00:00
toaster
5585992bde Replace the s3k sound used when starting dashmode with the Sonic CD equivalent, which among other things is more appropriate AND isn't used for anything unrelated so can have a more appropriate caption 2019-10-28 14:19:07 +00:00
lachwright
77776e5fe8 Don't let Knuckles play the landing animation unless in fall state 2019-10-28 22:13:34 +08:00
toaster
50e89d3863 Merge branch 'noautobrakefix' into 'master'
Forgot to make pw_noautobrake count down........

See merge request STJr/SRB2Internal!427
2019-10-28 10:08:53 -04:00
lachwright
3a97e7b807 Slow glide down underwater 2019-10-28 21:30:36 +08:00
toaster
d28788786e Oh, this is why. pw_pushing was decremented twice each tic, because I copypasted it and then forgot to adjust it to say pw_noautobrake... 2019-10-28 13:01:15 +00:00
toaster
250e6d71ae Forgot to make pw_noautobrake count down........ 2019-10-28 12:54:55 +00:00
toaster
95e8ea0f8a Fix map_cons_t[] not having a null terminator, which should hopefully allow Lach to actually start their builds up on Mac again. 2019-10-28 11:34:20 +00:00
James R
2e47b106a6 Add overflow checks so we I_Error instead of death crash into oblivion
You'd love to know how we even reached (size_t)-1.
2019-10-28 00:40:25 -07:00
Steel Titanium
dddf161dc9 Merge branch 'master' into update-libs 2019-10-27 16:04:56 -04:00
James R
ea2adc8018 Move gamedata param to cover -resetdata 2019-10-27 10:33:40 -07:00
James R
bea18f1f1f Custom gamedata parameter 2019-10-27 10:31:17 -07:00
toaster
972b8ca733 * Add alternate numerical drawer for continues on Intermission screen if there's > 5.
* Tweak offsets on Continue screen numerical continue drawer to match.
2019-10-27 17:20:43 +00:00
mazmazz
26100abdc4 Fix char select music not playing in secrets menu 2019-10-27 13:12:36 -04:00
toaster
46d3f77c48 More consistent momentum handling for "groundpounding" shield abilities (elemental, bubble) in THZ goop. 2019-10-27 13:37:14 +00:00
toaster
8ec1ff55d9 Make player flash colorized when dashmode if not SF_MACHINE, per Sonic Advance 2. 2019-10-27 13:07:06 +00:00
toaster
df24e3089b * Disable dashmode if pw_carry is set or the player is exiting, in addition to getting the flag.
* Add a dashmode downpower sound.
2019-10-27 13:02:07 +00:00
toaster
4334384855 Fix bot showing up in NiGHTS stages with a two-pronged approach.
* Sometimes, D_MapChange is passed a mapnum of -1, to complete an existing mapchange. Don't handle botingame checks when that happens.
* Disable charsel on secret level platter when selected map is a NiGHTS stage, since gameplay will be identical across characters (consistent with NiGHTS Attack).

Also:

* Replace IT_DYBIGSPACE hack in M_SetupChoosePlayer, and replace with a more direct workaround system for not being able to select characters before warping.
2019-10-27 12:20:17 +00:00
toaster
1f92a73135 Fix unsigned/signed comparisons. 2019-10-27 11:18:37 +00:00
Nev3r
2b33529b7c Missing ; 2019-10-27 12:03:52 +01:00
MascaraSnake
1e822edb70 Fixed a typo in the ZB config 2019-10-26 22:56:01 +02:00
James R
502c72e975 Render title map on connecting to server screen too 2019-10-26 12:50:49 -07:00
MascaraSnake
04841768e4 Merge branch 'use-zones-pk3' into 'master'
Use zones.pk3 instead of zones.dta.

See merge request STJr/SRB2Internal!352
2019-10-26 15:33:13 -04:00
mazmazz
a23cc44d93 Fix some jingle resuming behavior with boss music switching 2019-10-26 15:02:45 -04:00
MascaraSnake
1019116ede Merge branch 'metalstuff' into 'master'
Metal Sonic's jet fume

See merge request STJr/SRB2Internal!413
2019-10-26 14:52:04 -04:00
MascaraSnake
2df34ef2cf Merge branch 'midi-toggle-fix' into 'master'
Fix MIDI not being disabled when non-native

See merge request STJr/SRB2Internal!414
2019-10-26 14:46:25 -04:00
mazmazz
08bc1ea590 Fix MIDI not being disabled when non-native 2019-10-26 12:09:27 -04:00
lachwright
9401241d6d Merge branch 'master' into metalstuff 2019-10-26 16:07:59 +08:00
MascaraSnake
e60821962b Merge branch 'knuxstuff' into 'master'
Knuckles gameplay changes and/or improvements

See merge request STJr/SRB2Internal!354
2019-10-26 02:41:40 -04:00
MascaraSnake
b2190da52b Merge branch 'master' into knuxstuff 2019-10-26 08:09:13 +02:00
James R
8cb348424a Differing signedness comparison 2019-10-25 21:44:34 -07:00
James R
ac3e90b9a0 I say damn you massive initializer! 2019-10-25 21:36:10 -07:00
mazmazz
31d7254d14 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
mazmazz
f43329210f Merge remote-tracking branch 'origin/new-title' into new-title 2019-10-25 22:28:31 -04:00
lachwright
b3dab79f7c Fix pointer typo (whoops) 2019-10-26 08:34:38 +08:00
lachwright
8958355e22 Remove imtermediary state transitions 2019-10-26 08:32:36 +08:00
lachwright
fa206f7411 Merge branch 'master' into metalstuff 2019-10-26 08:30:37 +08:00
lachwright
4835d26c8b Merge branch 'master' into knuxstuff 2019-10-26 05:53:49 +08:00