akkartik/pong.love - Change 2R6UORLNH722O3OOQMXEMZNRSRW2JCN5OBVYJZMIA6AIJCKLJ24QC

Merge text.love

Created by Kartik K. Agaram on March 25, 2023

2R6UORLNH722O3OOQMXEMZNRSRW2JCN5OBVYJZMIA6AIJCKLJ24QC

Dependencies

In channels

main

Change contents

File deletion: source.lua, source.lua
BFD:BFD[6.2] → [7.177715:177749]
BFD:BFD[6.2] → [7.177715:177749]
BFD:BFD[7.177749] → [7.165829:165829]
B:BD[8.102] → [5.202:205]
∅:D[5.205] → [7.172434:172439]
B:BD[7.172434] → [5.109:201]
∅:D[5.201] → [8.57:102]
B:BD[8.56] → [5.105:108]
∅:D[5.108] → [7.167379:167384]
B:BD[7.167379] → [5.12:104]
∅:D[5.104] → [8.11:56]
```
end
  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  love.window.setTitle('text.love - source')
end
  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  love.window.setTitle('text.love - source')
```

File deletion: run.lua, run.lua

BFD:BFD[6.2] → [7.183867:183898]

BFD:BFD[7.183898] → [7.178107:178107]

B:BD[7.182113] → [5.399:402]

∅:D[5.402] → [7.182113:182338]

B:BD[9.908] → [5.306:398]

∅:D[5.398] → [7.182051:182113]

B:BD[7.179053] → [5.303:305]

∅:D[5.305] → [7.179053:179300]

B:BD[9.875] → [5.210:302]

∅:D[5.302] → [7.178990:179053]


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))
  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  love.window.setTitle('text.love - '..Editor_state.filename)

Insertion in source.lua at line 70 [11.5]

[10.257]

[3.8]


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

Insertion in source.lua at line 75 [11.5]
[3.53]
[11.1088]

Insertion in source.lua at line 223 [11.5]

[11.6373]

[3.54]


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

Insertion in source.lua at line 228 [11.5]
[3.99]
[11.6373]
Deletion in main.lua at line 226 [14.2]
∅:D[12.7791] → [13.722:722]
B:BD[11.15593] → [13.722:722]
B:BD[15.5048] → [16.12:12]
B:BD[15.5044] → [15.5044:5048]
∅:D[11.15978] → [15.5015:5021]
B:BD[15.5015] → [15.5015:5021]
∅:D[12.7989] → [11.15918:15978]
B:BD[11.15918] → [11.15918:15978]
B:BD[11.15839] → [12.7912:7989]
∅:D[12.7911] → [11.15801:15839]
B:BD[11.15801] → [11.15801:15839]
B:BD[11.15726] → [12.7838:7911]
∅:D[12.7837] → [11.15694:15726]
B:BD[11.15694] → [11.15694:15726]
B:BD[15.4882] → [12.7792:7837]
B:BD[17.331] → [15.4881:4882]
∅:D[18.842] → [19.823:893]
B:BD[20.5101] → [19.823:893]
∅:D[4.978] → [18.842:842]
B:BD[21.355] → [18.842:842]
BD:BD[21.355] → [18.842:842]
BD:BD[21.355] → [18.842:842]
BD:BD[21.355] → [18.842:842]
B:BD[11.16150] → [4.978:978]
∅:D[23.178] → [11.16000:16150]
∅:D[2.407] → [11.16000:16150]
∅:D[24.603] → [11.16000:16150]
∅:D[25.621] → [11.16000:16150]
∅:D[26.655] → [11.16000:16150]
B:BD[11.16000] → [11.16000:16150]
B:BD[11.16000] → [2.192:407]
∅:D[4.976] → [11.15979:16000]
B:BD[27.102] → [11.15979:16000]
B:BD[27.102] → [4.669:976]
∅:D[16.12] → [27.101:102]
B:BD[17.331] → [27.101:102]
∅:D[28.405] → [17.327:331]
∅:D[29.767] → [17.327:331]
∅:D[30.1591] → [17.327:331]
∅:D[31.1712] → [17.327:331]
∅:D[32.2693] → [17.327:331]
B:BD[33.371] → [17.327:331]
∅:D[11.15647] → [31.1706:1712]
B:BD[31.1706] → [31.1706:1712]
B:BD[31.1629] → [11.15594:15647]
∅:D[13.722] → [31.1622:1629]
∅:D[11.15593] → [31.1622:1629]
B:BD[31.1622] → [31.1622:1629]
```
end
  end
  else
    assert(false, 'unknown app "'..Current_app..'"')
    if source.mouse_release then source.mouse_release(x,y, mouse_button) end
  elseif Current_app == 'source' then
    if pong.mouse_release then pong.mouse_release(x,y, mouse_button) end
  if Current_app == 'pong' then
function App.mouserelease(x,y, mouse_button)
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
  if Current_app == 'pong' then
    if pong.quit then pong.quit() end
  elseif Current_app == 'source' then
    if source.quit then source.quit() end
  if Current_app == 'pong' then
    Settings.pong = pong.settings()
  else
    Settings.source = source.settings()
  end
  Settings.current_app = Current_app
  love.filesystem.write('config', json.encode(Settings))
function love.quit()
function App.wheelmoved(dx,dy)
  if Current_app == 'run' then
    if run.mouse_wheel_move then run.mouse_wheel_move(dx,dy) end
  elseif Current_app == 'source' then
    if source.mouse_wheel_move then source.mouse_wheel_move(dx,dy) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
end
  end
    assert(false, 'unknown app "'..Current_app..'"')
  else
```
Resurrecting zombie bytes in main.lua at line 226 [14.2]
∅:∅[18.889] → [19.925:956]
B:B[19.925] → [19.925:956]
D:∅[18.889] → [19.925:956]
BD:B[19.925] → [19.925:956]
∅:∅[18.961] → [19.1021:1059]
B:B[19.1021] → [19.1021:1059]
D:∅[18.961] → [19.1021:1059]
BD:B[19.1021] → [19.1021:1059]
```
  if Current_app == 'run' then
  elseif Current_app == 'source' then
```

Insertion in main.lua at line 226 [14.2]

[12.7791]

[19.925]

  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
function App.mouserelease(x,y, mouse_button)
  if Current_app == 'pong' then
    if pong.mouse_release then pong.mouse_release(x,y, mouse_button) end
  elseif Current_app == 'source' then
    if source.mouse_release then source.mouse_release(x,y, mouse_button) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
function App.wheelmoved(dx,dy)

Insertion in main.lua at line 243 [14.2]

[19.956]

[19.1021]

    if run.mouse_wheel_move then run.mouse_wheel_move(dx,dy) end

Insertion in main.lua at line 245 [14.2]

[19.1059]

    if source.mouse_wheel_move then source.mouse_wheel_move(dx,dy) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
function love.quit()
  if Current_app == 'pong' then
    Settings.pong = pong.settings()
  else
    Settings.source = source.settings()
  end
  Settings.current_app = Current_app
  love.filesystem.write('config', json.encode(Settings))
  if Current_app == 'pong' then
    if pong.quit then pong.quit() end
  elseif Current_app == 'source' then
    if source.quit then source.quit() end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end

Merge text.love

Dependencies

In channels

Change contents

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

Insertion in source.lua at line 70 [11.5]

Insertion in source.lua at line 75 [11.5]

Insertion in source.lua at line 223 [11.5]

Insertion in source.lua at line 228 [11.5]

Deletion in main.lua at line 226 [14.2]

Resurrecting zombie bytes in main.lua at line 226 [14.2]

Insertion in main.lua at line 226 [14.2]

Insertion in main.lua at line 243 [14.2]

Insertion in main.lua at line 245 [14.2]