lachwright
2d4b2a66d0
Better rollout behavior in lava
2019-10-07 15:25:32 +08:00
lachwright
4780898619
Collision polish
2019-10-07 14:51:32 +08:00
toaster
70c0763840
Good catch by MS.
2019-10-06 16:17:11 +01:00
toaster
7dd57a66c4
Fix entering an intangible FOF causing minecart derailment explosions. (Probably; I didn't get the bug to happen in the first place, but this looks like a likely culprit.)
2019-10-06 15:44:24 +01:00
MascaraSnake
5bfe79047a
Players carried by Pterabyte cannot adjust their angle and are in their falling state
2019-10-05 20:29:47 +02:00
MascaraSnake
9b795e56c4
Implemented lava splish. Feel free to suggest a different "splish" sound.
2019-10-05 10:00:59 +02:00
MascaraSnake
b38bd1a078
Lava is now either completely solid or completely intangible. No more half-assing
2019-10-01 21:58:18 +02:00
lachwright
52e7ae5322
Allow camera movement while climbing; allow sliding while landing from a glide
2019-09-30 14:38:58 +08:00
lachwright
6f394319cc
Allow retention of momentum when climbing off surfaces
2019-09-30 10:55:57 +08:00
lachwright
741b2a4fad
Merge branch 'master' into knuxstuff
...
Update to master (necessary for climbing changes)
2019-09-30 09:56:04 +08:00
lachwright
41cc52ce25
Resolve merge conflicts
2019-09-30 03:07:03 +08:00
lachwright
4a47b66990
(Hopefully) cover all cases for resetting rock usability
2019-09-30 03:05:08 +08:00
MascaraSnake
4c6a4b76cc
Pterabyte: Don't drop off player in the first ten tics after grabbing
2019-09-29 19:51:27 +02:00
MascaraSnake
ca9fdd4f0e
Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
# src/p_map.c
# src/p_user.c
2019-09-29 18:49:53 +02:00
MascaraSnake
309d26069f
Implemented the Pterabyte grabbing mechanic
2019-09-29 18:42:17 +02:00
lachwright
f67ef441b3
Hardcode pumice ball
...
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 20:18:40 +08:00
Jaime Passos
e2ce3988fb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-28 12:14:55 -03:00
toaster
74efc0e1f4
Merge branch 'bossprovements' into 'master'
...
ACZ3 intro
Closes #217
See merge request STJr/SRB2Internal!346
2019-09-27 08:55:19 -04:00
lachwright
7d4c39a738
Fix errormode compilation error
2019-09-25 23:09:05 +08:00
lachwright
9f4c65dc01
Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling)
2019-09-25 22:36:48 +08:00
toaster
01f507f3f4
Don't lock on if something is literally intangible.
2019-09-25 15:12:19 +01:00
lachwright
09c9ff0217
(Crudely) fixed camera jitter on certain FOF slopes
2019-09-25 21:15:19 +08:00
lachwright
bab92932ff
Further cleanup
2019-09-24 03:21:01 +08:00
lachwright
b1967eb97c
Cleanup
2019-09-24 03:10:41 +08:00
lachwright
f8dba1c3de
Lots of CA_GLIDEANDCLIMB changes:
...
Glide speed now starts at whatever speed you were traveling at prior.
If glide speed is below actionspd, the glide accelerates towards it.
When landing from a glide, player now enters a landing animation (SPR2_LAND); they cannot move in this state, but they can jump or start a spindash.
Ground-sliding after a glide can now be cancelled into the landing animation by releasing jump, where the same rules apply.
Climb speed increased x1.33.
2019-09-24 02:17:20 +08:00
lachwright
7ef840781f
Sneakers affect max glide speed, changed glideslide behavior
2019-09-23 02:56:01 +08:00
lachwright
363b6f23d2
Merge remote-tracking branch 'origin/master' into knuxstuff
...
Update to master branch
2019-09-23 00:21:35 +08:00
lachwright
3b25b8ba12
reallowed strafe key leeway, increased leeway strength
2019-09-23 00:21:28 +08:00
lachwright
cefc28802c
Trying out a new glide
2019-09-22 21:11:49 +08:00
toaster
d7ba804e22
Merge branch 'camerafix' into 'master'
...
Camera fixes
Closes #105
See merge request STJr/SRB2Internal!303
2019-09-20 11:51:30 -04:00
lachwright
ffdf562a4f
test??
2019-09-20 12:07:57 +08:00
lachwright
01074c47d6
Improved orbital camera in Software; cam_adjust cvars changed to on by default
2019-09-20 02:02:17 +08:00
toaster
571daa256a
Always pretend cv_playersforexit is 4 in co-op special stages.
2019-09-19 18:44:55 +01:00
toaster
26ac81fea7
* Resolve #224 (landing frames on ceiling contact).
...
* Fix some other landing weirdness with CA_BOUNCE.
2019-09-19 13:20:05 +01:00
toaster
0662774a76
* Remove sounds from swimming.
...
* Lower default swim animation speed.
* Make speed of flight/swim animation increase whenever mashing jump.
2019-09-19 12:30:30 +01:00
lachwright
a797e3afed
Added Camera Options submenu (provided my files aren't broken again (please D:))
2019-09-19 17:34:04 +08:00
toaster
7a4d1eefdb
Change threshold on autobrake skidding sound/animaton to runspeed rather than half of runspeed.
2019-09-18 14:16:52 +01:00
toaster
e8cf839d2f
Only set flight time to 0 if skin has SPR2_SWIM spriteset.
2019-09-18 14:11:06 +01:00
toaster
d82eb22457
More swim stuff!
...
* Prevent being able to damage enemies from below while swimming.
* Make the swim-specific bubbles happen at the hands instead of where the propeller would be.
* Improve placement/angle of swimming tails overlay.
* Immediately set flight time to 0 if a player is being carried underwater.
2019-09-18 13:46:17 +01:00
toaster
97a5cbd445
Completely untested cuz I need to commit before I can merge the compile fix, but the intent of this commit is:
...
* Fix S_PLAY_FLY_TIRED animation being fast.
* Add moving tails to S_PLAY_SWIM animation!
* Fix autobrake happening when your controls are locked by pw_nocontrol/PF_STASIS. (Resolves #219 , hopefully..?)
2019-09-18 12:46:18 +01:00
Nev3r
2b0a0dd90f
Merge branch 'deathstuff' into 'master'
...
Lots of death stuff
Closes #207
See merge request STJr/SRB2Internal!306
2019-09-16 16:32:45 -04:00
Nev3r
c732a4f2ad
Merge branch 'abilityclean' into 'master'
...
Clean up an ungodly amount of shit relating to abilities.
Closes #195 , #167 , and #177
See merge request STJr/SRB2Internal!307
2019-09-16 16:09:20 -04:00
James
5404fce6e4
Added cam_adjust, de-ghettoified the camera in general
2019-09-11 10:45:59 -04:00
James
0208de2d5b
Lach has blessed us with a remade cam_adjust.
2019-09-10 10:11:03 -04:00
toaster
abcf4f82ad
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
2019-09-08 18:00:25 +01:00
toaster
3eb4866a2d
* Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations).
2019-09-07 11:48:58 +01:00
toaster
5040f4d7f7
* Allow CA2_GUNSLINGER users to pop monitors with their ability (as long as their weapon type isn't a pre-existing weapon ring).
...
* Correct the position of a carried player relative to Tails.
2019-09-07 11:33:26 +01:00
toaster
1311542c7f
Clean up an ungodly amount of shit relating to abilities.
...
* Put everything in P_DoJumpStuff, instead of half in that function and half spread across the player thinker.
* Have a proper if else cascade that first tries shield abilities, then super transformation, then random abilities like CA_TELEKINESIS.
* Use this new arrangement to allow CA_TWINSPIN users to use their ability on spin if their secondary ability is CA2_MELEE (resolves #195 ).
* Random bugfixing. Didn't keep track of what I'd caused while working on this and what was already there, but there was a lot of it.
The only two abilities which have spin-button properties outside of the else block is CA_AIRDRILL and CA_FLY/CA_SWIM (which now also prevents you from swimming down in goowater).
2019-09-06 19:01:46 +01:00
toaster
ffec691023
Bunch of fixes for dying in MP special stages.
...
* Don't allow the stage to be reloaded in G_DoReborn.
* If you do ANY spawn after the very beginning moment, you're forced to be a spectator.
* Have the "%d player%s remaining" Co-op exiting count visible at the same time as spectator controls.
2019-09-04 15:51:14 +01:00
Jaime Passos
412e368ef4
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-02 23:36:30 -03:00
