Upload attachment normal_wp.jpg

[xonotic/xonotic.wiki.git] / Repository_Access.md

diff --git a/Repository_Access.md b/Repository_Access.md
index 9c5ef465deea206d60c16380a5417b538051a9ca..53ae8bcaf869c8061c4d1ab852b306e7c785b908 100644 (file)
--- a/Repository_Access.md
+++ b/Repository_Access.md
@@ -6,7 +6,9 @@ Xonotic uses [several Git repositories](Git). The `all` script in the main repo
 Build Requirements
 ------------------
 
-Make sure you have at least 2 GB memory to compile.
+Make sure you have at least 2GB memory to compile.  This is enough for a git server, but 6GB is required to play using a git client.
+
+[About 12GB of disk space is required for the git repositories.](Git)
 
 ### Linux
 
@@ -17,7 +19,7 @@ Note: The `all` script requires either `wget` or `curl`.
 
 **Ubuntu** dependencies:
 
-    sudo apt-get install autoconf build-essential curl git libtool libgmp-dev libjpeg-turbo8-dev libsdl2-dev libxpm-dev xserver-xorg-dev zlib1g-dev
+    sudo apt-get install autoconf build-essential curl git libtool libgmp-dev libjpeg-turbo8-dev libsdl2-dev libxpm-dev xserver-xorg-dev zlib1g-dev unzip
 
 Note: On Debian, use `libjpeg62-turbo-dev` if `libjpeg-turbo8-dev` isn’t available in the package repositories.
 
@@ -37,7 +39,7 @@ Note: `x11-proto-devel` or `xorg-x11-proto-devel` might be needed but might be a
 
 By default, Windows has no real environment to handle the necessary scripting and compiling tools for building Xonotic. So, what we have to do is install something called [MSYS2](http://www.msys2.org) to allow us to have a similar environment as on Linux. Download 64 bit version of MSYS2 (msys2-x86_64-xxxxxx.exe) and follow installation instructions.
 
-Once you have completed the installation, launch the MSYS2 shell by running `mingw64.exe` (instead of the default msys2.exe) by default located at `C:\msys64` and install the needed **dependencies** with this command:
+Once you have completed the installation, close the current MSYS2 shell and launch a MSYS2 MINGW64 shell by running mingw64.exe (instead of the default msys2.exe) located at C:\msys64 and install the needed dependencies with this command:
 
     pacman --needed -S git curl zip unzip p7zip make automake autoconf libtool gcc gmp-devel mingw-w64-x86_64-{toolchain,gmp,SDL2,libjpeg-turbo,libpng,libogg}
 
@@ -94,7 +96,9 @@ Contributing and Getting Write Access
 Cloning (one of) our repos and submitting MRs from there (as in any other project) works but you won't be able to use our CI setup for the data repo (which seems to need a custom runner). It's therefore a good idea to join the Xonotic group and get push access - then you can create branches in our repos and use our CI.
 
 A condition for write (push) access is that you agree that any code or data you push will be licensed under the General Public License, version 2, with or without the “or any later version” clause. In case the directory the changes apply to contains a LICENSE or COPYING file indicating another license, then your pushed code has to be dual licensed appropriately. Subdirectories currently having a dual license:
-\* data/qcsrc/warpzonelib - dual licensed as “GPLv2 or later” or MIT license.
+
+* `data/xonotic-data.pk3dir/qcsrc/lib/warpzone` - dual licensed as “GPLv2 or later” or MIT license.
+
 In case the code you pushed was not written by you, it is your responsibility to ensure proper licensing.
 
 To apply for write access, add your SSH key to your GitLab account and ask for access in #xonotic on the FreeNode IRC network or [request access](https://docs.gitlab.com/ce/user/group/index.html#request-access-to-a-group) using the GitLab interface.