Upload attachment items.jpg

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

diff --git a/Repository_Access.md b/Repository_Access.md
index 66274d030e71d9963bac3f2ecfa25c5028c29b88..6cf50603aefbaeea07db458ea3fdf4ef46b9b6d4 100644 (file)
--- a/Repository_Access.md
+++ b/Repository_Access.md
@@ -19,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 zip
 
 Note: On Debian, use `libjpeg62-turbo-dev` if `libjpeg-turbo8-dev` isn’t available in the package repositories.
 
@@ -33,13 +33,13 @@ Note: `x11-proto-devel` or `xorg-x11-proto-devel` might be needed but might be a
 
 **Archlinux** dependencies:
 
-    sudo pacman -S alsa-lib curl git libjpeg-turbo libmodplug libpng libvorbis libxpm xorgproto libxxf86vm sdl2 unzip
+    sudo pacman -S alsa-lib curl git libjpeg-turbo libmodplug libpng libvorbis libxpm xorgproto libxxf86vm sdl2 unzip zip
 
 ### Windows
 
 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}
 
@@ -56,12 +56,10 @@ Cloning the Repository and Compiling
 
 To begin downloading:
 
-    git clone git://git.xonotic.org/xonotic/xonotic.git  # download main repo
+    git clone https://gitlab.com/xonotic/xonotic.git  # download main repo
     cd xonotic
     ./all update -l best  # download all other repos (data + game logic, maps, etc.)
 
-The **git://** protocol uses port **9418**, which may be a problem if you’re behind a **strict firewall**. You may instead use the clone url http://git.xonotic.org/xonotic/xonotic.git (however, using the git protocol directly is preferred for performance reasons).
-
 Now the game can be compiled and run with the following commands:
 
     ./all compile -r
@@ -154,15 +152,15 @@ General Contributor Guidelines
 ------------------------------
 
 1.  Before creating your local branch and committing to it, make sure you’ve configured your user settings such as your name which will display in the logs (in TortoiseGit: Settings > Git > Config).
-2.  Try naming your branch myname/mychange for each patch. For instance, if your name is Alex and the change you are committing is a menu fix, use something like alex/menufix.
+2.  You should name your branch myname/mychange for each patch. For instance, if your name is Alex and the change you are committing is a menu fix, use something like alex/menufix.
 
-Further Git Information
+Git guides
 -----------------------
 
+Git basics on [this wiki page](Git).
+
 About tracking remote branches:
 http://git-scm.com/book/en/v2/Git-Branching-Remote-Branches
 
-This wiki’s [Git](Git) page.
-
 A tutorial to Git for SVN users:
-http://git-scm.org/course/svn.html
+https://git.wiki.kernel.org/index.php/GitSvnCrashCourse