Commit graph

24477 commits

Author SHA1 Message Date
James R
c87ffeba29 Loops: try to position player so hitbox edge touches loop radius
Large enough momentum will still position the player
beyond the loop radius initially. This is intentional so
that there is no jerk when entering the loop. Without
a more sophisticated algorithm to revolve asymmetrically,
this is the best I can do. The player is guaranteed to
exit at the correct position, though.
2023-10-14 21:28:11 -07:00
James R
2c1cce17b2 Loops: fix momentum cut on grounded exit 2023-10-14 21:28:11 -07:00
James R
107809d876 Loops: guarantee exit at exact intended angle 2023-10-14 21:28:11 -07:00
James R
428106c014 Loops: correct origin point over duration of loop
- Players moving into a gate with a lot of momentum would
  offset the origin point from its intended position
- Find intersection of player movement and gate
- Correct origin point between loop entry and exit by
  interpolating the difference between player position on
  entry and intersection point
2023-10-14 21:28:10 -07:00
James R
b9615d7225 objects/loop.c -> objects/loops.cpp 2023-10-14 19:27:31 -07:00
Oni
97ddaba295 Merge branch 'charge-instawhip' into 'master'
More flexible instawhip

See merge request KartKrew/Kart!1551
2023-10-15 01:40:43 +00:00
Oni
f495b9ff7d Merge branch 'splitscreen-spectator' into 'master'
Complete splitscreen spectator support (parties not tested) -- Director working, freecam working, HUD working and polished

See merge request KartKrew/Kart!1541
2023-10-15 01:40:33 +00:00
AJ Martinez
763a7e03bf Charge instawhip test fixes 3 2023-10-14 18:25:03 -07:00
AJ Martinez
17cfff1dfd More lenient whip charge tether 2023-10-14 17:42:14 -07:00
AJ Martinez
1eab3a6838 More whip tuning 2023-10-14 16:09:21 -07:00
Gunla
cbbb820414 Merge branch 'darken-header' into 'master'
"DARKNESS" mapheader option for Shrink lighting

See merge request KartKrew/Kart!1549
2023-10-14 21:34:42 +00:00
AJ Martinez
b67aa8af4f Charge instawhip test fixups 2 2023-10-14 05:56:42 -07:00
AJ Martinez
0b341a02aa No charging whip with rocketsneakers 2023-10-13 23:41:14 -07:00
AJ Martinez
4928fec622 Reduce whip charge time 2023-10-13 22:49:06 -07:00
James R
43b67be8d5 Fix -Wsign-compare 2023-10-13 21:52:31 -07:00
AJ Martinez
2320d46de1 Increase held-input whip charge delay 2023-10-13 21:33:07 -07:00
SteelT
2ae5ca5524 Merge branch 'hanagumi-hall' into 'master'
Hardcode Hanagumi Hall

See merge request KartKrew/Kart!1550
2023-10-14 03:57:27 +00:00
AJ Martinez
4d97c4b51f Charge whip test fixups 2023-10-13 20:51:03 -07:00
AJ Martinez
371314af80 Small instawhip hitbox buff 2023-10-13 20:13:42 -07:00
AJ Martinez
17a9d39877 Fix final-ring whip charge delay edge case 2023-10-13 18:54:56 -07:00
AJ Martinez
c41b8e97da Fix instawhip charge lockout conditions 2023-10-13 18:34:34 -07:00
AJ Martinez
22d09d8a4a No eggbox whip charge 2023-10-13 18:05:40 -07:00
AJ Martinez
2a0f9da975 More instawhip tuning cleanup 2023-10-13 17:36:06 -07:00
AJ Martinez
f36e699398 Instawhip reject vfx first pass 2023-10-13 17:09:25 -07:00
Lach
58a6a85b04 Hardcode Hanagumi Hall 2023-10-13 23:48:24 +11:00
AJ Martinez
85641036ea Clean up whip/guard timing defs 2023-10-13 03:19:24 -07:00
AJ Martinez
8fced1890b Fix up guard conditions 2023-10-13 03:16:54 -07:00
AJ Martinez
6ae427447c No stored whip after Gachabom rebound collect 2023-10-13 03:03:23 -07:00
AJ Martinez
3e5a5baf50 Charge instawhip QoL 2023-10-13 02:48:28 -07:00
AJ Martinez
a9ec1cea68 WIP: Instawhip charge input 2023-10-13 02:23:28 -07:00
AJ Martinez
680c063e3a "DARKNESS" mapheader option for Shrink lighting 2023-10-12 21:07:04 -07:00
James R
1f3a9a4758 Splitscreen Director HUD; replace freecam HUD 2023-10-09 18:53:55 -07:00
James R
9fa2e3da5f srb2::Draw: add button and small_button methods 2023-10-09 18:52:02 -07:00
James R
dadb150b25 Freecam: use Y button to focus player 2023-10-09 18:52:02 -07:00
James R
29feceda88 P_DemoCameraMovement: cancel out up/down movement 2023-10-09 18:52:02 -07:00
James R
fa89576f34 Move freecam state to camera_t, lets splitscreen players use freecam independently of each other 2023-10-08 14:26:21 -07:00
James R
49898abfeb Let Director operate on separate splitscreens 2023-10-08 14:26:21 -07:00
James R
412b37a8de Convert k_director.c to k_director.cpp 2023-10-08 14:26:21 -07:00
James R
17b7a2f16d k_director.h: remove directorinfo extern, add K_DirectorIsEnabled 2023-10-08 14:26:21 -07:00
Oni
c72a2cf94a Merge branch 'rideroid-hardcode' into 'master'
Lat Hardcode

See merge request KartKrew/Kart!1515
2023-10-08 21:22:18 +00:00
Oni
3e9c3526d3 Merge branch 'debug-death-pit' into 'master'
debugfinishline: highlight deathpits and instakill planes

See merge request KartKrew/Kart!1543
2023-10-08 07:49:39 +00:00
Oni
26f2a38451 Merge branch 'gitch-acs' into 'master'
ACS_Execute, ACS_ExecuteAlways: support map stringargs

See merge request KartKrew/Kart!1545
2023-10-08 07:49:24 +00:00
James R
91ce31c11d MT_SUNBEAMPALM_STEM: adjust radius for new sprite 2023-10-07 21:37:24 -07:00
James R
adb3eb7463 ACS_Execute, ACS_ExecuteAlways: handle map stringargs 2023-10-07 20:40:39 -07:00
toaster
756f42bc26 Fix DLZ Ring Sucker effect
- Fix infinite loop caused by not actually using the intended object type
- Fix integer multiply of two fixed-scale numbers causing overflow
2023-10-07 23:43:42 +01:00
toaster
dbcb39d7ed Fix Leaf Storm Eggball
- Map object num was incorrectly copypasted onto the Dead Line Ring Vaccuum as well
- Was getting destroyed instantly because its first spawnpoint is a deathpit. Now it only kills itself when it lands on a deathpit, not if it started on one
- Use destscale instead of scaling every frame
- Reduce duplicate P_IsObjectOnGround calls
- Now has its own state
2023-10-07 23:15:27 +01:00
toaster
b2bbde290b Add shadow to MT_KURAGEN
Hazard conveyance
2023-10-07 22:06:49 +01:00
Lat
baa668895a Move transfer line dismount hack to linedef type 2005 2023-10-07 12:22:53 +02:00
Lat
dc6bb1bfa9 solve conflicts and update to master 2023-10-07 11:15:47 +02:00
Lat
bb3d666852 Whitespaces 2023-10-07 10:24:14 +02:00