diff --git a/README.md b/README.md index 88d5f0eac..6e22b8f1b 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ Our own flavor of DDRace, a Teeworlds mod. See the [website](http://ddnet.tw) fo Development discussions happen on #ddnet on Quakenet ([Webchat](http://webchat.quakenet.org/?channels=ddnet&uio=d4)). +You can get binary releases on the [DDNet website](http://ddnet.tw/downloads/). + Building -------- -You can get binary releases on the [DDNet website](http://ddnet.tw/downloads/). - To compile DDNet yourself, you can follow the [instructions for compiling Teeworlds](https://www.teeworlds.com/?page=docs&wiki=compiling_everything). DDNet requires additional libraries, that are bundled for the most common platforms (Windows, Mac, Linux, all x86 and x86_64). Instead you can install these libraries on your system, remove the `config.lua` and `bam` should use the system-wide libraries by default: `libcurl, libogg, libopus, libopusfile` diff --git a/license.txt b/license.txt index 1dd2fe53f..00910eddc 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,6 @@ -Copyright (C) 2007-2014 Magnus Auvinen +Teeworlds Copyright (C) 2007-2014 Magnus Auvinen +DDRace Copyright (C) 2010-2011 Shereef Marzouk +DDNet Copyright (C) 2013-2015 Dennis Felsing This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/license_DDRace.txt b/license_DDRace.txt deleted file mode 100644 index 3de7da9d0..000000000 --- a/license_DDRace.txt +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (c) 2010-2011 Shereef Marzouk -This code was originally by Magnus Auvinen and we work also under the same license. -available to you in license.txt \ No newline at end of file diff --git a/AndroidAppSettings.cfg b/scripts/AndroidAppSettings.cfg similarity index 100% rename from AndroidAppSettings.cfg rename to scripts/AndroidAppSettings.cfg diff --git a/BUILDING_ANDROID b/scripts/make_android.sh similarity index 96% rename from BUILDING_ANDROID rename to scripts/make_android.sh index a4fd5d90b..3225fafe4 100644 --- a/BUILDING_ANDROID +++ b/scripts/make_android.sh @@ -1,4 +1,4 @@ -This is how I build DDNet for Android: +# This is how I build DDNet for Android: # Cloning the building repo with the SDL port for Android by Pelya cd /media