From 8ebd8532d6ec20eab997333b723b8acc2525bb58 Mon Sep 17 00:00:00 2001 From: tooomm Date: Thu, 6 Aug 2015 23:21:51 +0200 Subject: [PATCH 1/2] readme adjustments - toc changed (removed DocToc) - relinks to the toc on top under every category - image included on top - added other servers in community ressources --- README.md | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index a94926ad..e1b2b9dc 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,30 @@ - - -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* +

-- [Cockatrice](#cockatrice) -- [Get Involved [![Gitter chat](https://badges.gitter.im/Cockatrice/Cockatrice.png)](https://gitter.im/Cockatrice/Cockatrice)](#get-involved-) -- [Community Resources](#community-resources) -- [Translation Status [![Cockatrice on Transiflex](https://ds0k0en9abmn1.cloudfront.net/static/charts/images/tx-logo-micro.646b0065fce6.png)](https://www.transifex.com/projects/p/cockatrice/)](#translation-status-) -- [Building [![Build Status](https://travis-ci.org/Cockatrice/Cockatrice.svg?branch=master)](https://travis-ci.org/Cockatrice/Cockatrice)](#building-) -- [Building servatrice Docker container](#building-servatrice-docker-container) -- [Running](#running) -- [License](#license) +--- - +**Table of Contents**    [Cockatrice](#cockatrice) | [Get Involved] (#get-involved-) | [Community](#community-resources) | [Translation](#translation-status-) | [Building](#building-) | [Running](#running) | [License](#license) + +--- # Cockatrice Cockatrice is an open-source multiplatform software for playing card games, such as Magic: The Gathering, over a network. It is fully client-server based to prevent any kind of cheating, though it supports single-player games without -a network interface as well. Both client and server are written in Qt, supporting both Qt4 and Qt5. +a network interface as well. Both client and server are written in Qt, supporting both Qt4 and Qt5.
[▲](https://github.com/Cockatrice/Cockatrice#readme) + # Get Involved [![Gitter chat](https://badges.gitter.im/Cockatrice/Cockatrice.png)](https://gitter.im/Cockatrice/Cockatrice) -Chat with the Cockatrice developers on Gitter. Come here to talk about the application, features, or just to hang out. For support regarding specific servers, please contact that server's admin or forum for support rather than asking here. +Chat with the Cockatrice developers on Gitter. Come here to talk about the application, features, or just to hang out. For support regarding specific servers, please contact that server's admin or forum for support rather than asking here.
+[▲](https://github.com/Cockatrice/Cockatrice#readme) # Community Resources -- [reddit r/Cockatrice](http://reddit.com/r/cockatrice) -- [Woogerworks Server & Forums](http://www.woogerworks.com) - [Cockatrice Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki) +- [reddit r/Cockatrice](http://reddit.com/r/cockatrice) +- [Woogerworks](http://www.woogerworks.com) / [Chickatrice] (http://www.chickatrice.net/) / [Poixen](http://www.poixen.com/) (incomplete Serverlist)
+ +[▲](https://github.com/Cockatrice/Cockatrice#readme) # Translation Status [![Cockatrice on Transiflex](https://ds0k0en9abmn1.cloudfront.net/static/charts/images/tx-logo-micro.646b0065fce6.png)](https://www.transifex.com/projects/p/cockatrice/) @@ -38,26 +35,25 @@ Language statistics for `Cockatrice` *(on the left)* and `Oracle` *(on the right [![Cockatrice translations](https://www.transifex.com/projects/p/cockatrice/resource/cockatrice/chart/image_png)](https://www.transifex.com/projects/p/cockatrice/resource/cockatrice/)      [![Oracle translations](https://www.transifex.com/projects/p/cockatrice/resource/oracle/chart/image_png)](https://www.transifex.com/projects/p/cockatrice/resource/oracle/) -Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information! +Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information!
+[▲](https://github.com/Cockatrice/Cockatrice#readme) # Building [![Build Status](https://travis-ci.org/Cockatrice/Cockatrice.svg?branch=master)](https://travis-ci.org/Cockatrice/Cockatrice) **Detailed compiling instructions are on the Cockatrice wiki under [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)** Dependencies: - - [Qt](http://qt-project.org/) - [protobuf](http://code.google.com/p/protobuf/) - [CMake](http://www.cmake.org/) Oracle can optionally use zlib to load zipped files: - - [zlib](http://www.zlib.net/) The server requires an additional dependency when compiled under Qt4: - - [libgcrypt](http://www.gnu.org/software/libgcrypt/) + To compile: mkdir build @@ -75,15 +71,18 @@ The following flags can be passed to `cmake`: - `-DCMAKE_BUILD_TYPE=Debug` Compile in debug mode. Enables extra logging output, debug symbols, and much more verbose compiler warnings. - `-DUPDATE_TRANSLATIONS=1` Configure `make` to update the translation .ts files for new strings in the source code. Note: Running `make clean` will remove the .ts files. -# Building servatrice Docker container -`docker build -t servatrice .` +#### Building servatrice Docker container +`docker build -t servatrice .`
+[▲](https://github.com/Cockatrice/Cockatrice#readme) # Running `oracle` fetches card data `cockatrice` is the game client -`servatrice` is the server +`servatrice` is the server
+[▲](https://github.com/Cockatrice/Cockatrice#readme) # License -Cockatrice is free software, licensed under the GPLv2; see COPYING for details. +Cockatrice is free software, licensed under the GPLv2; see COPYING for details.
+[▲](https://github.com/Cockatrice/Cockatrice#readme) From d5c00b0cb50ae6484a8183d119144fc9ed7273b5 Mon Sep 17 00:00:00 2001 From: tooomm Date: Thu, 13 Aug 2015 16:21:10 +0200 Subject: [PATCH 2/2] remove arrows with link to top --- README.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e1b2b9dc..d1177ca0 100644 --- a/README.md +++ b/README.md @@ -11,20 +11,19 @@ Cockatrice is an open-source multiplatform software for playing card games, such as Magic: The Gathering, over a network. It is fully client-server based to prevent any kind of cheating, though it supports single-player games without -a network interface as well. Both client and server are written in Qt, supporting both Qt4 and Qt5.
[▲](https://github.com/Cockatrice/Cockatrice#readme) +a network interface as well. Both client and server are written in Qt, supporting both Qt4 and Qt5.
# Get Involved [![Gitter chat](https://badges.gitter.im/Cockatrice/Cockatrice.png)](https://gitter.im/Cockatrice/Cockatrice) Chat with the Cockatrice developers on Gitter. Come here to talk about the application, features, or just to hang out. For support regarding specific servers, please contact that server's admin or forum for support rather than asking here.
-[▲](https://github.com/Cockatrice/Cockatrice#readme) + # Community Resources - [Cockatrice Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki) - [reddit r/Cockatrice](http://reddit.com/r/cockatrice) - [Woogerworks](http://www.woogerworks.com) / [Chickatrice] (http://www.chickatrice.net/) / [Poixen](http://www.poixen.com/) (incomplete Serverlist)
-[▲](https://github.com/Cockatrice/Cockatrice#readme) # Translation Status [![Cockatrice on Transiflex](https://ds0k0en9abmn1.cloudfront.net/static/charts/images/tx-logo-micro.646b0065fce6.png)](https://www.transifex.com/projects/p/cockatrice/) @@ -36,7 +35,7 @@ Language statistics for `Cockatrice` *(on the left)* and `Oracle` *(on the right [![Cockatrice translations](https://www.transifex.com/projects/p/cockatrice/resource/cockatrice/chart/image_png)](https://www.transifex.com/projects/p/cockatrice/resource/cockatrice/)      [![Oracle translations](https://www.transifex.com/projects/p/cockatrice/resource/oracle/chart/image_png)](https://www.transifex.com/projects/p/cockatrice/resource/oracle/) Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information!
-[▲](https://github.com/Cockatrice/Cockatrice#readme) + # Building [![Build Status](https://travis-ci.org/Cockatrice/Cockatrice.svg?branch=master)](https://travis-ci.org/Cockatrice/Cockatrice) @@ -73,16 +72,16 @@ The following flags can be passed to `cmake`: #### Building servatrice Docker container `docker build -t servatrice .`
-[▲](https://github.com/Cockatrice/Cockatrice#readme) + # Running `oracle` fetches card data `cockatrice` is the game client `servatrice` is the server
-[▲](https://github.com/Cockatrice/Cockatrice#readme) + # License Cockatrice is free software, licensed under the GPLv2; see COPYING for details.
-[▲](https://github.com/Cockatrice/Cockatrice#readme) +