akkartik/carousel.love - Change 4NFSODHHLYE7XW5PCHGTVUXDYURCACP6VUKQRD5ARA5BHNKDBLKAC

Merge text0

Created by Kartik K. Agaram on August 26, 2023

4NFSODHHLYE7XW5PCHGTVUXDYURCACP6VUKQRD5ARA5BHNKDBLKAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in reference.md at line 67 [8.17]
B:B[8.2384] → [4.1593:1668]
BD:B[8.2384] → [4.1593:1668]
```
* `on.update(dt)` -- called after every call to `on.draw`. Make changes to
```
Insertion in reference.md at line 67 [8.17]
[8.2384]
[4.1593]
```
<<<<<<< HEAD
```
Solving an order conflict in reference.md at line 69 [8.17]
[4.1668]

Insertion in reference.md at line 69 [8.17]

[0.23]

[6.35]

  your app's variables here rather than in `on.draw`. Provides in `dt` the
  time since the previous call to `on.update`, which can be useful for things
=======

Insertion in reference.md at line 75 [8.17]
[6.267]
[8.2613]
```
>>>>>>> e7085e1e17e84291ef4d990708790ca899fb5c3c
```
Resurrecting zombie bytes in reference.md at line 87 [8.17]
B:B[8.3222] → [4.1903:1978]
BD:B[8.3222] → [4.1903:1978]
```
* `on.mouse_release(x,y, mouse_button)` -- called when you release a mouse
```
Insertion in reference.md at line 87 [8.17]
[8.3222]
[4.1903]
```
<<<<<<< HEAD
```
Resurrecting zombie bytes in reference.md at line 89 [8.17]
B:B[8.3298] → [6.268:337]
BD:B[8.3298] → [6.268:337]
```
  button. Provides the same arguments as `App.mousepressed()` above.
```
Solving an order conflict in reference.md at line 89 [8.17]
[4.1978]

Insertion in reference.md at line 89 [8.17]

[0.251]

[6.268]

  button. Provides the same arguments as `on.mouse_press()` above.
=======
* `App.mousereleased(x,y, mouse_button)` -- called when you release a mouse

Insertion in reference.md at line 93 [8.17]
[6.337]
[8.3365]
```
>>>>>>> e7085e1e17e84291ef4d990708790ca899fb5c3c
```
Insertion in reference.md at line 117 [8.17]
[8.4583]
[4.2426]
```
<<<<<<< HEAD
```
Solving an order conflict in reference.md at line 119 [8.17]
[4.2498]
Insertion in reference.md at line 119 [8.17]
[0.469]
[5.18]
```
=======
```
Insertion in reference.md at line 121 [8.17]
[5.91]
[8.4655]
```
>>>>>>> e7085e1e17e84291ef4d990708790ca899fb5c3c
```
Replacement in app.lua at line 134 [10.2]
B:BD[9.4492] → [7.21:21]
∅:D[7.21] → [11.640:665]
∅:D[12.36] → [11.640:665]
B:BD[13.210403] → [11.640:665]
```
function App.run_tests()
```
[9.4492]
[11.665]
```
function App.run_tests(record_error_fn)
```

Insertion in app.lua at line 142 [10.2]

[11.842]

  local globals = App.shallow_copy_all_globals()
  App = App_for_tests
  local saved_font = love.graphics.getFont()
  love.graphics.setFont(Love_snapshot.initial_font)

Replacement in app.lua at line 149 [10.2]

B:BD[11.940] → [11.940:1045]

--?     _G[name]()
    xpcall(_G[name], function(err) prepend_debug_info_to_test_failure(name, err) end)

[11.940]

[11.1045]

    xpcall(_G[name], function(err) record_error_fn(name, err) end)

Replacement in app.lua at line 151 [10.2]

B:BD[11.1051] → [11.1051:1147]

  -- clean up all test methods
  for _,name in ipairs(sorted_names) do
    _G[name] = nil
  end

[11.1051]

[11.1147]

  love.graphics.setFont(saved_font)
  -- restore all global state except Test_errors
  local test_errors = Test_errors
  App.restore_all_globals(globals)
  Test_errors = test_errors

Insertion in app.lua at line 158 [10.2]

[11.1152]

[7.22]

function App.run_test(test, record_error_fn)
  local globals = App.shallow_copy_all_globals()
  App = App_for_tests
  local saved_font = love.graphics.getFont()
  love.graphics.setFont(Love_snapshot.initial_font)
    App.initialize_for_test()
    xpcall(test, function(err) record_error_fn('', err) end)
  love.graphics.setFont(saved_font)
  -- restore all global state except Test_errors
  local test_errors = Test_errors
  App.restore_all_globals(globals)
  Test_errors = test_errors
end

Deletion in app.lua at line 419 [10.2]
∅:D[14.541] → [15.1467:1472]
∅:D[11.5233] → [15.1467:1472]
B:BD[15.1467] → [15.1467:1472]
B:BD[16.7396] → [17.73:113]
BD:BD[16.7396] → [17.73:113]
B:BD[18.8001] → [2.18:67]
BD:BD[18.8001] → [2.18:67]
∅:D[2.67] → [19.1959:1981]
B:BD[19.1959] → [19.1959:1981]
BD:BD[19.1959] → [19.1959:1981]
B:BD[19.1981] → [2.68:165]
BD:BD[19.1981] → [2.68:165]
B:BD[20.47] → [21.1966:1994]
BD:BD[20.47] → [21.1966:1994]
B:BD[21.1994] → [3.21:88]
BD:BD[21.1994] → [3.21:88]
B:BD[16.7554] → [2.166:348]
BD:BD[16.7554] → [2.166:348]
```
end
function App.run_tests(record_error_fn)
  local globals = App.shallow_copy_all_globals()
  App = App_for_tests
  local saved_font = love.graphics.getFont()
  love.graphics.setFont(Love_snapshot.initial_font)
--?     print('=== '..name)
    xpcall(_G[name], function(err) record_error_fn(name, err) end)
  love.graphics.setFont(saved_font)
  -- restore all global state except Test_errors
  local test_errors = Test_errors
  App.restore_all_globals(globals)
  Test_errors = test_errors
```

Replacement in app.lua at line 421 [10.2]

B:BD[22.41] → [23.18:63]

B:BD[23.63] → [2.349:398]

∅:D[2.398] → [22.93:115]

B:BD[22.93] → [22.93:115]

B:BD[22.115] → [2.399:769]

function App.run_test(test, record_error_fn)
  local globals = App.shallow_copy_all_globals()
  App = App_for_tests
  local saved_font = love.graphics.getFont()
  love.graphics.setFont(Love_snapshot.initial_font)
    App.initialize_for_test()
    xpcall(test, function(err) record_error_fn('', err) end)
  love.graphics.setFont(saved_font)
  -- restore all global state except Test_errors
  local test_errors = Test_errors
  App.restore_all_globals(globals)
  Test_errors = test_errors

[22.41]

[2.769]

function colortable(app_color)
  return {app_color.r, app_color.g, app_color.b, app_color.a}

Deletion in app.lua at line 444 [10.2]

B:BD[15.1472] → [11.5234:5327]

function colortable(app_color)
  return {app_color.r, app_color.g, app_color.b, app_color.a}

Solving an order conflict in app.lua at line 444 [10.2]
[2.1126]
[16.7564]

Merge text0

Dependencies

In channels

Change contents

Resurrecting zombie bytes in reference.md at line 67 [8.17]

Insertion in reference.md at line 67 [8.17]

Solving an order conflict in reference.md at line 69 [8.17]

Insertion in reference.md at line 69 [8.17]

Insertion in reference.md at line 75 [8.17]

Resurrecting zombie bytes in reference.md at line 87 [8.17]

Insertion in reference.md at line 87 [8.17]

Resurrecting zombie bytes in reference.md at line 89 [8.17]

Solving an order conflict in reference.md at line 89 [8.17]

Insertion in reference.md at line 89 [8.17]

Insertion in reference.md at line 93 [8.17]

Insertion in reference.md at line 117 [8.17]

Solving an order conflict in reference.md at line 119 [8.17]

Insertion in reference.md at line 119 [8.17]

Insertion in reference.md at line 121 [8.17]

Replacement in app.lua at line 134 [10.2]