diff --git a/pelican/content/images/ogs-mahjong-2-screenshot.png b/pelican/content/images/ogs-mahjong-2-screenshot.png index a5f3efe..369acee 100644 Binary files a/pelican/content/images/ogs-mahjong-2-screenshot.png and b/pelican/content/images/ogs-mahjong-2-screenshot.png differ diff --git a/pelican/content/pages/projects-ru.md b/pelican/content/pages/games-ru.md similarity index 58% rename from pelican/content/pages/projects-ru.md rename to pelican/content/pages/games-ru.md index cddce0a..7dfb1d9 100644 --- a/pelican/content/pages/projects-ru.md +++ b/pelican/content/pages/games-ru.md @@ -1,5 +1,5 @@ -Title: Проекты -Slug: projects +Title: Игры +Slug: games Lang: ru #### OGS Mahjong 1 @@ -10,22 +10,21 @@ Lang: ru * **Выпуск**: 2013 * **Платформы**: Linux, Windows -* **Скачать [OGS Mahjong 1][ogs-mahjong-1]** +* **[Скачать OGS Mahjong 1][ogs-mahjong-1]**
-#### OGS Mahjong 2 +#### OGS Mahjong 2 *(в разработке)* Переделка OGS Mahjong 1, которая работает на десктопе, мобилках и вебе. [![shot][ogs-mahjong-2-screenshot]][ogs-mahjong-2-web-release] -* **В разработке**: выпущены лишь техдемки -* **Платформы**: Linux, macOS, Windows, Android, iOS, Web -* **Скачать [технические демки OGS Mahjong 2][ogs-mahjong-2]** +* **Попробуйте** последнюю версию [демонстрации OGS Mahjong 2][ogs-mahjong-2-web-release] в вашем веб-браузере. +* **Внимание**: удостоверьтесь в [работоспособности WebGL][webgl] [ogs-mahjong-1]: {filename}/pages/ogs-mahjong-1-ru.md -[ogs-mahjong-2]: {filename}/pages/ogs-mahjong-2-ru.md [ogs-mahjong-2-screenshot]: {attach}/images/ogs-mahjong-2-screenshot.png -[ogs-mahjong-2-web-release]: https://ogstudio.github.io/game-mahjong/versions/013/mjin-player.html +[ogs-mahjong-2-web-release]: https://ogstudio.github.io/ogs-mahjong/ +[webgl]: https://get.webgl.org diff --git a/pelican/content/pages/projects.md b/pelican/content/pages/games.md similarity index 57% rename from pelican/content/pages/projects.md rename to pelican/content/pages/games.md index a8fa668..de44910 100644 --- a/pelican/content/pages/projects.md +++ b/pelican/content/pages/games.md @@ -1,5 +1,5 @@ -Title: Projects -Slug: projects +Title: Games +Slug: games Lang: en #### OGS Mahjong 1 @@ -10,21 +10,21 @@ Mahjong solitaire and shisen-sho game with nice 3D graphics and relaxing soundtr * **Released**: 2013 * **Platforms**: Linux, Windows -* **Download [OGS Mahjong 1][ogs-mahjong-1]** +* **[Download OGS Mahjong 1][ogs-mahjong-1]**
-#### OGS Mahjong 2 +#### OGS Mahjong 2 *(in development)* Remake of OGS Mahjong 1 that runs on desktop, mobile, and web. [![shot][ogs-mahjong-2-screenshot]][ogs-mahjong-2-web-release] -* **Work in progress**: only tech demos were released -* **Platforms**: Linux, macOS, Windows, Android, iOS, Web -* **Download [OGS Mahjong 2 tech demos][ogs-mahjong-2]** +* **Try** the latest version of [OGS Mahjong 2 demo][ogs-mahjong-2-web-release] in your web browser +* **Note**: make sure you have [WebGL enabled][webgl] [ogs-mahjong-1]: {filename}/pages/ogs-mahjong-1.md -[ogs-mahjong-2]: {filename}/pages/ogs-mahjong-2.md [ogs-mahjong-2-screenshot]: {attach}/images/ogs-mahjong-2-screenshot.png -[ogs-mahjong-2-web-release]: https://ogstudio.github.io/game-mahjong/versions/013/mjin-player.html +[ogs-mahjong-2-web-release]: https://ogstudio.github.io/ogs-mahjong/ +[webgl]: https://get.webgl.org + diff --git a/pelican/content/pages/ogs-mahjong-1-ru.md b/pelican/content/pages/ogs-mahjong-1-ru.md index 96e790c..ac6bdb2 100644 --- a/pelican/content/pages/ogs-mahjong-1-ru.md +++ b/pelican/content/pages/ogs-mahjong-1-ru.md @@ -1,4 +1,4 @@ -Title: OGS Mahjong 1 +Title: Игры / OGS Mahjong 1 Slug: ogs-mahjong-1 Lang: ru diff --git a/pelican/content/pages/ogs-mahjong-1.md b/pelican/content/pages/ogs-mahjong-1.md index f6c1b68..5eddcb1 100644 --- a/pelican/content/pages/ogs-mahjong-1.md +++ b/pelican/content/pages/ogs-mahjong-1.md @@ -1,4 +1,4 @@ -Title: OGS Mahjong 1 +Title: Games / OGS Mahjong 1 Slug: ogs-mahjong-1 Lang: en diff --git a/pelican/content/pages/ogs-mahjong-2-ru.md b/pelican/content/pages/ogs-mahjong-2-ru.md deleted file mode 100644 index b5d99c2..0000000 --- a/pelican/content/pages/ogs-mahjong-2-ru.md +++ /dev/null @@ -1,44 +0,0 @@ -Title: OGS Mahjong 2 -Slug: ogs-mahjong-2 -Lang: ru - -Переделка OGS Mahjong 1, которая работает на десктопе, мобилках и вебе. - -OGS Mahjong 2 находится в разработке. Вы можете попробовать технические демки ниже. - -#### TechDemo-1: Gameplay - -![shot][ogs-mahjong-2-screenshot] - -* **Веха**: проверить игровую механику Маджонга на разных платформах -* **Выпуск**: 2018-01-31 -* **Внутренняя версия**: 13 -* **Скачать**: - * Запустить [версию для веба][tech-demo-1-web] в браузере - * Получить [версию для Android][tech-demo-1-android] - * Получить [версию для Windows][tech-demo-1-windows] - * Получить [версию для Linux][tech-demo-1-linux] - * Получить [версию для macOS][tech-demo-1-macos] - -Замечания: - -* Версия для iOS не выпущена, т.к. нет простого способа её распространения вне AppStore. -* Запустите скрипт `run` в версиях для Linux и macOS. -* Версия для Linux доступна лишь в 64-битном варианте. -* Версия для macOS должна работать на macOS Sierra или новее. - -#### Следите за разработкой - -Вы можете следить за разработкой путём регулярной проверки страницы с -[выпусками OGS Mahjong 2 для веба][ogs-mahjong-2-web-releases]. - -Мы выпускаем версии для всех остальных платформ лишь по достижении вех. - -[ogs-mahjong-2-screenshot]: {attach}/images/ogs-mahjong-2-screenshot.png -[ogs-mahjong-2-web-releases]: http://ogstudio.github.io/game-mahjong -[tech-demo-1-web]: https://ogstudio.github.io/game-mahjong/versions/013/mjin-player.html -[tech-demo-1-android]: https://drive.google.com/open?id=1KW8IEN8Dpz8ODeg8BctVSJyzj9-AL9hR -[tech-demo-1-windows]: https://drive.google.com/open?id=1oj0-OXSmEatttzn86u2vgP9SRAIC0ozB -[tech-demo-1-linux]: https://drive.google.com/open?id=1EX7kLIThLiMz9_W7VmBPySms3mlrF-i6 -[tech-demo-1-macos]: https://drive.google.com/open?id=1KWnvbHzan8MpMcZPG2QC-7KWoEYbqrM2 - diff --git a/pelican/content/pages/ogs-mahjong-2.md b/pelican/content/pages/ogs-mahjong-2.md deleted file mode 100644 index fc57d64..0000000 --- a/pelican/content/pages/ogs-mahjong-2.md +++ /dev/null @@ -1,44 +0,0 @@ -Title: OGS Mahjong 2 -Slug: ogs-mahjong-2 -Lang: en - -Remake of OGS Mahjong 1 that runs on desktop, mobile, and web. - -OGS Mahjong 2 is currently in development. You can try tech demos below. - -#### TechDemo-1: Gameplay - -![shot][ogs-mahjong-2-screenshot] - -* **Milestone**: verify Mahjong gameplay across different platforms -* **Released**: 2018-01-31 -* **Internal version**: 13 -* **Downloads**: - * Run [Web version][tech-demo-1-web] in your browser - * Get [Android version][tech-demo-1-android] - * Get [Windows version][tech-demo-1-windows] - * Get [Linux version][tech-demo-1-linux] - * Get [macOS version][tech-demo-1-macos] - -Notes: - -* iOS version is not released because it cannot be easily shared outside AppStore. -* Launch `run` script under Linux and macOS. -* Linux version is only available in 64-bit variant. -* macOS version should run on macOS Sierra or newer. - -#### Track development - -You can keep track of the development by regularly checking -[OGS Mahjong 2 web releases][ogs-mahjong-2-web-releases]. - -We only release non-web versions upon reaching milestones. - -[ogs-mahjong-2-screenshot]: {attach}/images/ogs-mahjong-2-screenshot.png -[ogs-mahjong-2-web-releases]: http://ogstudio.github.io/game-mahjong -[tech-demo-1-web]: https://ogstudio.github.io/game-mahjong/versions/013/mjin-player.html -[tech-demo-1-android]: https://drive.google.com/open?id=1KW8IEN8Dpz8ODeg8BctVSJyzj9-AL9hR -[tech-demo-1-windows]: https://drive.google.com/open?id=1oj0-OXSmEatttzn86u2vgP9SRAIC0ozB -[tech-demo-1-linux]: https://drive.google.com/open?id=1EX7kLIThLiMz9_W7VmBPySms3mlrF-i6 -[tech-demo-1-macos]: https://drive.google.com/open?id=1KWnvbHzan8MpMcZPG2QC-7KWoEYbqrM2 - diff --git a/pelican/pelicanconf.py b/pelican/pelicanconf.py index e2716c8..8029596 100644 --- a/pelican/pelicanconf.py +++ b/pelican/pelicanconf.py @@ -21,7 +21,7 @@ AUTHOR_FEED_RSS = None # Menu MENUITEMS = ( - ('Projects', '/pages/projects.html'), + ('Games', '/pages/games.html'), ('About', '/pages/about.html'), ) DISPLAY_PAGES_ON_MENU = False diff --git a/pelican/publishconf.py b/pelican/publishconf.py index 6c030ba..4484a93 100644 --- a/pelican/publishconf.py +++ b/pelican/publishconf.py @@ -28,7 +28,7 @@ OUTPUT_PATH = '..' # Menu MENUITEMS = ( - ('Projects', '/pages/projects.html'), + ('Games', '/pages/games.html'), ('About', '/pages/about.html'), ) DISPLAY_PAGES_ON_MENU = False