Commit graph

7046 commits

Author SHA1 Message Date
toaster
31524531a9 Fix TC_DASHMODE and associated not being applied in GL. (Won't conflict with md3 branch because these lines weren't modified there!) 2019-11-04 13:11:04 +00:00
lachwright
f828e040bb New end-of-level signpost logic 2019-11-04 16:28:44 +08:00
mazmazz
40149e00bc Alacroix: Fix our heroes' arms disappearing due to dropped frames 2019-11-04 02:43:48 -05: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
mazmazz
9364427819 Frame 4 typos 2019-11-03 19:53:05 -05:00
mazmazz
925268f60c Alacroix title: Give Tails his back tails 2019-11-03 18:38:09 -05:00
mazmazz
a7e38c5cc5 Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions 2019-11-03 16:21:21 -05:00
mazmazz
ad0b9e40ae Alacroix title screen character frames 2019-11-03 10:34:12 -05:00
mazmazz
288d9f9e39 Load Alacroix character frames 2019-11-03 06:30:27 -05:00
toaster
7cd2fc7ac3 Slightly unrelated to the express purpose of the branch, but since I was here, and I noticed it was a problem when ~~playing~~ testing with md3s in ACZ: Don't draw the midtextures for horizon lines. 2019-11-03 10:23:21 +00:00
mazmazz
ed87a603df TTMODE_USER logic 2019-11-02 21:51:45 -04:00
mazmazz
35e102492b Alacroix title animation adjustments 2019-11-02 21:05:01 -04:00
Jaime Passos
d47cf3d1c8 Fix sky dome 2019-11-02 17:33:36 -03:00
toaster
2a16cf539a Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
toaster
8f14902e36 Instead of checking for mod being nonzero, pretend it's 1 - after all, there's no good behaviour in that circumstance otherwise. 2019-11-02 18:25:56 +00:00
toaster
a23e1946c4 Do a bunch of stuff to the MD2/3 sprite2 support to get it back to feature parity with before, without going back to being hacky as fuck.
* Store the number of frames per sprite2 run in the spr2frames struct.
* Reintroduce P_GetModelSprite2, to allow for the sprite2 defaulting system to be used to full advantage even in GL.
* Instead of splitting the SUPER and normal SPR2 stuff within the same cell of the struct, have them exist in different cells just like in the "normal" sprite2 structs.
* Allow for just providing spr2 frames in order without specifying which "normal" sprite2 frame it's supposed to replace.

Also:
* Fix FF_VERTICALFLIP-ignoring regression.
* Fix whitespace adjustment in win_dll.c
* Remove bracket in P_GetSkinSprite2 because I realised it was extraneous while making sure P_GetModelSprite2 worked with it.
2019-11-02 17:52:54 +00:00
mazmazz
7b9974ddd1 SNTX -> SONT 2019-11-02 13:30:03 -04:00
mazmazz
0b6651eb00 Remove TTCOUNTERSET to simplify custom title SOC 2019-11-02 12:40:12 -04:00
mazmazz
45b7f2e6cc Multi-res title screen gfx 2019-11-02 12:12:36 -04: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
mazmazz
49917d6f3f Merge remote-tracking branch 'origin/master' into new-title 2019-11-01 21:06:46 -04:00
toaster
51ba82829f Forgot to stage this. 2019-11-01 16:33:46 +00:00
toaster
0c9fe6a878 Prevent desync with modeattacking. 2019-11-01 16:25:28 +00:00
toaster
b501e5b358 Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.) 2019-11-01 15:48:50 +00:00
lachwright
70a68d3fa9 Add static ATZ Gargoyles 2019-10-31 19:38:28 +08:00
lachwright
3bbb4c3b36 Finish Glaregoyle states 2019-10-31 19:18:44 +08:00
toaster
f75845af10 Change sounds, after discussing with Lach. 2019-10-30 17:37:42 +00:00
toaster
9fa49b8909 ACTUALLY applied colorized flashing for dashmode to non-SF_MACHINE players, which wasn't happening for non-transparent players because :VVV 2019-10-30 17:16:44 +00:00
lachwright
f8d9213fca WIP new states for Glaregoyle 2019-10-31 00:32:19 +08: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
lachwright
2fd47fc70d Implement new states for Buggle, the new Aquabuzz 2019-10-29 15:32:03 +08:00
Jaime Passos
c31a8e8978 Use doomtype.h types instead of libpng types 2019-10-29 00:20:21 -03:00
Jaime Passos
2e1ecda3fa Use doomtype.h types instead of libpng types 2019-10-29 00:15:33 -03:00
Jaime Passos
34f1dc20b1 Fix warnings when NOPNG=1 2019-10-28 23:46:33 -03:00
Jaime Passos
76a5b60e39 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -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
Jaime Passos
3af6ec9b1b Update p_user.c 2019-10-28 15:37:26 -03:00
Jaime Passos
1c46be78af add r_patch.c 2019-10-28 15:28:42 -03:00
Jaime Passos
5f31d02d28 Update r_data.c 2019-10-28 14:36:19 -03:00
Jaime Passos
116fb2639e Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03: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