akkartik/pensieve.love - Change 6OMHAVQFDM3UGPYZ7BYHN2D3IL4ZYEORIOHGOD4Y5XWGLLOUOFQAC

Merge lines.love

Created by Kartik K. Agaram on November 4, 2022

6OMHAVQFDM3UGPYZ7BYHN2D3IL4ZYEORIOHGOD4Y5XWGLLOUOFQAC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 95 [5.2]

B:BD[4.62815] → [4.62815:62937]

  Last_focus_time = App.getTime()  -- https://love2d.org/forums/viewtopic.php?p=249700
  Last_resize_time = App.getTime()

[4.62815]

[4.62937]

  Current_time = 0
  Last_focus_time = 0  -- https://love2d.org/forums/viewtopic.php?p=249700
  Last_resize_time = 0

Deletion in main.lua at line 118 [5.2]
B:BD[6.187634] → [6.187634:187669]
BD:BD[6.187634] → [6.187634:187669]
```
  Last_resize_time = App.getTime()
```
Resurrecting zombie bytes in main.lua at line 118 [5.2]
B:B[6.187669] → [4.63156:63161]
BD:B[6.187669] → [4.63156:63161]
```
end
```
Insertion in main.lua at line 118 [5.2]
[6.187634]
[4.63156]
```
  Last_resize_time = Current_time
```
Deletion in main.lua at line 133 [5.2]
B:BD[6.188051] → [6.188051:188087]
BD:BD[6.188051] → [6.188051:188087]
```
    Last_focus_time = App.getTime()
```
Resurrecting zombie bytes in main.lua at line 133 [5.2]
B:B[6.188087] → [4.63162:63168]
BD:B[6.188087] → [4.63162:63168]
```
  end
```
Insertion in main.lua at line 133 [5.2]
[6.188051]
[4.63162]
```
    Last_focus_time = Current_time
```
Deletion in main.lua at line 142 [5.2]
B:BD[6.188051] → [3.450:485]
BD:BD[6.188051] → [3.450:485]
```
    Last_focus_time = Current_time
```
Solving an order conflict in main.lua at line 142 [5.2]
[6.188321]
[4.63169]
Insertion in main.lua at line 155 [5.2]
[4.63391]
[4.63391]
```
  Current_time = Current_time + dt
```

Replacement in main.lua at line 157 [5.2]

B:BD[4.63427] → [4.63427:63476]

  if App.getTime() < Last_resize_time + 0.1 then

[4.63427]

[4.63476]

  if Current_time < Last_resize_time + 0.1 then

Deletion in main.lua at line 160 [5.2]
B:BD[4.63493] → [8.57:57]
B:BD[9.1398] → [3.486:521]
BD:BD[9.1398] → [3.486:521]
B:BD[10.184] → [3.522:570]
BD:BD[10.184] → [3.522:570]
BD:BD[10.184] → [3.522:570]
```
  Current_time = Current_time + dt
  if Current_time < Last_resize_time + 0.1 then
```
Solving an order conflict in main.lua at line 160 [5.2]
[4.63493]
[6.188491]
Deletion in main.lua at line 172 [5.2]
B:BD[6.188787] → [6.188787:188836]
BD:BD[6.188787] → [6.188787:188836]
```
  if App.getTime() < Last_focus_time + 0.01 then
```
Resurrecting zombie bytes in main.lua at line 173 [5.2]
∅:∅[3.619] → [6.188836:188858]
B:B[6.188836] → [6.188836:188858]
BD:B[6.188836] → [6.188836:188858]
```
    return
  end
  --
```
Resurrecting zombie bytes in main.lua at line 177 [5.2]
∅:∅[8.83] → [6.188883:188993]
∅:∅[4.63521] → [6.188883:188993]
B:B[6.188883] → [6.188883:188993]
BD:B[6.188883] → [6.188883:188993]
```
    -- carefully save settings
    if Current_app == 'run' then
      local source_settings = Settings.source
```

Resurrecting zombie bytes in main.lua at line 181 [5.2]

∅:∅[12.75] → [6.189025:189395]

∅:∅[4.63550] → [6.189025:189395]

B:B[6.189025] → [6.189025:189395]

BD:B[6.189025] → [6.189025:189395]

      Settings.source = source_settings
      if run.quit then run.quit() end
      Current_app = 'source'
    elseif Current_app == 'source' then
      Settings.source = source.settings()
      if source.quit then source.quit() end
      Current_app = 'run'
    else
      assert(false, 'unknown app "'..Current_app..'"')
    end
    Settings.current_app = Current_app

Resurrecting zombie bytes in main.lua at line 193 [5.2]
∅:∅[13.953] → [6.189454:189596]
B:B[6.189454] → [6.189454:189596]
BD:B[6.189454] → [6.189454:189596]
```
    -- reboot
    load_file_from_source_or_save_directory('main.lua')
    App.undo_initialize()
    App.run_tests_and_initialize()
    return
```
Replacement in main.lua at line 210 [5.2]
∅:D[4.63893] → [11.220:269]
B:BD[11.220] → [11.220:269]
```
  if App.getTime() < Last_focus_time + 0.01 then
```
[4.63893]
[11.269]
```
  if Current_time < Last_focus_time + 0.01 then
```
Deletion in main.lua at line 213 [5.2]
B:BD[11.286] → [4.63895:63895]
B:BD[6.189945] → [3.620:668]
BD:BD[6.189945] → [3.620:668]
BD:BD[6.189945] → [3.620:668]
```
  if Current_time < Last_focus_time + 0.01 then
```
Solving an order conflict in main.lua at line 213 [5.2]
[11.286]
[6.189946]

Replacement in main.lua at line 225 [5.2]

B:BD[6.190296] → [4.63902:63951]

  if App.getTime() < Last_focus_time + 0.01 then

[6.190296]

[4.63951]

  if Current_time < Last_focus_time + 0.01 then

Deletion in main.lua at line 228 [5.2]
B:BD[6.190296] → [3.669:717]
BD:BD[6.190296] → [3.669:717]
```
  if Current_time < Last_focus_time + 0.01 then
```
Solving an order conflict in main.lua at line 228 [5.2]
[4.63968]
[6.190297]
Deletion in main.lua at line 277 [5.2]
B:BD[14.268] → [2.6887:6887]
B:BD[6.187634] → [3.415:449]
BD:BD[6.187634] → [3.415:449]
B:BD[6.186991] → [3.297:414]
BD:BD[6.186991] → [3.297:414]
BD:BD[6.186991] → [3.297:414]
```
  Last_resize_time = Current_time
  Current_time = 0
  Last_focus_time = 0  -- https://love2d.org/forums/viewtopic.php?p=249700
  Last_resize_time = 0
```
Solving an order conflict in main.lua at line 277 [5.2]
[14.268]

Merge lines.love

Dependencies

In channels

Change contents

Replacement in main.lua at line 95 [5.2]

Deletion in main.lua at line 118 [5.2]

Resurrecting zombie bytes in main.lua at line 118 [5.2]

Insertion in main.lua at line 118 [5.2]

Deletion in main.lua at line 133 [5.2]

Resurrecting zombie bytes in main.lua at line 133 [5.2]

Insertion in main.lua at line 133 [5.2]

Deletion in main.lua at line 142 [5.2]

Solving an order conflict in main.lua at line 142 [5.2]

Insertion in main.lua at line 155 [5.2]

Replacement in main.lua at line 157 [5.2]

Deletion in main.lua at line 160 [5.2]

Solving an order conflict in main.lua at line 160 [5.2]

Deletion in main.lua at line 172 [5.2]

Resurrecting zombie bytes in main.lua at line 173 [5.2]

Resurrecting zombie bytes in main.lua at line 177 [5.2]

Resurrecting zombie bytes in main.lua at line 181 [5.2]

Resurrecting zombie bytes in main.lua at line 193 [5.2]

Replacement in main.lua at line 210 [5.2]

Deletion in main.lua at line 213 [5.2]

Solving an order conflict in main.lua at line 213 [5.2]

Replacement in main.lua at line 225 [5.2]

Deletion in main.lua at line 228 [5.2]

Solving an order conflict in main.lua at line 228 [5.2]

Deletion in main.lua at line 277 [5.2]

Solving an order conflict in main.lua at line 277 [5.2]