Commit graph

303 commits

Author SHA1 Message Date
Tatsuru 9e4c519cad In-map visual indicator 2020-01-19 19:02:03 -03:00
James R 1be648578f Merge branch 'clear-sign-sprite' into 'next'
Add generic signpost sprite for skins that don't have one

See merge request STJr/SRB2!626
2020-01-16 19:57:54 -05:00
Tatsuru 3e3cb48feb This is stupid 2020-01-09 12:15:26 -03:00
lachwright da226139f1 Add generic signpost sprite for skins that don't have one 2020-01-03 13:12:18 +08:00
Jaime Passos c6f36fc470 un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
lachwright 9a7979d841 Have Minus rotate in mid-air 2019-11-24 22:29:26 +08:00
MascaraSnake 2c85aa9f69 Merge branch 'drtminus' into 'master'
drt minus

See merge request STJr/SRB2Internal!495
2019-11-22 16:09:58 -05:00
lachwright c5d085d333 Add missing GFZD spriteset 2019-11-21 01:14:24 +08:00
lachwright ac3924c9c8 Add GFZ debris; reorganize wood debris index 2019-11-21 01:05:22 +08:00
MascaraSnake 2418e33a00 Merge branch 'cobalt-ai' into 'master'
CobaltBW's Tails AI

See merge request STJr/SRB2Internal!358
2019-11-18 17:26:28 -05:00
MascaraSnake 7dc3484e5d Merge branch 'dragonbomber' into 'master'
Dragonbomber

See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
toaster ab70512253 As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite. 2019-11-18 22:05:05 +00:00
toaster 1fdcc270d8 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai
# Conflicts:
#	src/p_map.c
2019-11-18 21:33:51 +00:00
MascaraSnake 1365ef49b3 Merge branch 'jester-fireball' into 'master'
Mario fireball by Jester (resolves #296)

Closes #296

See merge request STJr/SRB2Internal!487
2019-11-18 15:56:33 -05:00
MascaraSnake 1210545a8e Merge branch 'fhzenemytweaks' into 'master'
Hardcode DrT's FHZ improvements (resolves #295).

Closes #295

See merge request STJr/SRB2Internal!483
2019-11-18 15:21:59 -05:00
lachwright bb67b24143 Add flight indicator 2019-11-18 15:17:27 +08:00
lachwright ac7d07c9da Prevent mines from sliding upon touching the ground 2019-11-18 10:35:56 +08:00
Jaime Passos 64939816fb Fireball 2019-11-17 21:25:17 -03:00
lachwright b721c035f8 Add Dragonbomber enemy 2019-11-18 05:23:59 +08:00
toaster ef5558af97 Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha 2019-11-17 20:34:25 +00:00
toaster 892f6eca27 Make ACZ3's slapstick signpost taller (resolves #267). 2019-11-15 14:52:34 +00:00
MascaraSnake 6c6d89ca57 Merge branch 'flickies_not_in_walls' into 'master'
Flickies not in walls

See merge request STJr/SRB2Internal!461
2019-11-14 18:07:19 -05:00
MascaraSnake 8f6890025c Merge branch 'secretstuff' into 'master'
The letter

See merge request STJr/SRB2Internal!438
2019-11-14 17:49:23 -05:00
toaster afe28b0a0a * Remove the 22(!!) NiGHTS sprite2s that no longer get used in ROTSPRITE builds (which should be our main builds going forward).
* Rename `SPR2_NGT0` to `SPR2_NFLY`, and `SPR2_DRL0` to `SPR2_NDRL` to account for this. (requires modifying player.dta)
2019-11-14 17:03:02 +00:00
toaster a3de6d21c4 * Add a "moveforward" param to P_InternalFlickySpawn, which controls whether to spawn the flicky a little in front or behind of the object making it.
* Expose this via additional upper-16-bits flags of A_FlickySpawn.
* Use this to make Snailers not spawn their flicky inside the wall they're attached to.
* Make the behaviour of Egg Capsules more consistent mechanically regarding the flicky spawning, using the above as one relevant element.
2019-11-13 20:14:08 +00:00
Jaime Passos 245881ec55 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
MascaraSnake d9558fb724 Merge branch 'atz-hazards' into 'master'
Azure Temple Zone hazards, round 2

See merge request STJr/SRB2Internal!437
2019-11-12 18:05:44 -05:00
toaster 5729ba3cd2 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
# Conflicts:
#	src/p_user.c
2019-11-12 21:56:46 +00:00
Jaime Passos 91a01be891 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-11 14:41:55 -03:00
toaster 292791ffaf Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording 2019-11-08 13:02:32 +00:00
lachwright bd9878eb48 Merge branch 'master' into spinny-sign 2019-11-08 19:59:08 +08:00
James R b157c21a35 There's some whitespace... 2019-11-07 14:56:42 -08:00
lachwright cf39e181bb Display Eggman more frequently during skin roulette 2019-11-05 01:33:09 +08:00
lachwright eb6d3b3dbe Improve A_SignSpin 2019-11-04 23:10:13 +08:00
lachwright 5e03d40b33 New end-of-level signpost logic 2019-11-04 16:28:44 +08:00
toaster 67f5b2245f 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 f3e9dd0cad Add static ATZ Gargoyles 2019-10-31 19:38:28 +08:00
lachwright 95a3546988 Finish Glaregoyle states 2019-10-31 19:18:44 +08:00
lachwright 7c08cd69fa WIP new states for Glaregoyle 2019-10-31 00:32:19 +08:00
lachwright 9436993a3e Implement new states for Buggle, the new Aquabuzz 2019-10-29 15:32:03 +08: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 79e99dc471 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03:00
lachwright e89948ce71 Merge branch 'master' into metalstuff 2019-10-26 16:07:59 +08:00
lachwright ca768b044d Merge branch 'master' into metalstuff 2019-10-26 08:30:37 +08:00
lachwright 63d24d529a Merge branch 'master' into knuxstuff 2019-10-26 05:53:49 +08:00
MascaraSnake 03c5b70fc5 Merge branch 'newmenus' into 'master'
Better looking menus, nametags and much more. (Resolves #245 and #244 and #252)

Closes #245, #244, and #252

See merge request STJr/SRB2Internal!389
2019-10-25 17:46:16 -04:00
toaster f2596ab0bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks
# Conflicts:
#	extras/conf/SRB2-22.cfg
2019-10-25 20:32:15 +01:00
lachwright c201879d69 Add Metal's jet fume 2019-10-23 12:35:17 +08:00
lachwright 3a3122e255 Add green flame sprites, state, and object 2019-10-21 16:22:20 +08:00