From 83b86646197dfb447ddd96b559347d08f46a437d Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 31 Aug 2023 07:23:45 -0700 Subject: [PATCH] fix a bad merge --- reference.md | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/reference.md b/reference.md index db73c57..23d600e 100644 --- a/reference.md +++ b/reference.md @@ -64,15 +64,9 @@ two categories. * `on.draw()` -- called to draw on the window, around 30 times a second. (Based on [LÖVE](https://love2d.org/wiki/love.draw).) -<<<<<<< HEAD * `on.update(dt)` -- called after every call to `on.draw`. Make changes to 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 -======= -* `App.update(dt)` -- called after every call to `App.draw`. Make changes to - your app's variables here rather than in `App.draw`. Provides in `dt` the - time since the previous call to `App.update`, which can be useful for things ->>>>>>> e7085e1e17e84291ef4d990708790ca899fb5c3c like smooth animations. (Based on [LÖVE](https://love2d.org/wiki/love.update).) @@ -84,13 +78,8 @@ two categories. and `3` is the middle button. Further buttons are mouse-dependent. (Based on [LÖVE](https://love2d.org/wiki/love.mousepressed).) -<<<<<<< HEAD * `on.mouse_release(x,y, mouse_button)` -- called when you release a mouse button. Provides the same arguments as `on.mouse_press()` above. -======= -* `App.mousereleased(x,y, mouse_button)` -- called when you release a mouse - button. Provides the same arguments as `App.mousepressed()` above. ->>>>>>> e7085e1e17e84291ef4d990708790ca899fb5c3c (Based on [LÖVE](https://love2d.org/wiki/love.mousereleased).) * `on.mouse_wheel_move(dx,dy)` -- called when you use the scroll wheel on a @@ -114,11 +103,7 @@ two categories. together will call `App.textinput` with `A`. (Based on [LÖVE](https://love2d.org/wiki/love.textinput).) -<<<<<<< HEAD * `on.key_release(key)` -- called when you press a key on the keyboard. -======= -* `App.keyreleased(key)` -- called when you press a key on the keyboard. ->>>>>>> e7085e1e17e84291ef4d990708790ca899fb5c3c Provides in `key` a string name for the key ([valid values](https://love2d.org/wiki/KeyConstant)). (Based on [LÖVE](https://love2d.org/wiki/love.keyreleased), including other variants.)