Files
gamejamgame/scenes/game_scene/levels
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
..
2026-07-25 16:10:50 +12:00
2026-07-25 16:10:50 +12:00
2026-07-25 16:10:50 +12:00
2026-07-25 16:10:50 +12:00
2026-07-25 16:10:50 +12:00