lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2150 commits 1 branch 29 tags 122 MiB
Commit graph

182 commits

Author SHA1 Message Date
toasterbabe f8d37e5df7 fix commenting and indentation that was rushed for new years 2017-01-01 00:39:33 +00:00
toasterbabe be140d8143 Added "Flickylist = All" option. 
Couldn't get it to default to anything - it was causing crashes, and new years is in ten minutes, so let's do that tomorrow.
 2016-12-31 23:47:47 +00:00
toasterbabe 311886e582 * Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. 
* Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
 2016-12-31 16:55:06 +00:00
toasterbabe d3a70eb1db * All Flicky A_ functions ported. 
* Corrected MT_EGGSHIELD spawning a flicky.
* New compared to the Lua implementation: Flickies turn around when they hit walls!
 2016-12-30 19:16:20 +00:00
toasterbabe bf8bff82ba * MT_EGGTRAP (egg capsule center mobj) converted over to flickylist system. 
* MT_EXPLODE's anims partially FF_ANIMATE'd.
* A_FlickySpawn turned into a wrapper for internal function that does what A_FlickySpawn did but returns a pointer to the spawned flicky.
 2016-12-30 14:04:04 +00:00
toasterbabe d9177f778f * Made what MI had compile. 
* Added the ability to read in mobjtypes as well as from a short list of flicky constants.
* Added a new state, S_XPLD_FLICKY, which is the new deathstate of all badniks.
* Put the disabled animal-spawn-on-P_KillMobj behind a #define.
* Renamed the branch and associated properties to something not rife with sin.
 2016-12-29 17:02:05 +00:00
Monster Iestyn cecc1912fe Starting work on adding new system for spawning animals; added A_FlickySpawn and level header "animallist"/"flickylist" parameter 
No idea if this compiles yet (let alone if what is there works at all), just getting this out the way so I can work on certain other things *cough plane displacement cough*
 2016-12-27 21:01:20 +00:00
toasterbabe d8d5f31898 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-12-13 22:03:59 +00:00
Monster Iestyn 6f8969aec0 Merge branch 'spindash-dust' into 'master' 
Spindash dust

Charging a spindash kicks up dust, we all know this feature was dying to get in at some point. Bubble and flame forms of spin dust are included from FSonic, for underwater and elemental respectively.

Oh, and as a bonus I reorganised the spindash/spinning/other ability2 stuff code to look a bit neater and more organised.

New resources:
* MT_SPINDUST - the object
* S_SPINDUST1 to 4 - the normal form's states
* S_SPINDUST_BUBBLE1 to 4 - the bubble form's states
* S_SPINDUST_FIRE1 to 4 - the bubble form's states
* SPR_DUST - the normal form's sprite set (uses frames A to D, just pinch FSonic's sprites really)
* SPR_FPRT - the flame form's sprite set (frame A only)

SF_NOSPINDASHDUST disables spindash dust for a character

See merge request !52
 2016-12-13 15:15:33 -05:00
Monster Iestyn cc2612c2d8 Merge branch 'master' into TEXTURES-additions 2016-11-27 19:49:56 +00:00
toasterbabe 85fb02aaf6 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 
# Conflicts:
#	src/p_inter.c
#	src/p_user.c
#	src/st_stuff.c
 2016-11-20 16:44:38 +00:00
Monster Iestyn 6e70acc82d Added SF_NOSPINDASHDUST to disable spindash dust 2016-11-13 22:33:57 +00:00
Monster Iestyn c81665b9af Added flame version 2016-11-13 22:02:29 +00:00
Monster Iestyn 47c67472ff Added bubble form of spin dust 2016-11-10 21:09:05 +00:00
Monster Iestyn ce97c1e986 Added basic spindash dust 
Also cleaned up some of the code in P_DoSpinAbility while I was at it
 2016-11-10 17:51:10 +00:00
toasterbabe bf873f8a9b Fixed a heinous modding bug with not properly updating dehacked.c, and added pf_SHieldability to debug. 2016-10-24 16:30:40 +01:00
toasterbabe 3ce411b62a Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.) 2016-10-24 12:35:40 +01:00
Monster Iestyn a7c8c60379 Merge branch 'master' into damage-control 2016-10-23 21:08:17 +01:00
toasterbabe 45d32b7f7c * Flameaura shield now has boosh sprites. 
* MF2_SHIELD calls shield thinker (P_AddShield/P_ShieldLook).
* Multiple types of force shields now handled.
 2016-10-23 20:34:43 +01:00
toasterbabe c18c014bef Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-23 14:47:37 +01:00
Monster Iestyn bd153d83b7 Merge branch 'nix-srb1' into 'master' 
Remove SRB1 Remake data

What it says on the tin.

See merge request !47
 2016-10-22 22:18:36 -04:00
Monster Iestyn 587c0079e2 Started work on FLIPX/FLIPY support for patches. Doesn't do anything yet, but the parser should know how to look for them now 
Note: I had to create M_UnGetToken in order to avoid problems with looking for patch parameters (marked by { and }) but not finding anything
 2016-10-22 23:19:24 +01:00
toasterbabe c1a8dd9a37 Minor refactor of what I did last night - as a modifiable state instead of hardcoded references. 2016-10-20 13:44:03 +01:00
toasterbabe 9b4c81ed0b Thundercoin shield complete. 2016-10-17 23:22:04 +01:00
toasterbabe beecd72a22 BUBBLE BOUNCE ANIMATION 2016-10-17 20:39:22 +01:00
toasterbabe 5ff507213b * Some shield constants renamed. 
* Some shield sounds swapped (can be reverted later).
* Partial implementation of S3K shield abilities.
* The ability to elemental-groundpound onto gold monitors without going straight through them.
* Force shield ability removed because nobody could agree on it, we'll keep it blank until another idea can get through the disagreement juggernaut.
 2016-10-16 22:28:50 +01:00
toasterbabe aa8a454ea9 Turning some shield attributes into flags means that environmental protection and ring-pulling can be more elegantly handled. As a consequence, the S3 shields now have all their passives, and are just waiting on me to give them actives (two of which don't have the necessary sprites for...) 2016-10-16 01:23:00 +01:00
toasterbabe 3aa9d2a1b1 Sonic 3 shields implemented at a basic visual/functional level - no abilities yet. 2016-10-15 23:39:54 +01:00
toasterbabe 5e92ca1a4a Okay, made the Mushroom a seperate shield instead of a hacked pity shield. This is a lot nicer in general. 2016-10-14 10:43:46 +01:00
toasterbabe 80300ac476 Fireflower is now on same level as all other shields, as opposed to being an additional stack layer. (MID LECTURE COMMIT STRATS YO) 2016-10-13 15:14:13 +01:00
toasterbabe d25e908b80 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 
# Conflicts:
#	src/p_map.c
 2016-10-11 16:25:24 +01:00
Monster Iestyn 719220da4a Merge branch 'master' into damage-control 2016-10-08 17:12:13 +01:00
Inuyasha ff4b39bab4 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into nix-srb1 
# Conflicts:
#	src/info.c
 2016-10-05 18:47:32 -07:00
Inuyasha 0fdfb1a472 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into animate_global 
# Conflicts:
#	src/p_pspr.h
 2016-10-03 00:27:49 -07:00
toasterbabe 5614ff5691 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_sprites 
# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c
 2016-10-02 19:38:53 +01:00
Monster Iestyn 0fb89c620d Merge branch 'master' into damage-control 2016-09-30 21:05:44 +01:00
toasterbabe e05528e4a3 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-09-30 12:44:08 +01:00
Inuyasha afb22b968b FF_GLOBALANIM for synced animations 
and a few other frame flag changes
 2016-09-30 03:20:57 -07:00
Inuyasha 074cc9b965 Dehacked, as usual 2016-09-29 19:32:21 -07:00
Inuyasha f1b8bfcfe7 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into repeat-monitors 
# Conflicts:
#	src/info.c
#	src/p_map.c
 2016-09-29 18:08:50 -07:00
toasterbabe a8be1e6b7d Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 
# Conflicts:
#	src/d_player.h
#	src/p_inter.c
#	src/p_mobj.c
#	src/p_user.c
 2016-09-27 18:24:53 +01:00
toasterbabe c70661186a Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_sprites 
# Conflicts:
#	src/dehacked.c
#	src/p_inter.c
#	src/p_pspr.h
 2016-09-27 18:11:20 +01:00
Inuyasha 1d71dfa5a3 animate icons using FF_ANIMATE 
(this also means they last one second again, and the powerup is given after 1/2 a second, things which were lost when the flip was added)
 2016-09-25 20:55:08 -07:00
Inuyasha 1a4b894589 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into repeat-monitors 
# Conflicts:
#	src/info.c
 2016-09-24 23:05:01 -07:00
toasterbabe 50a44d96b1 Changes to bubbles for new DSZ + bubble sprites (needs new patch.dta). 2016-09-24 17:15:42 +01:00
toasterbabe 28523760c3 FF_VERTICALFLIP, since I've been messing around with sprite stuff. 
* flips the sprite ala MFE_VERTICALFLIP except you don't need to flip the direction of gravity for the object just to draw upside down
* stacks properly with reverse gravity
 2016-09-24 14:23:00 +01:00
toasterbabe e16648a72b Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. 
* PF_ITEMHANG -> CR_GENERIC
* PF_CARRIED -> CR_PLAYER
* (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE
* PF_ROPEHANG -> CR_ROPEHANG
* PF_MACESPIN -> CR_MACESPIN
 2016-09-23 23:48:48 +01:00
toasterbabe 54f463ce81 Forgot dehacked.c description! 2016-09-16 17:15:16 +01:00
toasterbabe db6e7fd985 Introducing MF2_LINKDRAW! I put it in this branch because it (ab)uses some structural changes I made for papersprites. 
* Sets the sortscale of the mobj to that of its tracer.
* Basically, Smiles' tails won't clip through shields thanks to this.
* http://gfycat.com/GraveGlassEwe
* Also has support for chains of MF2_LINKDRAW!
 2016-09-16 17:09:33 +01:00
toasterbabe f34a28e80e Removed a hack that caused the groundpound spinfire to hurt you if you lost your shield. 2016-08-21 13:55:16 +01:00