From 6f854ca38d83c372605c7e1fd6bcc61fae0180be Mon Sep 17 00:00:00 2001 From: Adam Ralph Date: Sat, 28 May 2016 15:07:33 +0200 Subject: [PATCH 1/4] tidy up README --- README.md | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 3b5917a20..89bf679e9 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,45 @@ # SuperTuxKart [![Build Status](https://travis-ci.org/supertuxkart/stk-code.png?branch=master)](https://travis-ci.org/supertuxkart/stk-code) -SuperTuxKart is a free kart racing game. It is focusing on fun and -not on realistic kart physics. Instruction can be found on the -in-game help page. +SuperTuxKart is a free kart racing game. It focuses on fun and not on realistic kart physics. Instructions can be found on the in-game help page. The SuperTuxKart homepage can be found at: -The official SuperTuxKart forum is at . If you need support, -this would be the best place to start. +The official SuperTuxKart forum is at . If you need support, this would be the best place to start. Hope you enjoy the game. -- The SuperTuxKart development team. - ## Hardware Requirements -* You need a 3D graphics card. (NVIDIA GeForce 8xxx and higher, ATI Radeon HD 4xxx and higher or Intel HD 3000 and higher) +* You need a 3D graphics card. (NVIDIA GeForce 8xxx and higher, ATI Radeon HD 4xxx and higher or Intel HD 3000 and higher.) * You should have a CPU that's running at 1GHz or better. * You'll need at least 512 MB of free VRAM (video memory). * Disk space: 400MB * Ideally, you want a joystick with at least 6 buttons. - ## Compiling SuperTuxKart ### Windows 1. Install VS 2013 (or later). The free express versions work fine. -2. Download and install a source package - either a released package or from our [git/svn repositories](http://supertuxkart.sourceforge.net/Source_control) -3. Download the latest dependency package depdendencies_for_0.8.2.zip from [here](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/). Unzip it in the root directory, so that the dependencies directory is next to the src and data directory (if you are updating from a previous dependency package, you can delete the .dll files in the root directory, they are not needed anymore). -4. Download cmake and install it. Then start cmake-gui and select the STK root directory as 'Where is the source code', and a new directory in the root directory (next to src, data etc) as build directory (for now I assume that this directory is called bld). -5. Click on configure. You will be asked to create the directory (yes), then for your VS version. Make sure to select the right version (be aware of the easy to confuse version numbers: VS 2013 = version 12). Click on configure, then generate. This will create the directory 'bld', and a VS solution in that directory. -6. In Visual Studio open the project file generated in the 'bld' folder +2. Download and install a source package - either a released package or from our [git/svn repositories](http://supertuxkart.sourceforge.net/Source_control). +3. Download the latest dependency package dependencies_for_0.8.2.zip from [here](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/). Unzip it in the root directory, so that the dependencies directory is next to the src and data directories (if you are updating from a previous dependency package, you can delete the .dll files in the root directory, they are not needed anymore). +4. Download cmake and install it. Then start cmake-gui and select the STK root directory as 'Where is the source code', and a new directory in the root directory (next to src, data etc) as the build directory (for now I assume that this directory is called bld). +5. Click on configure. You will be asked to create the directory (yes), then for your VS version. Make sure you select the right version (be aware of the easy to confuse version numbers: VS 2013 = version 12). Click on configure, then generate. This will create the directory 'bld', and a VS solution in that directory. +6. In Visual Studio open the project file generated in the 'bld' folder. 7. Right click on the supertuxkart project in the solution explorer, and select "Set as StartUp Project". 8. Select Build->Build Solution (or press F7) to compile. -Compilation with cygwin is not officially supported, but -this has been done (check with the forum for details). +Compilation with cygwin is not officially supported, but this has been done (check with the forum for details). ### Mac OS X -The latest information about compilation on Mac are on our wiki: - +The latest information about compilation on Mac are on our wiki: ### UNIX See [`INSTALL.md`](INSTALL.md) for details. - ## License -This software is released under the GNU General Public License (GPL) which -can be found in the file [`COPYING`](/COPYING) in the same directory as this file. -Information about the licenses for artwork are contained in -`data/licenses`. - +This software is released under the GNU General Public License (GPL) which can be found in the file [`COPYING`](/COPYING) in the same directory as this file. Information about the licenses for artwork are contained in `data/licenses`. ## 3D coordinates A reminder for those looking at the code and 3d models: @@ -60,6 +48,4 @@ STK : X right, Y up, Z forwards Blender: X right, Y forwards, Z up -The exporters perform the needed transform, so in Blender you just work -with XY plane as ground, and things will appear fine in STK (using XZ -as ground in the code, obviously). +The exporters perform the needed transform, so in Blender you just work with XY plane as ground, and things will appear fine in STK (using XZ as ground in the code, obviously). From b9c1b2020980de577f16e90903689b9b9a79752c Mon Sep 17 00:00:00 2001 From: "auria.mg" Date: Sat, 28 May 2016 19:26:52 -0400 Subject: [PATCH 2/4] Update readme file, don't mention version number, we'll forget to update it on every release --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 89bf679e9..abc3748d1 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Hope you enjoy the game. ### Windows 1. Install VS 2013 (or later). The free express versions work fine. 2. Download and install a source package - either a released package or from our [git/svn repositories](http://supertuxkart.sourceforge.net/Source_control). -3. Download the latest dependency package dependencies_for_0.8.2.zip from [here](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/). Unzip it in the root directory, so that the dependencies directory is next to the src and data directories (if you are updating from a previous dependency package, you can delete the .dll files in the root directory, they are not needed anymore). +3. Download the latest dependency package from [here](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/). Unzip it in the root directory, so that the dependencies directory is next to the src and data directories (if you are updating from a previous dependency package, you can delete the .dll files in the root directory, they are not needed anymore). 4. Download cmake and install it. Then start cmake-gui and select the STK root directory as 'Where is the source code', and a new directory in the root directory (next to src, data etc) as the build directory (for now I assume that this directory is called bld). 5. Click on configure. You will be asked to create the directory (yes), then for your VS version. Make sure you select the right version (be aware of the easy to confuse version numbers: VS 2013 = version 12). Click on configure, then generate. This will create the directory 'bld', and a VS solution in that directory. 6. In Visual Studio open the project file generated in the 'bld' folder. From 70c0038b938f76e413fa9df205a3a03441dd8282 Mon Sep 17 00:00:00 2001 From: hiker Date: Mon, 30 May 2016 16:59:54 +1000 Subject: [PATCH 3/4] Added backtwards force when reversing. That fixes the problem that a kart might sometimes get stuck when driving backwards. --- src/karts/kart.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp index 2af9037f3..1db494c2b 100644 --- a/src/karts/kart.cpp +++ b/src/karts/kart.cpp @@ -2310,7 +2310,7 @@ void Kart::updateEnginePowerAndBrakes(float dt) // or moving backwards if(m_speed > 0.0f) { // Still going forward while braking - applyEngineForce(0.f); + applyEngineForce(-engine_power*2.5f); m_brake_time += dt; // Apply the brakes - include the time dependent brake increase float f = 1 + m_brake_time From 0f79dcc238871e39bdefdd21f5b0441c8034a931 Mon Sep 17 00:00:00 2001 From: hiker Date: Tue, 31 May 2016 13:43:07 +1000 Subject: [PATCH 4/4] Fixed FreeBSD builds (freebsd installs Freetype etc in /usr/local/lib, but does not search in that directory for libraries). --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 381ebcc52..9140946e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -365,6 +365,11 @@ if(UNIX AND NOT APPLE) endif() endif() +# FreeBSD does not search in /usr/local/lib, but at least Freetype is installed there :( +if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib") +endif() + if(APPLE) # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :