Skip to content

Fixing desync between branches #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
V-rtualized merged 15 commits into from
Aug 1, 2026
Merged

Fixing desync between branches #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e1abcac
0.4.1 (#465)
Fantom-Balatro Jun 9, 2026
719cfed
remove ~DEV for release
Fantom-Balatro Jun 9, 2026
42a1c18
Revert ruleset changes (0.4.2) (#466)
Fantom-Balatro Jun 9, 2026
611c5a7
Casjb/full replay (#473)
Casjb Jun 26, 2026
be18f2a
0.5.0 Merge (#476)
V-rtualized Jul 1, 2026
d563f19
Add PvP validation to ante timer actions (#477)
V-rtualized Jul 1, 2026
fbd46a2
Update version from 0.5.0 to 0.5.1
V-rtualized Jul 1, 2026
1183a68
Pause timer when opponent disconnects (#478)
V-rtualized Jul 1, 2026
77b5615
PvP + hidden score fixes (#479)
SleepyG11 Jul 1, 2026
230a933
v0.5.2 (#498)
V-rtualized Jul 16, 2026
76d3a83
feat(the-order): log each idol hit for the website log parser (#511)
ChronoFinale Jul 29, 2026
b597d2b
v0.5.3 (#518)
V-rtualized Jul 30, 2026
5b34ad5
Disable enemy location hover tooltip when enemy_location_disabled is …
V-rtualized Aug 1, 2026
c7957f8
Fix matching skip timer: use max instead of abs for skip difference (…
V-rtualized Aug 1, 2026
8505b7a
Merge branch 'dev' into main
V-rtualized Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/game/enemy_location.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ end

G.FUNCS.mp_setup_hover_enemy_location_display = function(e)
e.config.func = nil
if MP.LOBBY.config.enemy_location_disabled then return end
e.states.collide.can = true
e.states.hover.can = true

Expand Down
2 changes: 1 addition & 1 deletion ui/game/timer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ function MP.UI.update_matching_skip_timer(from_nemesis)
return
end

local new_diff = math.abs((MP.GAME.skips_before_pvp or 0) - (MP.GAME.enemy.skips_before_pvp or 0))
local new_diff = math.max((MP.GAME.skips_before_pvp or 0) - (MP.GAME.enemy.skips_before_pvp or 0), 0)
local skips_dx = new_diff - (MP.GAME.skips_difference or 0)
MP.GAME.skips_difference = new_diff

Expand Down