akkartik/sokoban.love - Change BTMACW42PWH7OJ6QVZNOQ4VYNL63JRVCNXDIMTBJ2QKKYQAP7QEAC

resolve conflicts

Created by akkartik on January 22, 2024

BTMACW42PWH7OJ6QVZNOQ4VYNL63JRVCNXDIMTBJ2QKKYQAP7QEAC

Dependencies

In channels

main

Change contents

File deletion: 0106-stop_button, 0106-stop_button
BFD:BFD[6.2] → [7.0:40]
BFD:BFD[6.2] → [7.0:40]
BFD:BFD[7.40] → [7.41:41]
B:BD[9.250] → [5.760:796]
B:BD[10.1469] → [5.797:801]
∅:D[5.796] → [10.1451:1469]
```
	local w = Font:getWidth('stop')+10
end
	return x+w+10, y
```

File deletion: 0078-Example_panes, 0078-Example_panes

BFD:BFD[6.2] → [11.1671:1713]

BFD:BFD[11.1713] → [11.1:1]

B:BD[12.2431] → [4.97:170]

∅:D[4.170] → [12.2567:3057]

			'  for _,id in ipairs(touches()) do',
			'    local x,y = touch(id)',
			'    if trails[id] then',
			'      table.insert(trails[id], 1, {x=x, y=y, r=100})',
			'end end',
			'  for id,trail in pairs(trails) do',
			'    for i=#trail,1,-1 do',
			'      local c = trail[i]',
			'      c.r = c.r - 10',
			'      if c.r <= 0 then table.remove(trail, i) end',
			'    end',
			'    if #trail == 0 then trails[id] = nil end',
			'  end',
			'end',
			'',
			'function car.touchpressed(id, x,y, ...)',
			'  trails[id] = {r=rand(), g=rand(), b=rand()}',
			'end',

Deletion in 0032-update_font_settings at line 19 [14.50]
B:BD[13.1113] → [5.1246:1319]
BD:BD[13.1113] → [5.1246:1319]
```
		edit.update_font_settings(pane.output_editor_state, Font_height, Font)
```
Deletion in 0032-update_font_settings at line 20 [14.50]
B:BD[13.1118] → [3.1182:1243]
BD:BD[13.1118] → [3.1182:1243]
```
	edit.update_font_settings(Output_editor_state, Font_height)
```
Resurrecting zombie bytes in 0032-update_font_settings at line 20 [14.50]
B:B[3.1243] → [3.1243:1267]
BD:B[3.1243] → [3.1243:1267]
```
	update_output_editor()
```
Insertion in 0032-update_font_settings at line 20 [14.50]
[13.1118]
[3.1243]
```
	edit.update_font_settings(Output_editor_state, Font_height, Font)
```
Deletion in 0032-update_font_settings at line 22 [14.50]
B:BD[13.1118] → [5.1320:1324]
```
end
```
Solving an order conflict in 0032-update_font_settings at line 22 [14.50]
[3.1267]
Insertion in 0032-update_font_settings at line 22 [14.50]
[0.203]
```
end
```
Deletion in 0021-draw_menu at line 14 [16.704]
B:BD[15.313] → [5.1487:1560]
BD:BD[15.313] → [5.1487:1560]
```
		local w = Font:getWidth('code')+10
		local w2 = Font:getWidth('>>')+10
```
Deletion in 0021-draw_menu at line 18 [16.704]
B:BD[10.4651] → [5.1561:1636]
BD:BD[10.4651] → [5.1561:1636]
```
		local w = Font:getWidth('screen')+10
		local w2 = Font:getWidth('>>')+10
```
Replacement in 0021-draw_menu at line 30 [16.704]
B:BD[17.5795] → [5.1637:1641]
```
end
```
[17.5795]
```
end
```

resolve conflicts

Dependencies

In channels

Change contents

File deletion: 0106-stop_button, 0106-stop_button

File deletion: 0078-Example_panes, 0078-Example_panes

Deletion in 0032-update_font_settings at line 19 [14.50]

Deletion in 0032-update_font_settings at line 20 [14.50]

Resurrecting zombie bytes in 0032-update_font_settings at line 20 [14.50]

Insertion in 0032-update_font_settings at line 20 [14.50]

Deletion in 0032-update_font_settings at line 22 [14.50]

Solving an order conflict in 0032-update_font_settings at line 22 [14.50]

Insertion in 0032-update_font_settings at line 22 [14.50]

Deletion in 0021-draw_menu at line 14 [16.704]

Deletion in 0021-draw_menu at line 18 [16.704]

Replacement in 0021-draw_menu at line 30 [16.704]