Commit graph

7769 commits

Author SHA1 Message Date
lachwright 7c08cd69fa WIP new states for Glaregoyle 2019-10-31 00:32:19 +08:00
Steel Titanium 312b9f76b6 Revert "Merge branch 'revert-eda30fc9' into 'master'"
This reverts merge request !435
2019-10-30 10:37:22 +00:00
Steel Titanium 96aa11c825 Merge branch 'revert-eda30fc9' into 'master'
Revert "Revert "Merge branch 'revert-973ad693' into 'master'""

See merge request STJr/SRB2Internal!435
2019-10-30 06:11:33 -04:00
Steel Titanium 0df7691d30 Revert "Revert "Merge branch 'revert-973ad693' into 'master'""
This reverts commit eda30fc995
2019-10-30 10:09:54 +00:00
Steel Titanium eda30fc995 Revert "Merge branch 'revert-973ad693' into 'master'"
This reverts merge request !434
2019-10-30 09:59:02 +00:00
Steel Titanium 9bd9df6726 Merge branch 'revert-973ad693' into 'master'
Revert "Merge branch 'update-libs' into 'master'"

See merge request STJr/SRB2Internal!434
2019-10-30 05:09:22 -04:00
Steel Titanium 76457663f0 Revert "Merge branch 'update-libs' into 'master'"
This reverts merge request !433
2019-10-30 09:07:56 +00:00
Steel Titanium 973ad6930d Merge branch 'update-libs' into 'master'
Update various of libraries

See merge request STJr/SRB2Internal!433
2019-10-30 05:01:18 -04:00
toaster 04f400e048 Give the clone fighter's vectorisation colour, rather than forcing greyscale. 2019-10-29 23:24:00 +00:00
toaster 4d55a9f4a9 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 56d095e39f Finish the Metal demo if the Metal playback object is dead. 2019-10-29 18:17:04 +00:00
toaster 2d1a574e09 * 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 d7ea986d7b 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 f0f8b544de * 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
lachwright 9436993a3e Implement new states for Buggle, the new Aquabuzz 2019-10-29 15:32:03 +08:00
Jaime Passos 417aa778aa Use doomtype.h types instead of libpng types 2019-10-29 00:20:21 -03:00
Jaime Passos 5464b6ab28 Use doomtype.h types instead of libpng types 2019-10-29 00:15:33 -03:00
Steel Titanium 64e07ac954
Update SDL2 to 2.0.10 2019-10-28 22:48:19 -04:00
Jaime Passos 0a49340ae1 Fix warnings when NOPNG=1 2019-10-28 23:46:33 -03:00
toaster 1906709cf2 * 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
Jaime Passos f6e8226c4e Update p_user.c 2019-10-28 15:37:26 -03:00
Jaime Passos a22af36305 add r_patch.c 2019-10-28 15:28:42 -03:00
Jaime Passos 1a44159ce9 Update r_data.c 2019-10-28 14:36:19 -03:00
Jaime Passos 79e99dc471 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03:00
Louis-Antoine e91bf1a32e Fix some intro fades displaying text in all-caps 2019-10-28 16:10:22 +01:00
lachwright 8824cd64fd Merge branch 'master' into knuxstuff 2019-10-28 22:25:32 +08:00
lachwright 46ba988541 Slow climbing down underwater 2019-10-28 22:21:20 +08:00
toaster ce91bdaaab Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmodecut 2019-10-28 14:19:25 +00:00
toaster 9a160823aa 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 b93c2467e7 Don't let Knuckles play the landing animation unless in fall state 2019-10-28 22:13:34 +08:00
toaster 97dd22e0e9 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 1306b2bbc5 Slow glide down underwater 2019-10-28 21:30:36 +08:00
toaster d9196485f6 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 17dde0d91c Forgot to make pw_noautobrake count down........ 2019-10-28 12:54:55 +00:00
toaster 22649f698e 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 33816e49ca 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
James R fb9421893e :oh: 2019-10-27 14:29:13 -07:00
James R a00dfcf420 Oh right, the keywords... 2019-10-27 14:26:29 -07:00
James R f0e19d1597 Fix minor unnecessary call 2019-10-27 14:25:20 -07:00
James R 56ee233b08 Fix compiler warnings 2019-10-27 14:23:53 -07:00
James R 7bf819f5af Use a superior strcasestr 2019-10-27 14:23:13 -07:00
James R 70df5242a3 Extend map name text matching code into a function 2019-10-27 14:23:03 -07:00
James R bb65e8d72f Add support for custom keywords
For now, 32 characters separated by spaces.

Also fixed a SIGSEGV from an empty level title.
2019-10-27 14:10:26 -07:00
James R 6358d839ee Overhaul the map command
Added support for map names, matched by substring and keywords too!
Added support for two digit MAP codes without the MAP part.
Added support for decimal map number. (But who cares.)

Gave a better description of command.
Supported abbreviated optional parameters.

And now REALLY detects incorrect parameters.
2019-10-27 14:02:36 -07:00
Steel Titanium 95a2ef4021
Merge branch 'master' into update-libs 2019-10-27 16:04:56 -04:00
James R 2078b47952 Move gamedata param to cover -resetdata 2019-10-27 10:33:40 -07:00
James R 4ac136f626 Custom gamedata parameter 2019-10-27 10:31:17 -07:00
toaster df785e1651 * 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 23c6011348 Fix char select music not playing in secrets menu 2019-10-27 13:12:36 -04:00
toaster 2439b2cb32 More consistent momentum handling for "groundpounding" shield abilities (elemental, bubble) in THZ goop. 2019-10-27 13:37:14 +00:00