stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-02 01:03:50 +00:00
Code Issues Projects Releases Packages Wiki Activity
11545 commits 177 branches 41 tags 186 MiB
Commit graph

1223 commits

Author SHA1 Message Date
Alam Ed Arias
6ad1086128 Merge branch 'public_next' into master 2015-09-03 15:58:16 -04:00
Yukita Mayako
2fb03a7cff Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into angles 
Conflicts:
	src/p_map.c - Automatically resolved by mergetool
 2015-08-22 09:52:11 -04: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
RedEnchilada
6d3e318a0c Revert "Guess what major breaking-news bug I just fixed B)" 
This reverts commit 9e306394dd.
Sorry MI, but this completely breaks large maps like AGZ.
 2015-08-03 13:45:51 -05:00
Alam Ed Arias
22433bcb54 Merge branch 'new-animations' into 'master' 
New player animations (Updated player.dta Sonic)

Adds support for several completely new player animations, mostly for Super Sonic.

See merge request !5
 2015-06-22 09:59:39 -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
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
Alam Ed Arias
fb5cba78d3 Merge branch 'public_next' into private 
Conflicts:
	src/p_mobj.c
 2015-06-18 10:54:53 -04:00
Yukita Mayako
fc649ce195 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into hotfix-pltz 
Conflicts:
	src/dehacked.c
	src/p_mobj.h
 2015-06-09 07:38:21 -04:00
Yukita Mayako
9a9025b1ee Remove pmomz from players who are on ground. 
Assume that every frame the player is on the ground, their pmomz will
be re-set properly if the floor is moving, therefore if the platform
STOPS, we need this to set it to 0.
 2015-06-09 06:59:34 -04:00
Yukita Mayako
8a261ea467 Fix sprite2 fallbacks. 
It didn't work at all before, oops. :/
 2015-05-29 15:40:49 -04:00
Yukita Mayako
a1c67e7e67 Add MFE_APPLYPMOMZ to fix camera movement. 
Here's how it works: When a player walks off the
moving platform, it applies their pmomz once, and
then _keeps pmomz set_ so that the camera still
adds pmomz to its movements until they hit another
floor. This way, the camera doesn't jerk around.
 2015-05-29 13:53:06 -04:00
Yukita Mayako
3bc56a91b2 Hotfix for platform movement being dropped on players. 
Now players will apply platform movement when jumping,
but only if the platform is moving the same direction
as their jump is, and all other objects will have an
appropriate pmomz in reverse gravity FOF situations.
 2015-05-29 04:34:53 -04:00
Yukita Mayako
2d14173968 Allow spin button Jump Shield normally. 
If you walk off a cliff with a jump shield, you
can now press EITHER the jump or spin buttons to
activate it and double jump.
 2015-05-29 02:35:24 -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
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
406d809bc2 Change attract homing thok to negate Z. 
Do not keep Z momentum from homing. It is a bad idea.
 2015-05-27 22:57:42 -04:00
Yukita Mayako
8a1411b122 Attraction homing tweaks. 
Lower homing speed.
Retain velocity after hitting your target.
 2015-05-27 22:06:27 -04:00
Yukita Mayako
18920e486d Add sfx to Attract shield dash. 
Because it seemed really weird for a
sudden shift of momentum to be unaccompanied.
 2015-05-27 06:07:38 -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
Yukita Mayako
4a1f0ce91c New attract shield active 
Homing attack when activating the attract shield while jumping.
 2015-05-27 05:24:50 -04:00
Yukita Mayako
c6c4ab7c53 New emerald behavior in Match. 
No longer turns you super, instead emeralds steal points
from enemy players and give you (and relevant teammates)
an invincibility + super sneakers monitor.
 2015-05-27 02:39:46 -04:00
Yukita Mayako
67fcff7ee7 New Match ammo consumption rules. 
Weapon rings can now be fired with no rings at double the ammo cost.
 2015-05-27 02:39:42 -04:00
RedEnchilada
a9d49cd9fa Make all specials reliant on floor touch work right with sloeps 
(I might've missed some, though)
 2015-05-24 12:53:30 -05:00
RedEnchilada
89319b1c2a Dummy out m_vector and use m_fixed's functions instead 
These functions were already here before, and I /swear/ the slope
physics became slightly less glitchy after switching to them...
Only issue is the slope plane mapping code hasn't been properly
converted yet, so they don't render properly for now.
 2015-05-22 22:07:07 -05:00
RedEnchilada
3f8e7b1739 Revert/remove unused/broken junk from original slopes port 
m_vector removal to come later. The little thing commented out in it
is so I could revert the weird tables.c change.
 2015-05-22 20:57:58 -05:00
RedEnchilada
0d9f8028b7 Players now bounce off of slopes on bouncy FOFs 2015-05-21 15:49:49 -05:00
RedEnchilada
0e94cc66ff 2-in-1! Fixed slide movement AND climbing when around slopes 2015-05-20 19:08:49 -05:00
RedEnchilada
7b0e98ef35 Change sliding physics and standing/rolling rules on slopes 2015-05-20 13:18:41 -05:00
RedEnchilada
371e23d55d Reduce acceleration pushback to less absurd levels 2015-05-13 16:02:19 -05:00
RedEnchilada
02d63aa011 Tweaks to slope physics + add accel rules for slopes 
Your acceleration vector parallel to the slope is reduced based on slope
angle if it's going up the slope. The pull physics' momentum increase was
toned down a bit to go along with this. Also, I removed the ifdefs for
OLD_MOVEMENT_CODE because why should that be kept around?
 2015-04-30 00:32:44 -05:00
RedEnchilada
923fae476e Merge branch 'fury-gh/slopes' into angles 
Conflicts:
	src/p_maputl.c
 2015-04-19 15:56:55 -05:00
Ronald Kinard
91934d5aec Merge branch 'next' into internal-master 
Synchronize the following MRs to internal:

 * STJr/SRB2!6
 * STJr/SRB2!8
 * STJr/SRB2!9
 * STJr/SRB2!10

Conflicts:
	src/doomdef.h
	src/p_map.c
 2015-04-14 19:33:38 -05:00
RedEnchilada
d2c74e1b13 Fix the west/south blockmap issue without fucking up huge maps 2015-04-08 21:32:07 -05:00
RedEnchilada
09345ce929 Revert "Guess what major breaking-news bug I just fixed B)" 
This reverts commit 9e306394dd.
Sorry MI, but this completely breaks large maps like AGZ.
 2015-04-08 20:50:49 -05:00
MonsterIestyn
9e306394dd Guess what major breaking-news bug I just fixed B) 
...

(It's that infamous intangible West/South linedefs bug, which was really a blockmap-related bug all along. AND IT WAS SO SIMPLE TO FIX!)

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9048 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:14 -04:00
MonsterIestyn
a797e88bb9 Red's last commit should have been using "pgl", not "gl" for function name prefixes, so the compiler would be happy. Also, more simplicity in my camera code please! Simplified some of the checks for whether a camera should chase or not etc 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9046 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:14 -04:00
JTE
8d7b5941a8 Changed super colors to make them pulse instead of flash. Removed alt. supercolors from replay ghost stuff, because that's stupid. :/ 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8999 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 20:43:11 -05:00
Alam Ed Arias
82fc6fd4c0 whitespace cleanup 2015-03-01 19:38:42 -05:00
Wolfy
19b52d19cb Have super sparks scale with the player 
Fixes https://mb.srb2.org/showthread.php?t=40279

Should work fine, but do keep in mind that this fix is untested.
 2015-03-01 19:38:42 -05:00
Alam Ed Arias
6513954789 whitespace cleanup 2015-03-01 19:30:22 -05:00
Wolfy
627889eec1 Have super sparks scale with the player 
Fixes https://mb.srb2.org/showthread.php?t=40279

Should work fine, but do keep in mind that this fix is untested.
 2015-03-01 19:28:57 -05:00
MonsterIestyn
0ab6710dfa Guess what major breaking-news bug I just fixed B) 
...

(It's that infamous intangible West/South linedefs bug, which was really a blockmap-related bug all along. AND IT WAS SO SIMPLE TO FIX!)

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9048 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:24 -06:00
MonsterIestyn
d818b7af50 Red's last commit should have been using "pgl", not "gl" for function name prefixes, so the compiler would be happy. Also, more simplicity in my camera code please! Simplified some of the checks for whether a camera should chase or not etc 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9046 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:23 -06:00
MonsterIestyn
e83fa3dc43 Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? 
Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:18 -06:00
JTE
3a0f5fd2ae Changed super colors to make them pulse instead of flash. Removed alt. supercolors from replay ghost stuff, because that's stupid. :/ 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8999 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:02:57 -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
d959d0e462 Merge remote-tracking branch 'wolfy852/patch-2' into next 2014-11-29 13:08:32 -05:00
Ronald Kinard
54f0d0c110 IN PROGRESS: porting eternity slopes from srb2cb 2014-11-18 18:45:57 -06:00
Alam Ed Arias
404b5f666c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
Wolfy
197e5fce55 Change super transformation to freeze momentum instead of bitshifting 
Fixes https://mb.srb2.org/showthread.php?t=39921 where the issue before was that when you transformed your momentum would still have you moving slowly, which could cancel out the animation.
 2014-10-01 21:19:32 -05:00
Alam Ed Arias
7cb77075d1 SRB2 2.1.11 release 2014-08-26 23:56:30 -04:00
Alam Arias
81cbdcccd5 Merge pull request #28 from wolfy852/master 
Remove momentum reduction in CA_JUMPTHOK
 2014-08-26 21:29:24 -04:00
Alam Ed Arias
d6c29e19ab SRB2 2.1.10 release 2014-08-05 19:59:40 -04:00
Wolfy
53c791b29c Remove momentum reduction in CA_JUMPTHOK 
Also add new multiability handling for it
 2014-08-04 13:38:19 -05:00
Alam Ed Arias
c028c83235 SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
wolfy852
39ce16a468 Add the Jump Thok ability for use by custom characters 2014-07-05 02:50:07 -05:00
wolfy852
a8f5406233 Add P_Telekinesis and P_IsFlagAtBase to Lua. 2014-05-25 21:41:05 -05:00
Wolfy
3f1038dcbe Unstatic P_SpawnSpinMobj. 2014-05-24 12:46:10 -04:00
Wolfy
ed82755b6d Unstatic P_SpawnThokMobj. 2014-05-24 12:30:33 -04:00
ilag
d8234f408b Ensures the force shield's movecount is correctly set before comparing 2014-05-15 11:36:17 -07:00
ilag11111
aafc0bcb0d Ensures that the force shield's sprite returns to the proper state after receiving an invincibility monitor. 
Fixes http://mb.srb2.org/showthread.php?p=752815
 2014-05-14 16:27:37 -07:00
Alam Ed Arias
8a9759a3e4 SRB2 2.1.8 release 2014-04-19 13:41:29 -04:00
Alam Arias
7fb530fd18 grr, shadows 2014-04-17 17:52:33 -04:00
Alam Ed Arias
d6e48e2168 whitespace cleanup 2014-04-17 17:47:51 -04:00
RedEnchilada
fa79c1856c Make player seethru code account for cut-away view 2014-04-17 13:46:40 -05:00
Alam Ed Arias
02a3b0776c SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
Alam Ed Arias
32de698f5e SRB2 2.1.6 release 2014-03-24 22:17:59 -04:00
Alam Ed Arias
15bd266cac SRB2 2.1.5 release 2014-03-23 12:00:29 -04: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