akkartik/wardley.love - Change UJDZ24YPXMDGJ6KJUXPELYZTXYUC4Y45EHV2VAREEONIDY7L3QNQC

Merge text.love

Created by Kartik K. Agaram on March 25, 2023

UJDZ24YPXMDGJ6KJUXPELYZTXYUC4Y45EHV2VAREEONIDY7L3QNQC

Dependencies

In channels

main

Change contents

File deletion: source.lua, source.lua
BFD:BFD[4.2] → [5.177715:177749]
BFD:BFD[4.2] → [5.177715:177749]
BFD:BFD[5.177749] → [5.165829:165829]
B:BD[5.172434] → [3.109:201]
B:BD[6.102] → [3.202:205]
∅:D[3.205] → [5.172434:172439]
∅:D[3.201] → [6.57:102]
B:BD[5.167379] → [3.12:104]
B:BD[6.56] → [3.105:108]
∅:D[3.108] → [5.167379:167384]
∅:D[3.104] → [6.11:56]
```
  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
end
  love.window.setTitle('text.love - source')
  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
end
  love.window.setTitle('text.love - source')
```

File deletion: run.lua, run.lua

BFD:BFD[4.2] → [5.183867:183898]

BFD:BFD[5.183898] → [5.178107:178107]

B:BD[7.875] → [3.210:302]

B:BD[5.179053] → [3.303:305]

B:BD[5.182113] → [3.399:402]

∅:D[3.402] → [5.182113:182338]

B:BD[7.908] → [3.306:398]

∅:D[3.398] → [5.182051:182113]

∅:D[3.305] → [5.179053:179300]

∅:D[3.302] → [5.178990:179053]


  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
end
function run.draw()
  edit.draw(Editor_state)
end
function run.update(dt)
  Cursor_time = Cursor_time + dt
  edit.update(Editor_state, dt)
end
function run.quit()
  edit.quit(Editor_state)
end
function run.settings()
  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  love.window.setTitle('text.love - '..Editor_state.filename)
  if #arg > 1 then
    print('ignoring commandline args after '..arg[1])
  end
  if rawget(_G, 'jit') then
    jit.off()
    jit.flush()
  end
end
function run.load_settings()
  love.graphics.setFont(love.graphics.newFont(Settings.font_height))
  love.window.setTitle('text.love - '..Editor_state.filename)

Insertion in main.lua at line 56 [10.2]

[8.40]

[9.2883]


  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708

Insertion in main.lua at line 62 [10.2]
[11.41]
[9.2946]

Insertion in main.lua at line 147 [10.2]

[8.73]

[9.5982]


  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708

Insertion in main.lua at line 152 [10.2]
[9.6044]
[10.183]
Deletion in main.lua at line 243 [10.2]
B:BD[12.268] → [2.172:172]
B:BD[5.190572] → [13.1138:1209]
BD:BD[5.190572] → [13.1138:1209]
∅:D[13.889] → [14.925:956]
B:BD[14.925] → [14.925:956]
D:D[13.889] → [14.925:956]
BD:BD[14.925] → [14.925:956]
∅:D[13.961] → [14.1021:1059]
B:BD[14.1021] → [14.1021:1059]
D:D[13.961] → [14.1021:1059]
BD:BD[14.1021] → [14.1021:1059]
```
    if source.mouse_wheel_move then source.mouse_wheel_move(dx,dy) end
  if Current_app == 'run' then
  elseif Current_app == 'source' then
```
Solving an order conflict in main.lua at line 243 [10.2]
[12.268]

Merge text.love

Dependencies

In channels

Change contents

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

Insertion in main.lua at line 56 [10.2]

Insertion in main.lua at line 62 [10.2]

Insertion in main.lua at line 147 [10.2]

Insertion in main.lua at line 152 [10.2]

Deletion in main.lua at line 243 [10.2]

Solving an order conflict in main.lua at line 243 [10.2]