Last active
June 2, 2018 19:56
-
-
Save cblp/5d52a1b342aa884a1c2aa0719cdb33e2 to your computer and use it in GitHub Desktop.
fizruk/snakes-demo .. Gradet/game-Snakes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/.gitignore b/.gitignore | |
index cdc3c4d..82f3a88 100644 | |
--- a/.gitignore | |
+++ b/.gitignore | |
@@ -1,4 +1,5 @@ | |
dist | |
+dist-* | |
cabal-dev | |
*.o | |
*.hi | |
@@ -13,4 +14,9 @@ cabal.sandbox.config | |
*.prof | |
*.aux | |
*.hp | |
+*.eventlog | |
.stack-work/ | |
+cabal.project.local | |
+cabal.project.local~ | |
+.HTF/ | |
+.ghc.environment.* | |
diff --git a/LICENSE b/LICENSE | |
index e0ef109..9c7cb18 100644 | |
--- a/LICENSE | |
+++ b/LICENSE | |
@@ -1,4 +1,4 @@ | |
-Copyright Nickolay Kudasov (c) 2016 | |
+Copyright Gorlov Timofey (c) 2018 | |
All rights reserved. | |
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met: | |
disclaimer in the documentation and/or other materials provided | |
with the distribution. | |
- * Neither the name of Nickolay Kudasov nor the names of other | |
+ * Neither the name of Gorlov Timofey nor the names of other | |
contributors may be used to endorse or promote products derived | |
from this software without specific prior written permission. | |
diff --git a/README.md b/README.md | |
index 522aacd..5e4bf54 100644 | |
--- a/README.md | |
+++ b/README.md | |
@@ -1,8 +1,3 @@ | |
-# Игра «Змейки» | |
- | |
-Эта игра была создана в демонстрационных целях для доклада «Простые MMO игры на Haskell». | |
- | |
- | |
## Сборка | |
@@ -25,8 +20,6 @@ stack build | |
В проекте представлено 3 исполняемых файла: | |
- `snakes` — одиночная игра (локальная); | |
-- `snakes-server` — сервер для многопользовательской игры; | |
-- `snakes-client` — клиент для многопользовательской игры. | |
### Одиночная игра | |
@@ -36,22 +29,6 @@ stack build | |
stack exec snakes | |
``` | |
-### Многопользовательская игра | |
- | |
-Для начала должен быть поднят игровой сервер: | |
- | |
-``` | |
-stack exec snakes-server | |
-``` | |
- | |
-Затем каждый клиент может быть запущен командой: | |
- | |
-``` | |
-stack exec snakes-client | |
-``` | |
- | |
-Клиент автоматически подключается к серверу и присоединяется к игре! | |
- | |
## OpenGL | |
На некоторых системах необходимо дополнительно установить библиотеки OpenGL с заголовочными файлами. | |
@@ -70,4 +47,3 @@ library: | |
sudo apt-get update | |
sudo apt-get install freeglut3 freeglut3-dev | |
``` | |
- | |
diff --git a/app/Main.hs b/app/Main.hs | |
index 9c0750d..94ec631 100644 | |
--- a/app/Main.hs | |
+++ b/app/Main.hs | |
@@ -20,7 +20,7 @@ main = do | |
playIO display bgColor fps initialWorld renderWorld handleWorld updateWorld | |
where | |
- display = InWindow "The Game of Snakes" (w, h) (100, 100) | |
+ display = InWindow "Game of Snakes" (w, h) (100, 100) | |
bgColor = black | |
fps = 60 | |
diff --git a/img/snakes.gif b/img/snakes.gif | |
deleted file mode 100644 | |
index 47eb64c..0000000 | |
Binary files a/img/snakes.gif and /dev/null differ | |
diff --git a/snakes.cabal b/snakes.cabal | |
index c379b84..57eb268 100644 | |
--- a/snakes.cabal | |
+++ b/snakes.cabal | |
@@ -1,13 +1,13 @@ | |
name: snakes | |
version: 0.1.0.0 | |
-synopsis: The Game of Snakes | |
+synopsis: Game of Snakes | |
description: Please see README.md | |
-homepage: https://github.com/fizruk/snakes-demo#readme | |
+homepage: https://github.com/Gradet/game-Snakes#readme | |
license: BSD3 | |
license-file: LICENSE | |
-author: Nickolay Kudasov | |
-maintainer: [email protected] | |
-copyright: 2016 Nickolay Kudasov | |
+author: Gorlov Timofey | |
+maintainer: [email protected] | |
+copyright: 2018 Gorlov Tiomofey | |
category: Games | |
build-type: Simple | |
-- extra-source-files: | |
@@ -81,4 +81,4 @@ executable snakes-server | |
source-repository head | |
type: git | |
- location: https://github.com/fizruk/snakes-demo | |
+ location: https://github.com/Gradet/game-Snakes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment