Commit graph

847 commits

Author SHA1 Message Date
MascaraSnake
1a023f1bf4 Merge branch 'knuxstuff' into 'master'
Knuckles changes: the fixes

See merge request STJr/SRB2Internal!428
2019-11-12 15:40:15 -05:00
MascaraSnake
79b6f4247d Merge branch 'spinny-sign' into 'master'
Papersprite end signpost

See merge request STJr/SRB2Internal!442
2019-11-11 11:39:56 -05:00
MascaraSnake
c724799bc7 Merge branch 'inflivesfix' into 'master'
Prevent infinite lives rollover to extremely negative numbers.

See merge request STJr/SRB2Internal!446
2019-11-11 11:25:20 -05:00
MascaraSnake
a60f3c5a42 Merge branch 'pmomztweak' into 'master'
Fix pmomz (resolves #64!?)

Closes #64

See merge request STJr/SRB2Internal!447
2019-11-11 11:24:01 -05:00
toaster
ad366c55ba Lach wanted to do this, but we might have a release candidate before he gets back, so did it myself.
Make the wall transfer while spinning PF_SPINNING|PF_THOKKED. This:
* Prevents PF_MULTIABILITY players from using their ability after a wall transfer.
* Has a more specialised case which allows players to roll after having wall-transferred while spinning.
* (side effect) allows modders to apply PF_THOKKED any time for more controllable spinning.
2019-11-09 17:49:26 +00:00
lachwright
2f4528663c Add signpost camera (and fix a typo whoops) 2019-11-09 00:47:51 +08:00
James R
7c0d5b3bcf There's some whitespace... 2019-11-07 14:56:42 -08:00
James R
d87fd3842d Whitespace 2019-11-07 14:15:57 -08:00
toaster
9196e0905a Fix pmomz being set to 0 in the wrong place. (P_PlayerAfterThink is after every moving sector has changed its height, while P_MovePlayer is before it...) 2019-11-07 17:10:59 +00:00
toaster
f75d221b0f Prevent infinite lives rollover to extremely negative numbers. (Discovered while messing around with pandora's box recently.) 2019-11-07 14:06:27 +00:00
lachwright
55cc3cf590 Merge branch 'master' into knuxstuff 2019-10-28 22:25:32 +08:00
lachwright
e92cdfe26e Slow climbing down underwater 2019-10-28 22:21:20 +08:00
lachwright
77776e5fe8 Don't let Knuckles play the landing animation unless in fall state 2019-10-28 22:13:34 +08:00
lachwright
3a97e7b807 Slow glide down underwater 2019-10-28 21:30:36 +08:00
toaster
d28788786e Oh, this is why. pw_pushing was decremented twice each tic, because I copypasted it and then forgot to adjust it to say pw_noautobrake... 2019-10-28 13:01:15 +00:00
toaster
250e6d71ae Forgot to make pw_noautobrake count down........ 2019-10-28 12:54:55 +00:00
toaster
1f92a73135 Fix unsigned/signed comparisons. 2019-10-27 11:18:37 +00:00
lachwright
9401241d6d Merge branch 'master' into metalstuff 2019-10-26 16:07:59 +08:00
lachwright
b3dab79f7c Fix pointer typo (whoops) 2019-10-26 08:34:38 +08:00
lachwright
8958355e22 Remove imtermediary state transitions 2019-10-26 08:32:36 +08:00
lachwright
fa206f7411 Merge branch 'master' into metalstuff 2019-10-26 08:30:37 +08:00
lachwright
4835d26c8b Merge branch 'master' into knuxstuff 2019-10-26 05:53:49 +08:00
MascaraSnake
9574f8ac78 Merge branch 'object_tweaks' into 'master'
Object tweaks (object_tweaks division 3)

See merge request STJr/SRB2Internal!394
2019-10-25 17:45:48 -04:00
MascaraSnake
24ede2cfc9 Merge branch 'hammer-landing' into 'master'
Twinspin landing option

See merge request STJr/SRB2Internal!402
2019-10-25 16:39:02 -04:00
MascaraSnake
2004577314 Merge branch 'james-kart' into 'master'
My changes to Kart

See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
toaster
0842d1f328 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks
# Conflicts:
#	extras/conf/SRB2-22.cfg
2019-10-25 20:32:15 +01:00
toaster
d079625b52 * Fix Super players who die being eternally super.
* Fix music stack corruption in multiplayer where a super player dies and it's not you.
* Fix players in minecarts having their state eternally set to S_PLAY_STND (bug discovered/evident while super, so goes in this branch).

Resolves #259.
2019-10-24 18:51:12 +01:00
MascaraSnake
230f5e4d78 Merge branch 'spinbust' into 'master'
Make spinbust behavior consistent with other bustable blocks

Closes #254

See merge request STJr/SRB2Internal!398
2019-10-23 02:51:47 -04:00
lachwright
253775fc96 Fix compile warnings 2019-10-23 13:46:30 +08:00
lachwright
a1633e9acf Allow machine skins to damage objects in dashmode 2019-10-23 13:41:32 +08:00
lachwright
7f55ee6fd9 Add Metal's jet fume 2019-10-23 12:35:17 +08:00
James R
96a12b6bed Miscellaneous window de-focus options
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
2019-10-22 21:15:20 -07:00
James R
7f1a276a6c Clang warnings 2019-10-22 19:18:56 -07:00
lachwright
8c1c5be6f6 Only allow landing in the melee ability mid-twinspin if jump or spin is held 2019-10-21 12:49:12 +08:00
MascaraSnake
7129293121 Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST 2019-10-19 22:20:48 +02:00
toaster
a609fa0859 Decrease drag on directionchar in waterslides on sphere's request. 2019-10-19 14:32:34 +01:00
toaster
383b93e43a * New object types!
* Red and yellow Boost panels!
        * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better.
        * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif
        * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes.
        * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability!
    * Banpyura!
        * A Crushstacean with a spring instead of a crushclaw.
        * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif
        * Wanted this for a while, finally added it.
* Improved springs.
    * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground.
    * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity.
    * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
    * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN.
* Make directionchar "lag behind" a little bit in waterslides.
* Improved flame jets.
    * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1!
* Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!)
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Improved ZB config.
    * Add above new types.
    * Add Blue Diagonal Spring, which existed in the source but not the config.
    * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-18 18:33:45 +01:00
sphere
232a558f2e Fix standalone hangable chains being broken, thanks to toaster. 2019-10-17 01:01:40 +02:00
lachwright
3e2263bfbd Fix directionchar issue from faulty merge conflict resolution 2019-10-15 02:57:18 +08:00
lachwright
cf97857ec7 Merge branch 'master' into knuxstuff 2019-10-15 02:50:59 +08:00
lachwright
9642e8d4a5 Merge branch 'master' into knuxstuff 2019-10-15 02:49:44 +08:00
lachwright
01b2a88dc9 Remove glide landing dust; put player in landing state after glide-sliding off a ledge 2019-10-15 01:40:56 +08:00
lachwright
6f057f764a Limit climb camera rotation to a 180 degree cone 2019-10-15 01:19:58 +08:00
lachwright
76a903d0ae Unfuck glide slide/landing dust's P_RandomRange parameters 2019-10-14 04:08:07 +08:00
toaster
d501ff895e Fixed NiGHTS spawnpoint angle camera jump fuckups. 2019-10-13 16:15:46 +01:00
MascaraSnake
399500e9bf Merge branch 'sneakers-reduction' into 'master'
Reduce speed sneaker factor to 1.67x

See merge request STJr/SRB2Internal!368
2019-10-12 11:00:24 -04:00
MascaraSnake
269e5251ab Merge branch 'amytweaks' into 'master'
Amy tweaks

See merge request STJr/SRB2Internal!366
2019-10-12 09:52:44 -04:00
toaster
e9867c4bd7 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_map.c
2019-10-10 17:51:29 +01:00
lachwright
3e4b3d6107 Reduce speed sneaker's top speed factor to 1.67x 2019-10-09 21:39:51 +08:00
toaster
ed304a5b19 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_mobj.c
2019-10-08 19:43:43 +01:00