Resolved merge conflict with main

justin-ys · Dec 24, 2023 · 2ba82a1 · 2ba82a1
2 parents 5876b3e + 878a8ba
commit 2ba82a1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -0,0 +1,22 @@
+# Spylike
+
+**Version**: Alpha 1
+
+A C++ roguelike/platformer game in development using ncurses.
+Currently has:
+- Rendering interfaces
+- Tilemaps
+- Events
+- Cameras
+- Entities
+- Drawing & Animation (Sprites)
+- Input
+- Logging
+- 2a03 Audio Engine
+- UI/Menu interfaces
+- Context Manager for loading levels, pausing and displaying menus
+- Level editor & level loading
+
+## Compiling & Running
+Spylike currently runs on Windows (using PDcurses) and Linux (through NCurses). The Makefile should auto-detect which backend you need, but you can set the Makefile variable PDCURSES_BACKEND to `wincon`, `sdl2` or `x11` if you wish (or USE_NCURSES=1).
+To build, simply run `make` in the root directory. An executable `Spylike-[VERSION]` will be generated. `make debug` will add symbol table information.
diff --git a/util/input.cpp b/util/input.cpp
@@ -41,4 +41,3 @@ void InputManager::update() {
 	}
 	*/
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,4 +41,3 @@ void InputManager::update() {
		}
		*/
		}