resolve conflicts

akkartik

Dec 26, 2023, 5:27 PM

FPQJ2CR5B5LOYTGC7H52DR23JHNRF7ENRTFMAN7JZLEZTCFCVRYQC

Dependencies

• [2] G42WRYFR new handler: mousemoved
• [3] JSDWXYKO wire up mouse move handler
• [4] RHARLLIQ Merge text0
• [5] 4NFSODHH Merge text0
• [6] 2RWR3GM4 another missed rename
• [7] LRDM35CE app running again
• [8] 36Z442IV back to commit 8123959e52f without code editing
• [9] WZZGVKSG a few more renames
• [10] LXFHXL2N Merge text.love
• [11] THJX6RCJ Merge text0
• [12] OLX2RRDI Merge text0
• [13] 5OVKHVY6 nice way to make on.* handlers more discoverable
• [14] N2NUGNN4 include a brief reference enabling many useful apps
• [15] 27GDAM5J correct various names in this and other pre-freewheeling forks
• [*] OTIBCAUJ love2d scaffold

Change contents

• resolve order conflict in reference.md at line 84
  [2.569]

  [3.8]
• edit in reference.md at line 85
  [3.9]→[3.9:307](∅→∅),[3.307]→[4.3431:3432](∅→∅),[2.569]→[4.3431:3432](∅→∅),[4.3431]→[4.3431:3432](∅→∅)
  − * `on.mouse_move(x,y, dx,dy, istouch)` -- called when you move the mouse.

  − Provides in `x` and `y` the point on the screen at which the click occurred

  − and in `dx` and `dy` the amount moved since the previous call of

  − `mouse_move`.

  − (Based on [LÖVE](https://love2d.org/wiki/love.mousemoved).)

  −
• resolve order conflict in main.lua at line 198
  [2.685]

  [3.310]
• edit in main.lua at line 200
  [3.315]→[3.315:423](∅→∅),[3.423]→[4.13:13](∅→∅),[2.685]→[4.13:13](∅→∅),[4.181]→[4.13:13](∅→∅),[4.13]→[4.7142:7147](∅→∅),[4.129]→[4.7142:7147](∅→∅),[4.181]→[4.7142:7147](∅→∅),[4.434]→[4.7142:7147](∅→∅),[4.7142]→[4.7142:7147](∅→∅)
  − function App.mousemoved(x,y, dx,dy, istouch)

  − if on.mouse_move then on.mouse_move(x,y, dx,dy, istouch) end

  −

  − end

  −
• edit in 0001-on at line 14
  [4.444]→[2.831:874](∅→∅)
  − -- on.mouse_move (see love.mousemoved)