akkartik/carousel.love - Change QXXISTGENW6IG3HW4LMQJEC55OPJ3BP6JT5MRKYZJA4USZKC6HAAC

resolve conflicts

Created by akkartik on September 10, 2024

QXXISTGENW6IG3HW4LMQJEC55OPJ3BP6JT5MRKYZJA4USZKC6HAAC

Dependencies

In channels

main

Change contents

File deletion: source.lua, source.lua

BFD:BFD[5.2] → [6.177652:177686]

BFD:BFD[6.177686] → [6.165766:165766]

B:BD[6.174693] → [4.13:86]

∅:D[4.86] → [6.174693:174838]

  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
--?   print('mouse click', x, y)
--?   print(Editor_state.left, Editor_state.right)
--?   print(Log_browser_state.left, Log_browser_state.right)

File deletion: run.lua, run.lua
BFD:BFD[5.2] → [6.184046:184077]
BFD:BFD[5.2] → [6.184046:184077]
BFD:BFD[6.184077] → [6.178044:178044]
B:BD[6.183125] → [3.0:73]
∅:D[3.73] → [9.61:120]
```
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  return edit.mouse_press(Editor_state, x,y, mouse_button)
```
Deletion in source_edit.lua at line 237 [11.152503]
B:BD[10.5615] → [2.12:85]
```
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
```

Insertion in source.lua at line 288 [11.165829]

[11.174756]

  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen

Insertion in run.lua at line 171 [11.178107]

[11.182946]

[12.61]

  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen

Deletion in edit.lua at line 149 [14.413]

B:BD[13.1822] → [2.103:176]

  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen