Commit graph

7459 commits

Author SHA1 Message Date
toaster
ac196768aa Resolve #283. 2019-11-08 13:58:53 +00:00
toaster
a480b05c6b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording 2019-11-08 13:02:32 +00:00
James R
7c0d5b3bcf There's some whitespace... 2019-11-07 14:56:42 -08:00
James R
1f166741e2 Merge branch 'intermission-buffer' into 'master'
Restore the last gameplay frame while on the intermission screen

See merge request STJr/SRB2Internal!444
2019-11-07 17:53:36 -05:00
James R
91c759ad9f Merge branch 'recordattack-menu-draw-fix' into 'master'
Record attack fixes

See merge request STJr/SRB2Internal!441
2019-11-07 17:53:03 -05:00
James R
7b3b89240a Merge branch 'fix-nopng-warnings' into 'master'
Fix warnings when NOPNG=1

See merge request STJr/SRB2Internal!432
2019-11-07 17:52:31 -05:00
James R
b9a3f79f25 Merge branch 'fix-uppercase-in-intro-fades' into 'master'
Fix some intro fades displaying text in all-caps

See merge request STJr/SRB2Internal!429
2019-11-07 17:52:17 -05:00
James R
a905025354 Merge branch 'lotsacontinues' into 'master'
Lotsa Continues (resolves #264)

Closes #264

See merge request STJr/SRB2Internal!422
2019-11-07 17:52:01 -05:00
James R
fa1f335e1f Merge branch 'secrets-charsel-music-fix' into 'master'
Fix char select music not playing in secrets menu

Closes #272

See merge request STJr/SRB2Internal!421
2019-11-07 17:51:38 -05:00
Jaime Passos
135c841056 I guess I'll have to do at least SOMETHING about OpenGL 2019-11-05 17:35:16 -03:00
Jaime Passos
db9a8b4b94 Restore the last gameplay frame while on the intermission screen 2019-11-05 17:04:57 -03:00
Steel Titanium
0a33e47619 Fix garbage string being drawn on record attack menu
Pretty silly of me to assume it would be NUL-terminated by default.
2019-11-03 21:43:09 -05:00
toaster
50b92afc4e * Restart Metal recording from beginning if retry is used.
* Disable lives when Metal recording (and have a big flashing REC instead, because I'm a riot).
* Correct some minor directionchar issues (some introduced in this branch, some not).
2019-11-02 11:56:51 +00:00
Steel Titanium
ea085a4c5b Merge branch 'revert-34a41977' into 'master'
Revert "Revert "Merge branch 'revert-55b91940' into 'master'""

See merge request STJr/SRB2Internal!435
2019-10-30 06:11:33 -04:00
Steel Titanium
bdf425adab Revert "Revert "Merge branch 'revert-55b91940' into 'master'""
This reverts commit 34a4197716
2019-10-30 10:09:54 +00:00
Steel Titanium
34a4197716 Revert "Merge branch 'revert-55b91940' into 'master'"
This reverts merge request !434
2019-10-30 09:59:02 +00:00
Steel Titanium
f029cd4bb6 Merge branch 'revert-55b91940' 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
2cfa7b307d Revert "Merge branch 'update-libs' into 'master'"
This reverts merge request !433
2019-10-30 09:07:56 +00:00
Steel Titanium
55b91940d8 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
ee69551d7b Give the clone fighter's vectorisation colour, rather than forcing greyscale. 2019-10-29 23:24:00 +00:00
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
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
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
Steel Titanium
dddf161dc9 Merge branch 'master' into update-libs 2019-10-27 16:04:56 -04: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
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
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
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
lachwright
b3dab79f7c Fix pointer typo (whoops) 2019-10-26 08:34:38 +08:00