Skip to content

Commit

Permalink
Adjust docs and version for new stable release (9.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
jontrulson committed Jun 19, 2018
1 parent 503c29e commit 9efc3b6
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 21 deletions.
34 changes: 18 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ Conquest is released under the [MIT License](LICENSE.txt).
## Playing the game

Conquest is a client that must connect over a network to a conquestd
server.
server. By default, if all requirements are met, both the client and
server will be built. To start the client and connect to a server,
run:

```conquest ```

By default, when running conquest without options, it will
query the meta-server at conquest.radscan.com to get a list of
currently available servers. Pick one, login, and play.
By default, when running conquest without options, conquest will query
the meta-server at *conquest.radscan.com* to get a list of currently
available servers. Pick one, login, and play.

Alternatively, you can specify a specific server with the "-s" option:

Expand Down Expand Up @@ -59,8 +61,8 @@ To build and run Conquest, you will need:
* SDL 1.2 and SDL_mixer 1.2, if you want sound (you do).
* g++ 4.9 or better, or clang++ 3.4 or better

On a Kubuntu/Ubuntu 17.10 system, the following should install the
required packages to build the server and client:
On an Ubuntu system (tested with Kubuntu 17.10), the following
should install the required packages to build the server and client:

```
sudo apt-get install build-essential autoconf automake libtool \
Expand All @@ -76,12 +78,13 @@ In the past, other Unix systems were supported like the BSD's
and Sun/Oracle Solaris.

These have not been tested in a while, so if there are problems,
please feel free to send patches. If they work, I'd love to know.
please feel free to send patches. If they still work, I'd love to
know.

The last release of conquest in 2010 also supported the conquest
client on MS Windows systems (XP and Windows 7) using MinGW. This has
also not been tested in a while, but I plan to support this again
later.
client (only) on MS Windows systems (XP and Windows 7) using MinGW.
This has also not been tested in a while, but I plan to support this
again later.

### Building Conquest

Expand All @@ -108,7 +111,7 @@ There is a low volume mailing list for Conquest. You can subscribe

## IRC Channel

There is an IRC Channel (#conquest) for Conquest on chat.freenode.net.
There is an IRC channel for Conquest on chat.freenode.net, channel: *#conquest*

## Further information

Expand All @@ -128,8 +131,8 @@ There is an IRC Channel (#conquest) for Conquest on chat.freenode.net.
* The [Server Guide](docs/server-guide.md) has instructions for those
wanting to run their own Conquest servers.

* Marisa Giancaria has setup a
[Conquest Gameplayers Club Community Page](https://conquest.gameplayer.club/)
* Marisa Giancaria has setup a Conquest
[Gameplayers Club Community Page](https://conquest.gameplayer.club/)
for players and operators who wish to participate. Also available
are tools to help potential server operators who are not familiar
with the Linux/Unix command line.
Expand All @@ -138,9 +141,8 @@ There is an IRC Channel (#conquest) for Conquest on chat.freenode.net.
information on the format and types of files the Conquest server and
client uses to configure itself. The Universe (planets, etc),
textures, animations, and sound information are all handled by this
parser. At startup, Conquest's executables will look for these
files in *prefix*/etc/conquest/ . This is primarily of interest to
those wanting to run a server with a modified Universe.
parser. This is primarily of interest to those wanting to run a
server with a modified Universe.

## Some screenshots

Expand Down
7 changes: 4 additions & 3 deletions docs/HISTORY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@

Conquest HISTORY

8.5.99c, 5/21/2018 (development release)
9.0, 6/19/2018 (stable release)

So... 8 years later, a new development version of Conquest has been
released :)
- 8.5.99c, 5/21/2018 (development release)

So... 8 years later, a new version of Conquest has been released :)

There have been many changes (internal and external) in this version
compared to the previous 8.5 version. In hopefully a short time,
Expand Down
4 changes: 2 additions & 2 deletions src/version.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
//


const char *ConquestVersion = "Version 8.5.99c";
const char *ConquestDate = "05/21/2018";
const char *ConquestVersion = "Version 9.0";
const char *ConquestDate = "06/19/2018";

/* That's it! */

0 comments on commit 9efc3b6

Please sign in to comment.