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

331 commits

Author SHA1 Message Date
toasterbabe f8dd9b64ab Elemental shield ability now coded. REQUIRES NEW PATCH.DTA FROM THE FTP. 
- Press spin in midair to stomp directly downwards (losing horizontal momentum), creating a flickering fireball around you.
- No bouncing on enemies, item boxes, etc - just go straight through.
- Hurts other players on touch whilst you're stomping.
- Spawns a bunch of flames around you when you hit the ground.

Also:

- Electric shield's ability now uses different sounds, because I'm picky.
 2016-07-08 21:55:17 +01:00
toasterbabe 95ac0fa9a0 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-07-08 13:20:24 +01:00
toasterbabe 2d01e3f045 First hardcoded work for our good old friend Boss number 5. 
(Look, I know I shouldn't be hardcoding things at this stage... but things broke terribly when I tried to convert A_BrakLobShot to Lua, so.)
 2016-07-05 20:39:45 +01:00
Alam Ed Arias 032313260a Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
Inuyasha f07585191b copyright dates/statements updated and such 
(no actual SLOC changes)
 2016-05-17 17:42:11 -07:00
Inuyasha 1ee01063e3 All SRB1 objects, states, and sprites removed. 2016-03-09 02:54:09 -08:00
Inuyasha 317161221d Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-03-09 01:23:48 -08:00
Inuyasha 6aa708b5af I don't think we need the BLUE_SPHERES define anymore... 2016-03-09 00:49:35 -08:00
Monster Iestyn 560d7d9aae Sideways springs, horizontal hog-launchers, perpendicular plungers... 
Call them what you like, they're in the game now
 2016-03-03 22:38:06 +00:00
Inuyasha e7ff405c52 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 
# Conflicts:
#	src/hardware/hw_md2.c
#	src/p_mobj.c
#	src/p_mobj.h
 2016-02-29 00:14:16 -08:00
Inuyasha 1bdd4cf641 backport state-animations from internal master to public next 
most other code in the branch did not come along for the ride.
 2016-02-09 02:39:16 -08:00
Inuyasha 01dd3e9bd5 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into spr2-freeslots 2016-01-15 02:29:51 -08:00
Inuyasha 9ba43e1d01 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into repeat-monitors 2016-01-15 02:20:34 -08:00
Inuyasha a4badcfe54 Revert the revert because it turns out Rob is a doofus 
player.dta was in a sort of mishmashed half designed for one SPR2 layout and half the other.

This reverts commit cc0fbf1c1b.
 2016-01-14 06:35:10 -08:00
Inuyasha cc0fbf1c1b Revert "Several changes to split jump anims from spin anims:" 
This reverts commit 27b65e3569.
 2016-01-14 04:57:17 -08:00
Monster Iestyn 27b65e3569 Several changes to split jump anims from spin anims: 
* SPR2_JUMP and SPR2_SJMP are now the jump sprite sets for spin chars
* SPR2_SPNG and SPR2_SSPG are the new sprite sets for spring up anims (instead of JUMP/SJMP)
* S_PLAY_JUMP and S_PLAY_SUPER_JUMP are now the states for spin char jumps
* S_PLAY_SPRING and S_PLAY_SUPER_SPRING are the new states for spring up (instead of the "JUMP" states)
* PA_JUMP is now PA_SPRING (jumping anims are lumped with PA_ROLL)
 2016-01-03 18:19:11 +00:00
Inuyasha 98f652aca6 Big monitors are "Gold Monitors" now. 
The useless ones have been removed, too, and they should always spawn as what they should regardless of settings.
By the way, graphics are at https://dl.dropboxusercontent.com/u/3518218/22/monitorgfx.wad
 2015-12-31 15:29:08 -08:00
Inuyasha 265a607b58 rewrite of monitors to accomodate repeat use monitors. 
It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process.
Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
 2015-12-31 08:38:23 -08:00
Yukita Mayako 14e8ac702f Added freeslots for SPR2. 
Make sure your MAINCFG / LUA lump comes _before_ the S_SKIN section.
 2015-10-31 14:45:42 -04:00
Yukita Mayako 496662bec5 Super float animation. 
When Super Sonic is "walking in the air", he has a
unique animation for it now which is similar to how
it looked in previous SRB2 versions.
 2015-06-19 01:30:06 -04:00
Yukita Mayako d2ef4d3e3c Add S_PLAY_SUPER_STUN and PA_PAIN 
For Super Missiles, the Super Sonic player
has a seperate animation from normal pain.
 2015-05-29 14:57:53 -04:00
Yukita Mayako e9c1771017 Add new spindash animation. 
This adds SPR2_DASH, S_PLAY_DASH, and
related p_user.c changes to give charging
your spindash a unique animation.
 2015-05-29 01:52:42 -04:00
Yukita Mayako ff181d099c Add new player animations. 
Added drowning to all players, and several new
Super animations for Sonic.

Removed A_Fall from S_PLAY_DEAD and moved its
effect into P_KillMobj for player avatars.
 2015-05-29 00:56:02 -04:00
Yukita Mayako 4a1f0ce91c New attract shield active 
Homing attack when activating the attract shield while jumping.
 2015-05-27 05:24:50 -04:00
MonsterIestyn 965bd2f694 Crawlas now use only one state for looking each 2015-03-31 17:56:06 -04:00
MonsterIestyn c93ae69d9d Crawlas now use only one state for looking each SPR2_ constants added to dehacked.c for use in SOC/Lua (both "SPR2_RUN" and "SPR2_RUN_" are in theory the same thing in this implementation, likewise for other 3-char name cases) spr2names array/table also added for use in Lua - it works identically to Lua's sprnames, only with SPR2_ constants/string names instead Some minor cleanup for OpenGL sprite/MD2 code 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9004 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:03:01 -06:00
JTE b2681984a6 Merge branch 'player-animations' 
SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible.

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 01:59:38 -06:00
Alam Ed Arias 73b3287b19 SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
Alam Ed Arias 02a3b0776c SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
Alam Ed Arias a03da73115 SRB2 2.1.2 release 2014-03-17 08:13:16 -04:00
Alam Ed Arias b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00