]> git.lizzy.rs Git - nothing.git/blobdiff - README.md
Merge pull request #1226 from iv4nhoe/master
[nothing.git] / README.md
index ec642c5854920411800da2d30668f67826019a43..db1beccf5b46cbd26b8cfa6885cd9b57f7bb4c36 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 [![Tsoding](https://img.shields.io/badge/twitch.tv-tsoding-purple?logo=twitch&style=for-the-badge)](https://www.twitch.tv/tsoding)
-[![Build Status](https://travis-ci.org/tsoding/nothing.svg?branch=master)](https://travis-ci.org/tsoding/nothing)
 [![Build Status](https://ci.appveyor.com/api/projects/status/gxfgojq4ko98e0g0/branch/master?svg=true)](https://ci.appveyor.com/project/rexim/nothing/branch/master)
 [![Build Status](https://github.com/tsoding/nothing/workflows/CI/badge.svg)](https://github.com/tsoding/nothing/actions)
 
@@ -128,18 +127,18 @@ $ ./nothing
 
 #### Keyboard
 
-| Key      | Action                                                      |
-|----------|-------------------------------------------------------------|
-| `d`      | Move to the right                                           |
-| `a`      | Move to the left                                            |
-| `SPACE`  | Jump                                                        |
-| `c`      | Open debug console                                          |
-| `r`      | Reload the current level including the Player's position    |
-| `q`      | Reload the current level preserving the Player's position   |
-| `p`      | Toggle game pause                                           |
-| `l`      | Toggle transparency on objects. Useful for debugging levels |
-| `TAB`    | Switch to Level Editor                                      |
-| `CTRL+q` | Quit the game                                               |
+| Key       | Action                                                      |
+|---------- |-------------------------------------------------------------|
+| `d`       | Move to the right                                           |
+| `a`       | Move to the left                                            |
+| `w/SPACE` | Jump                                                        |
+| `c`       | Open debug console                                          |
+| `r`       | Reload the current level including the Player's position    |
+| `q`       | Reload the current level preserving the Player's position   |
+| `p`       | Toggle game pause                                           |
+| `l`       | Toggle transparency on objects. Useful for debugging levels |
+| `TAB`     | Switch to Level Editor                                      |
+| `CTRL+q`  | Quit the game                                               |
 
 #### Gamepad
 
@@ -155,16 +154,25 @@ $ ./nothing
 | `ESC`     | Exit console             |
 | `Enter`   | Evaluate the expression  |
 | `Up/Down` | Traverse console history |
-
-<!-- TODO(#914): Level Editor is not documented -->
+| `CTRL+L`  | Clear                    |
+| `CTRL+W`  | Cut                      |
+| `ALT+W`  | Copy                     |
+| `CTRL+Y`  | Paste                    |
 
 ### Level Editor
 
 To access the Level Editor open a level and press `TAB`.
 
-| Key  | Action                 |
-|------|------------------------|
-| `F2` | Rename selected object |
+| Key             | Action                                     |
+|-----------------|--------------------------------------------|
+| `s`             | Save level                                 |
+| `Mouse Wheel`   | Zoom and pan                               |
+| `CTRL+z`        | Undo                                       |
+| `q`             | Toggle snapping mode                       |
+| `SHIFT+Up/Down` | Change overlaping order of selected object |
+| `CTRL+c/v`      | Copy/paste selected object                 |
+| `F2`            | Rename selected object                     |
+| `DELETE`        | Delete selected object                     |
 
 ## Support