James R
9820a7384f
Reset rollangle on TNT explosion
...
This is the where the extreme lag when TNT Barrels explode came from. Probably
because the sprites are big and there's four of 'em! It shouldn't matter that
these aren't rotated--they're pretty round.
2020-01-31 14:32:47 -08:00
James R
e831a61df5
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
8d5153a595
This is stupid
2020-01-09 12:15:26 -03:00
lachwright
95ca48ada7
Add generic signpost sprite for skins that don't have one
2020-01-03 13:12:18 +08:00
Jaime Passos
be227cc58c
un-ROTSPRITE rollangle and spriteinfo
2019-12-17 13:09:25 -03:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
lachwright
86ff608cfd
Have Minus rotate in mid-air
2019-11-24 22:29:26 +08:00
MascaraSnake
6ac467896b
Merge branch 'drtminus' into 'master'
...
drt minus
See merge request STJr/SRB2Internal!495
2019-11-22 16:09:58 -05:00
lachwright
eb80360850
Add missing GFZD spriteset
2019-11-21 01:14:24 +08:00
lachwright
a9326be8d7
Add GFZ debris; reorganize wood debris index
2019-11-21 01:05:22 +08:00
MascaraSnake
04fbb5dbd3
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
66cc8046a5
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
toaster
420656a716
As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite.
2019-11-18 22:05:05 +00:00
toaster
7bcaa5c359
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
5324107edf
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
ecd021abdf
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
cd38e4ba1a
Add flight indicator
2019-11-18 15:17:27 +08:00
lachwright
3fb5870445
Prevent mines from sliding upon touching the ground
2019-11-18 10:35:56 +08:00
Jaime Passos
743f04e2ca
Fireball
2019-11-17 21:25:17 -03:00
lachwright
814ee200fa
Add Dragonbomber enemy
2019-11-18 05:23:59 +08:00
toaster
e936b0d893
Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha
2019-11-17 20:34:25 +00:00
toaster
9c221d2362
Make ACZ3's slapstick signpost taller ( resolves #267 ).
2019-11-15 14:52:34 +00:00
MascaraSnake
43938ef56d
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
9a0a85ba67
Merge branch 'secretstuff' into 'master'
...
The letter
See merge request STJr/SRB2Internal!438
2019-11-14 17:49:23 -05:00
toaster
a4efd441af
* 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
b0505e268e
* 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
24d20d2abb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
MascaraSnake
9b4d0de22b
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
f7c5774b7e
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
b078b8791a
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-11 14:41:55 -03:00
toaster
a480b05c6b
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
2019-11-08 13:02:32 +00:00
lachwright
46016b52e9
Merge branch 'master' into spinny-sign
2019-11-08 19:59:08 +08:00
James R
7c0d5b3bcf
There's some whitespace...
2019-11-07 14:56:42 -08:00
lachwright
6143e7a994
Display Eggman more frequently during skin roulette
2019-11-05 01:33:09 +08:00
lachwright
eb47aa9cf9
Improve A_SignSpin
2019-11-04 23:10:13 +08:00
lachwright
f828e040bb
New end-of-level signpost logic
2019-11-04 16:28:44 +08: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
lachwright
f8d9213fca
WIP new states for Glaregoyle
2019-10-31 00:32:19 +08:00
lachwright
2fd47fc70d
Implement new states for Buggle, the new Aquabuzz
2019-10-29 15:32:03 +08: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
116fb2639e
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
lachwright
9401241d6d
Merge branch 'master' into metalstuff
2019-10-26 16:07:59 +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
MascaraSnake
0073310c39
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
0842d1f328
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
7f55ee6fd9
Add Metal's jet fume
2019-10-23 12:35:17 +08:00
lachwright
3e584e5ad9
Add green flame sprites, state, and object
2019-10-21 16:22:20 +08:00