toasterbabe
64ef2798a2
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmode
...
# Conflicts:
# src/d_clisrv.c
# src/d_clisrv.h
2016-07-07 01:08:51 +01:00
ZTsukei
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
Monster Iestyn
9007904a72
Merge branch 'master' into damage-control
...
# Conflicts:
# src/p_inter.c
# src/p_mobj.c
2016-05-25 15:33:09 +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
Monster Iestyn
f9c4b877ca
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into damage-control
2016-03-13 20:37:43 +00:00
ZTsukei
ba18d968e5
Added vars to d_clisrv, renamed autoexec.cfg, added menu variables to d_netcmd.h, added powers to dehacked.c for LUA, and made sure things can actually compile correctly as-is (squished two errors).
2016-02-21 12:40:01 -05:00
ZTsukei
ebe0c46ccb
Updating player powers structure. May see revision.
2016-02-20 20:44:44 -05:00
ZTsukei
9d2e9e24c3
Fixing tabs
2016-02-15 20:39:08 -05:00
ZTsukei
69f9c10a99
16/02/15 Starting some setup
2016-02-15 11:08:54 -05:00
wolfy852
bd1231764e
Merge remote-tracking branch 'remotes/origin/master' into dashmode
2016-01-25 21:41:41 -06:00
Monster Iestyn
67b92d7273
Went and fixed the dashmode variable hack nonsense once and for all myself
...
would have gone for "dashtime", but then I was reminded that was already a name for something to do with spindash. Oh well
2016-01-25 11:47:33 +00: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
wolfy852
ebd2bdd1c8
Add CA_DASHMODE to the game
...
This works fine in single player on vanilla builds, multiplayer is untested. This might not be the best way to handle the ability, so modifications for efficiency/sanity might be necessary.
2016-01-01 14:53:29 -06:00
Monster Iestyn
6bc1a5fdef
Okay, major overhaul time!
...
*player->health (formerly the "HUD" health) is now to be known as player->rings, and now acts as the player's actual ring count
*player->mo->health (formerly rings + 1) is now always 1 when alive, regardless of ring count; if player with rings is damaged, this is untouched
Damage in normal SP/Coop gameplay has been tested and still works fine; still a lot of mess to clear up though
Tag damaging probably is broken now, I'll fix this later
2015-08-15 21:07:16 +01:00
Yukita Mayako
ffec58c09c
Add PA_EDGE to handle Super teeter animation bug.
...
States were being improperly checked where a panim
would be more appropriate.
2015-06-18 11:36:08 -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
98ba9ca140
Updated player->panims.
...
Added PA_JUMP and PA_RIDE to handle new Super jump
and ride, and added new animations to panim finder.
2015-05-29 01:48:56 -04:00
Yukita Mayako
65f2d4b80f
Add PF_SHIELDABILITY
...
This flag is used as a distinction between the
character ability CA_HOMINGTHOK and the attract
shield's active ability.
2015-05-27 05:59:42 -04:00
Alam Ed Arias
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
Alam Ed Arias
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
wolfy852
d6b466b7dd
Add skin flag for running on water
2014-07-05 03:23:49 -05:00
wolfy852
39ce16a468
Add the Jump Thok ability for use by custom characters
2014-07-05 02:50:07 -05:00
Alam Ed Arias
ed72bd8fa1
SRB2 2.1.4 release
2014-03-21 19:21:06 +00:00
Alam Ed Arias
2fed5d1270
SRB2 2.1.3 release
2014-03-18 13:56:54 -04:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
