]> git.lizzy.rs Git - nothing.git/blobdiff - README.md
Merge pull request #1255 from tsoding/1253
[nothing.git] / README.md
index f2453a4c11c3053e94a386d97dfc09397da53184..79da0155ddfff92d9007a4ac8fd331763590518b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![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://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)
 
 # Nothing
 
@@ -56,6 +56,8 @@ $ sudo pacman -S gcc cmake sdl2
 
 ### Linux
 
+#### CMake
+
 ```console
 $ mkdir build
 $ cd build/
@@ -64,6 +66,13 @@ $ make
 $ ./nothing
 ```
 
+#### SCU
+
+```console
+$ ./build-posix.sh
+$ ./nothing
+```
+
 ### Windows
 
 #### Visual Studio
@@ -118,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
 
@@ -140,21 +149,30 @@ $ ./nothing
 
 ### ConsolĂ©
 
-| Key       | Action                   |
-|-----------|--------------------------|
-| `ESC`     | Exit console             |
-| `Enter`   | Evaluate the expression  |
-| `Up/Down` | Traverse console history |
-
-<!-- TODO(#914): Level Editor is not documented -->
+| Key                 | Action                   |
+|---------------------|--------------------------|
+| `ESC`               | Exit console             |
+| `Enter`             | Evaluate the expression  |
+| `Up/Down`           | Traverse console history |
+| `CTRL+L`            | Clear                    |
+| `Ctrl+X`, `CTRL+W`  | Cut                      |
+| `Ctrl+C`, `ALT+W`   | Copy                     |
+| `Ctrl+V`, `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