From e003114ce3de91f55fccdf90e8dfdff474cf157c Mon Sep 17 00:00:00 2001 From: Matt Kelly Date: Thu, 13 Feb 2014 11:56:36 -0500 Subject: [PATCH 1/3] Fix Linux and BSD section formatting --- doc/usermanual/Usermanual.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/usermanual/Usermanual.md b/doc/usermanual/Usermanual.md index 20839a2f..b319c42e 100644 --- a/doc/usermanual/Usermanual.md +++ b/doc/usermanual/Usermanual.md @@ -213,12 +213,22 @@ FreeBSD 9.1 until the systems were updated. FreeBSD : `pkg_add -r qt4 qt4-linguist qt4-moc qt4-qmake qt4-rcc qt4-uic git cmake protobuf` -2. Download the sources from github via\ +2. Download the sources from github via `cd git clone https://github.com/Daenyth/Cockatrice.git` 3. To compile the sources, change into the newly created directory, - create a build directory and invoke cmake:\ - `cd Cockatrice mkdir build cd build cmake .. make`\ + create a build directory and invoke cmake: + + i. `cd Cockatrice` + + ii. `mkdir build` + + iii. `cd build` + + iv. `cmake ..` + + v. `make` + If you have some issues with pthread\_ add ’pthread’ to the “target\_link\_libraries” entry in the `CMakeFiles.txt` in `Cockatrice/common`. From 5e2d3a2f3e9e0cb41b6354e5d467042524cc4569 Mon Sep 17 00:00:00 2001 From: Matt Kelly Date: Thu, 13 Feb 2014 12:59:04 -0500 Subject: [PATCH 2/3] Additional typo and formatting fixes For example, fixed the card type table which wasn't showing as a table. --- doc/usermanual/Usermanual.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/doc/usermanual/Usermanual.md b/doc/usermanual/Usermanual.md index b319c42e..8f76eacd 100644 --- a/doc/usermanual/Usermanual.md +++ b/doc/usermanual/Usermanual.md @@ -214,7 +214,7 @@ FreeBSD 9.1 until the systems were updated. : `pkg_add -r qt4 qt4-linguist qt4-moc qt4-qmake qt4-rcc qt4-uic git cmake protobuf` 2. Download the sources from github via - `cd git clone https://github.com/Daenyth/Cockatrice.git` + `git clone https://github.com/Daenyth/Cockatrice.git` 3. To compile the sources, change into the newly created directory, create a build directory and invoke cmake: @@ -239,7 +239,7 @@ FreeBSD 9.1 until the systems were updated. 5. Before you start Cockatrice for the first time, run `oracle -dlsets` and download available cards, denn run `cockatrice`. The default - paths for decks, pics, cards and tokens are located in\ + paths for decks, pics, cards and tokens are located in `/home//.local/share/data/Cockatrice/Cockatrice`. #### MacOS X @@ -254,10 +254,10 @@ Cockatrice is open source you are free to run your own. The compilation works like already written above, but instead of invoking `cmake ..`, you have to do it like this: -- If you want to build the server, use:\ +- If you want to build the server, use: `cmake -DWITH_SERVER=1 ..` -- If you want to build the server, but not the client, use:\ +- If you want to build the server, but not the client, use: `cmake -DWITH_SERVER=1 -DWITHOUT_CLIENT=1 ..` There is more information on compiling and running Servatrice on CentOS @@ -378,13 +378,14 @@ has come out, you must re-run the Oracle and download set information. except for “Instant” along with “Artifact” and “U”, the Deck editor will only show you all Blue Instant and Artifact cards. - ll Letter & Card Type\ - U & Blue\ - W & White\ - X & Colorless\ - G & Green\ - R & Red\ - B & Black\ + |Letter | Card Type | + |-------|-----------| + | U | Blue | + | W | White | + | X | Colorless | + | G | Green | + | R | Red | + | B | Black | 3. Card Data : This section shows the Oracle text for the card that you currently From cc08893c12f16982fd11f8225b206549de2dc9f8 Mon Sep 17 00:00:00 2001 From: Matt Kelly Date: Fri, 14 Feb 2014 13:38:06 -0500 Subject: [PATCH 3/3] Fix another typo in Usermanual --- doc/usermanual/Usermanual.md | 2 +- doc/usermanual/Usermanual.tex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/usermanual/Usermanual.md b/doc/usermanual/Usermanual.md index 20839a2f..1371671c 100644 --- a/doc/usermanual/Usermanual.md +++ b/doc/usermanual/Usermanual.md @@ -736,7 +736,7 @@ players can not add or remove counters to or from your cards. #### Pointing at Cards / Arrows -Pointing at cars is needed for resolving spells, or declaring attackers +Pointing at cards is needed for resolving spells, or declaring attackers and blockers. All you need to do is right-click over a card and drag an arrow over to what you are pointing at. Permanents, spells in the stack, and even a players life total can be pointed at. You can point at your diff --git a/doc/usermanual/Usermanual.tex b/doc/usermanual/Usermanual.tex index 61643701..f506f7c8 100644 --- a/doc/usermanual/Usermanual.tex +++ b/doc/usermanual/Usermanual.tex @@ -487,7 +487,7 @@ Sometimes Counters are needed to be placed on cards that the counters on the sid (One of each counter) \subsubsection{Pointing at Cards / Arrows} -Pointing at cars is needed for resolving spells, or declaring attackers and blockers. All you need to do is right-click over a card and drag an arrow over to what you are pointing at. Permanents, spells in the stack, and even a players life total can be pointed at. You can point at your opponents cards and life total, and they can point at yours. When your arrows are no loner needed, press Ctrl-R to remove them from the screen. +Pointing at cards is needed for resolving spells, or declaring attackers and blockers. All you need to do is right-click over a card and drag an arrow over to what you are pointing at. Permanents, spells in the stack, and even a players life total can be pointed at. You can point at your opponents cards and life total, and they can point at yours. When your arrows are no loner needed, press Ctrl-R to remove them from the screen. \begin{center} \includegraphics[scale=0.5]{pics/fetch98fd} \\