diff options
| -rw-r--r-- | configure.in | 26 | ||||
| -rw-r--r-- | developer/TODO | 7 | ||||
| -rw-r--r-- | doc/index.html | 42 | ||||
| -rw-r--r-- | doc/installation.html | 27 | ||||
| -rw-r--r-- | doc/main.css | 12 |
5 files changed, 62 insertions, 52 deletions
diff --git a/configure.in b/configure.in index 3fadb1b..d9f577d 100644 --- a/configure.in +++ b/configure.in @@ -250,32 +250,22 @@ AC_ARG_WITH(bullet, LD_FLAGS_save="$LD_FLAGS" CPPFLAGS_save="$CPPFLAGS" -BULLET_DIRS="/usr/local /usr" +BULLET_DIR="/usr" if test "x${with_bullet}" != "x"; then - BULLET_DIRS="${with_bullet}" + BULLET_DIR="${with_bullet}" fi -for dir_to_test in ${BULLET_DIRS}; do - if test "x${BULLET_DIR}" = "x"; then - CPPFLAGS="-I${dir_to_test}/include/bullet" - AC_CHECK_HEADER(btBulletDynamicsCommon.h, - BULLET_DIR="${dir_to_test}", - [] - ) - fi -done - -if test "x${BULLET_DIR}" = "x"; then - AC_MSG_ERROR([bullet physics library not found in ${BULLET_DIRS}]) -fi +CPPFLAGS="-I${BULLET_DIR}/include/bullet" -AC_MSG_CHECKING([for bullet prefix]) -AC_MSG_RESULT([${BULLET_DIR}]) +AC_CHECK_HEADER(btBulletDynamicsCommon.h, + [], + AC_MSG_ERROR([bullet physics library not found in ${BULLET_DIR}]) +) AC_MSG_CHECKING([if static linking of the bullet libraries is requested]) if test "x${enable_static_bullet}" = "xyes"; then BULLET_CPPFLAGS="-I${BULLET_DIR}/include/bullet" - BULLET_LIBS="$BULLET_DIR/lib/libBulletDynamics.a $BULLET_DIR/lib/libBulletCollision.a $BULLET_DIR/lib/libLinearMath.a" + BULLET_LIBS="${BULLET_DIR}/lib/libBulletDynamics.a $BULLET_DIR/lib/libBulletCollision.a $BULLET_DIR/lib/libLinearMath.a" AC_MSG_RESULT([yes]) else BULLET_CPPFLAGS="-I${BULLET_DIR}/include/bullet" diff --git a/developer/TODO b/developer/TODO index 9a51514..078f51c 100644 --- a/developer/TODO +++ b/developer/TODO @@ -105,7 +105,7 @@ sound: game: add Ship::ship_dock, making docking indepdendent of player->view() - have the goto command check the target's Docked state + have the goto command check the target's Docked state -> ties into ship dock awereness ship health/shield/armor add fleet support @@ -119,8 +119,9 @@ documentation: update starsystem roadmap add starsystem roadmap to the user documentation add a yaw/pitch/roll image to the modelling documentation - add a spacescape link - add a link to CIA.vc + + (ok) add a spacescape link + (ok) add a link to CIA.vc data: rename skies (lindblade1, lindblade2, ...) diff --git a/doc/index.html b/doc/index.html index 172dd10..0fd4b30 100644 --- a/doc/index.html +++ b/doc/index.html @@ -18,18 +18,28 @@ <div class="text"> <p> - Project::OSiRiON is a 3D space game under development. Its goal is to create an emersive - universe with open gameplay inspired by classic titles such as + Project::OSiRiON is a free space trading and combat simulation under development. + Its goal is to create an immersive universe with open gameplay inspired by classic titles such as <a href="http://en.wikipedia.org/wiki/Wing_Commander:_Privateer">Privateer</a> and <a href="http://en.wikipedia.org/wiki/Freelancer_(video_game)">Freelancer</a>. -</p><p> - The game uses a custom engine, written from scratch in C++ and - uses portable libraries like SDL, OpenGL, OpenAL and zlib. Physics and collision - are implemented using the <a href="http://bulletphysics.org/">Bullet physics library</a>. -</p><p> - The basic components are already in place: players are able to visit multiple star systems, - buy ships, trade cargo or join a game on a network server, but important features like - weapons and player saving are have yet to be implemented. +</p> +<p> + The engine is written from scratch in C++ and uses SDL, OpenGL, OpenAL, libjpeg, libpng, zlib + and the <a href="http://www.bulletphysics.com/">Bullet physics library</a>. It is + a work in progress and evolves with the game as required. +</p> +<p> + The basic components are already in place: players can start a single-player game, + or join a network server. They can purchase a ship and explore the universe and can even earn + some cash trading cargo. Other important parts are still missing: games can not be saved and + there are no weapon nor combat features. +</p> +<p> + The game aims to be fully customizable. Common and easy to edit file formats + make it trivial to change most of the game settings and world definitions. +</p> +<p> + Packages of the latest development build are available for windows and linux. </p> </div> @@ -99,7 +109,15 @@ <a href="http://ingar.satgnu.net/osirion">http://ingar.satgnu.net/osirion</a> </p> <p> - The official IRC channel is <i>#osirion</i> on the FreeNode IRC network. + The official IRC channel is <a href="irc://chat.freenode.net/%23osirion">#osirion</a> on the + <a href="http://freenode.net/">FreeNode</a> IRC network. +</p> +<p> + SVN activity is monitored by <a href="http://cia.vc/">CIA.vc</a>, the project pages can be found here: + <ul> + <li><a href="http://cia.vc/stats/project/Osirion">osirion</a> + <li><a href="http://cia.vc/stats/project/osirion-data">osirion-data</a> + </ul> </p> </div> @@ -121,7 +139,7 @@ of authors and copyright. </p> <p> - Copyright © 2007-2009<br> + Copyright © 2007-2010<br> Stijn "Ingar" Buys <ingar@telenet.be> </p> </div> diff --git a/doc/installation.html b/doc/installation.html index 2c3ddfc..cc1ec14 100644 --- a/doc/installation.html +++ b/doc/installation.html @@ -173,7 +173,7 @@ unzip ../osirion-data-latest.zip the instructions in <a href="http://ingar.satgnu.net/devenv/mingw32/">this document</a> to create a complete environment, capable of building the Project::OSiRiON source code. You need to install the base system described in part one, and the following packages described - in part two: DirectX development files, zlib, SDL, libpng, libjpeg, OpenAL Soft, pdcurses and bullet. + in part two: pkg-config, DirectX development files, zlib, SDL, libpng, libjpeg, OpenAL Soft, pdcurses and bullet. </p> </div> @@ -251,31 +251,30 @@ autoreconf -fi<br> </div> <p> - If you do not need the client and want to build the dedicated server only - you can pass the <span class="fixed">--without-client</span> option to <span class="fixed">configure</span>: -</p> -<div class="code"> -./configure --without-client -</div> -<p> Configure will automaticly detect the bullet library if it was installed in - <span class=fixed>/usr</span> or <span class=fixed>/usr/local</span>. + <span class=fixed>/usr</span>. If it was installed somewhere else you will have to pass the <span class="fixed">--with-bullet=prefix</span> option - to configure. For example, <span class="fixed">--with-bullet=/opt/bullet</span> will use the bullet libraries installed in - <span class="fixed">/opt/bullet/lib</span> and the includes in <span class="fixed">/opt/bullet/include/bullet</span>. + to configure. For example, <span class="fixed">--with-bullet=/usr/local</span> will use the bullet libraries installed in + <span class="fixed">/usr/local/lib</span> and the includes in <span class="fixed">/usr/local/include/bullet</span>. </p> <div class="code"> -./configure --with-bullet=/opt/bullet +./configure --with-bullet=/usr/local </div> <p> If you add the <span class=fixed>--enable-static-bullet</span> option, the resulting binary will be staticly linked with the bullet libraries. They will work on systems that do not have bullet installed. </p> <div class="code"> -./configure --with-bullet=/opt/bullet --enable-static-bullet +./configure --with-bullet=/usr/local --enable-static-bullet +</div> +<p> + If you do not need the client and want to build the dedicated server only + you can pass the <span class="fixed">--without-client</span> option to <span class="fixed">configure</span>: +</p> +<div class="code"> +./configure --without-client </div> - <p> If <span class="fixed">configure</span> finds ncurses or pdcurses, the dedicated server will use this library and a have a curses console. To disable curses detection, pass the diff --git a/doc/main.css b/doc/main.css index efcc412..68e4d6f 100644 --- a/doc/main.css +++ b/doc/main.css @@ -69,8 +69,8 @@ img { border-bottom: 1px solid #606060; border-left: 1px solid #606060; border-right: 1px solid #606060; - margin-top: 24px; - margin-bottom: 24px; + margin-top: 16px; + margin-bottom: 16px; } .header { @@ -96,8 +96,9 @@ img { .title { background: #d7d7d7; margin-left: 24px; - margin-right: 72px; + margin-right: 48px; padding: 4px; + padding-left: 8px; border-top: 1px solid #606060; border-bottom: 1px solid #606060; border-left: 1px solid #606060; @@ -108,7 +109,7 @@ img { .subtitle { background: #e7e7e7; margin-left: 48px; - margin-right: 72px; + margin-right: 48px; margin-top: 8px; margin-bottom: 8px; font-size: 12pt; @@ -123,7 +124,7 @@ img { .text, .nav, .toolbox { margin-left: 48px; - margin-right: 72px; + margin-right: 48px; } .text, .toolbox { @@ -133,6 +134,7 @@ img { border-left: 1px solid #606060; border-right: 1px solid #606060; padding: 8px; + padding-left: 8px; margin-top: 8px; margin-bottom: 8px; } |