Commit Graph
6 Commits
Author SHA1 Message Date
ASOwnerYTandClaude Opus 5 9c99d5f3ce fix: resolve merge conflicts, keep test-branch rope physics
The merge of main into test (fd39db8) was committed with conflict markers
still in the files, leaving rope_tether.gd and 3dlevel.tscn unparseable
while git reported a clean tree.

Both sides were competing full implementations of the tether rather than
overlapping edits, so every hunk had to go one way. Kept the test side:
elastic leash, kinematic tautening, haul drag and the mid-chain snap.
Dropped main's _constrain/_haul/_damp/_snap port and its tension_start,
pull_speed and snap_length exports. The two scene hunks followed from the
same choice, since the rope node's properties name exports that exist on
only one side.

Also drops rope_diag.gd, which came in with that commit and drives the
discarded API (can_snap, taut_margin).

Co-Authored-By: Claude Opus 5 <[email protected]>
2026-07-26 02:10:15 +12:00
ASOwnerYT fd39db872b Merge branch 'main' into test 2026-07-26 02:01:08 +12:00
ASOwnerYT 7635ccd26c Finally proper rope physics. Parity with 2D connectedplayers. 2026-07-26 01:54:47 +12:00
ASOwnerYT 31c7861266 Broken rope physics 2026-07-25 21:51:39 +12:00
ASOwnerYTandClaude Opus 5 d66570169a feat(rope): reel tether length to track player distance
Rope length was baked once at load, so it sagged when players closed in
and the pin joints fought when they separated.

Total length now eases toward clamp(gap * (1 + slack), min, max) at
reel_speed. Joint3D only derives anchors from node transforms when the
joint is configured on tree entry, so anchors are pushed straight to
PhysicsServer3D.pin_joint_set_local_a/_b after resizing the capsules.

Also instances the rope in 3dlevel and solves the spawn arc's bow height
from the same target length, so the rope no longer lurches on frame one.

Co-Authored-By: Claude Opus 5 <[email protected]>
2026-07-25 17:37:06 +12:00
ASOwnerYT 4818002bbd Basic platformer with rope 2026-07-25 16:10:50 +12:00