Commit graph

19286 commits

Author SHA1 Message Date
toaster
d963dea4f9 Merge branch 'master' into new-menus
# Conflicts:
#	src/Sourcefile
#	src/deh_soc.c
#	src/m_menu.c
#	src/p_user.c
#	src/r_data.h
#	src/r_skins.h
2022-05-25 15:12:51 +01:00
James R
0bcabbb88a Merge branch 'grow-adjustments' into 'master'
Minor Grow scale corrections

See merge request KartKrew/Kart!605
2022-05-25 08:05:40 +00:00
James R
1f54579c03 Merge branch 'blockmap-cock' into 'master'
Fix blockmap WILD inconsistency when it's not PIT_CheckThing

See merge request KartKrew/Kart!601
2022-05-25 08:03:01 +00:00
James R
dac2f4495e Merge branch 'hyu' 2022-05-25 00:43:32 -07:00
Sal
675cb12dba Merge branch 'tester-text' into 'master'
Tester text

See merge request KartKrew/Kart!603
2022-05-25 07:37:17 +00:00
Sal
e3a0945566 Merge branch 'eggbox-cinders' into 'master'
Eggman Mark cinder fix

See merge request KartKrew/Kart!600
2022-05-25 07:37:08 +00:00
toaster
bf6d257cfb Prevent rings from suddenly growing in size when a Grow player interacts with them, to match how using rings while grown or shrunk have them at mapobjectscale. 2022-05-24 18:41:13 +01:00
toaster
0d82b075b0 Fix Grow on Trick Panels sending you to ridiculous heights. 2022-05-24 18:09:40 +01:00
Sal
8b9adb1b4c Merge branch 'follower-maintenence' into 'master'
Follower angle lag + lookback

See merge request KartKrew/Kart!597
2022-05-24 06:49:15 +00:00
Sal
5c2477348a Merge branch 'trick-threshold' into 'master'
Trick threshold

See merge request KartKrew/Kart!599
2022-05-24 06:48:59 +00:00
Sal
7b64b07494 Merge branch 'shorter-turn-lockout' into 'master'
Adjust steering lock after successful DI

See merge request KartKrew/Kart!602
2022-05-24 06:48:46 +00:00
SinnamonLat
9364d0b479 better defaults in menus to make navigation easier when you just want to go fast 2022-05-24 01:50:00 +02:00
SinnamonLat
1033ddd928 use gc_x instead of gc_b to cancel connection screen 2022-05-24 01:30:00 +02:00
SinnamonLat
ecf7edd55f don't let menu inputs slide through the voting screen 2022-05-24 01:22:47 +02:00
Sally Coolatta
052e72c409 PIT_CheckThing valid checks more consistent 2022-05-23 19:20:21 -04:00
SinnamonLat
9b2fe3182d Can open chat again. Also fix missing braces in menudef... 2022-05-24 01:07:15 +02:00
SinnamonLat
9eb7ae3cff Fix ONLINE menus 2022-05-24 00:57:35 +02:00
toaster
b9ee6d1f4e * Show version/DEVELOP info on the title screen, not the top-level menu (necessary in advance of new-menus).
* Add TESTER/HOSTTESTER information to `version` command and title screen DEVELOP info.
2022-05-23 23:57:18 +01:00
SinnamonLat
256ec0517f Fix video mode controls being reversed 2022-05-24 00:30:19 +02:00
SinnamonLat
d0a6fe18c4 Fix cursor defaulting to profile values instead of last used values when changing characters mid-game 2022-05-24 00:26:34 +02:00
SinnamonLat
348dab6fe2 Fix being unable to switch followers & colours from the menu without switching skins 2022-05-24 00:18:40 +02:00
AJ Martinez
849dd2926f Futureproof loss-of-control check 2022-05-23 16:57:48 -05:00
SinnamonLat
5f8eaaf41b Fix device being wrongly unset for P1 when beginning charsel with anything besides keyboard, oops 2022-05-23 23:53:25 +02:00
SinnamonLat
79831b46cc Default restrictskinchange to yes, change conditions for changing skins 2022-05-23 23:48:23 +02:00
AJ Martinez
3bc5fac430 Adjust steering lock after successful DI 2022-05-23 16:47:27 -05:00
Sally Coolatta
d053d5f8ba Fix blockmap WILD inconsistency when it's not PIT_CheckThing
An optimized error check was put into P_BlockThingsIterator for tmthing, but this meant that anything that was not using or even setting this variable (the supermajority of them) would exit after finding 1 thing in each block.

To keep this error check & keep it optimized, the PIT_ functions were expanded to three options instead of two: BMIT_CONTINUE lets the search continue. If used as the last mobj, it will return true when the iterator finishes. BMIT_ABORT ends the search and forces the iterator to return false.
BMIT_STOP ends the search and forces the iterator to return true.
2022-05-23 17:37:29 -04:00
toaster
17d007d418 * Restore player colour and colorization correctly when the Eggman Mark concludes its effect.
* Allow colorisation types to not completely crowd each other out.
    * For example, it's possible for invincibility + grow to flicker Invincibility, Eggman mark, and grow colours if the conditions for each type of flash are true on different frames!
2022-05-23 22:04:14 +01:00
Sally Coolatta
4b70a64b3f Ground follower mode 2022-05-23 15:51:00 -04:00
toaster
0e31d2e9a6 * Tricks now have a minimum stick tilt of 1/4th of the data range to activate.
* This tilt is a *difference* between the axes, so a slight diagonal shouldn't intefere.
2022-05-23 20:12:31 +01:00
Sally Coolatta
6e3c4dbc34 > numfollowers-1 -> >= numfollowers 2022-05-23 13:40:51 -04:00
Sally Coolatta
d8b7967a22 Make all instances of this sine use M_TAU_FIXED 2022-05-23 13:38:53 -04:00
Sally Coolatta
0e60a3ef26 Increase default horzlag to 3
This value is closer to how the old value felt before the tracking was improved.
2022-05-23 04:10:20 -04:00
Sally Coolatta
d1d9a5bd10 Fix follower menu crash 2022-05-23 03:03:16 -04:00
Sally Coolatta
69023a96ee More bobspeed fix 2022-05-23 02:59:52 -04:00
Sally Coolatta
ab9d474e9b Fix follower color on menu
(not that it even uses the real color, buuut...)
2022-05-23 02:57:46 -04:00
Sally Coolatta
6574f822a4 Fix bobspeed + menu z offset 2022-05-23 02:57:20 -04:00
Sally Coolatta
fcff62fc9e Lag of FRACUNIT matches your position exactly 2022-05-23 02:45:32 -04:00
Sally Coolatta
d67c658643 Fix angle lag not working
(Why was angle being set again above this...)
2022-05-23 01:09:58 -04:00
Sally Coolatta
f8ad0a28e7 Fix anglelag typo 2022-05-23 00:40:37 -04:00
Sally Coolatta
cda0441abb Follower angle lag + lookback
- ANGLELAG lets you set how fast the followers swivel around. Default is 8*FRACUNIT, old behavior can be returned with FRACUNIT.
- Followers reverse their angle when you hold the lookback button.
- All lag values can't go below FRACUNIT instead of 1.
2022-05-23 00:36:03 -04:00
Sally Coolatta
b5334e6b42 Move follower code to its own file 2022-05-23 00:23:46 -04:00
James R
a12c88c5e2 Strip items after stealing with Hyudoro 2022-05-22 19:20:27 -07:00
Sally Coolatta
800dcc6302 Revert "Some asserts in hyu code"
This reverts commit 0ce466e7ef.
2022-05-22 22:02:31 -04:00
Sally Coolatta
61d61dcf25 Revert "EVEN MORE"
This reverts commit 5ef78cbc16.
2022-05-22 22:02:21 -04:00
Sally Coolatta
098304bd99 Allow hyu thru tripwire 2022-05-22 22:00:54 -04:00
Sally Coolatta
5ef78cbc16 EVEN MORE
(also removed the define replacements since didn't work)
2022-05-22 21:41:40 -04:00
Sally Coolatta
0ce466e7ef Some asserts in hyu code
Instead of letting it crash due to a NULL subsector later, let it crash earlier so I can see what is happening...
2022-05-22 21:34:24 -04:00
Sally Coolatta
c8718b25ff REMOVE hyubgone + all of the other bullshit we did to try and make it show up less 2022-05-22 21:17:14 -04:00
Sally Coolatta
543928b5bb Adjust Hyuu frequency 2022-05-22 21:04:52 -04:00
Sally Coolatta
fa8dab86c2 Merge branch 'master' into hyu 2022-05-22 20:27:37 -04:00