X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.wiki.git;a=blobdiff_plain;f=Repository_Access.md;h=6cf50603aefbaeea07db458ea3fdf4ef46b9b6d4;hp=4894e9306222bc1926f99fc0776f7ce96220d2dc;hb=6773e807a7dfa6c0a6416193ad9ae08b7f40ad58;hpb=d63a246155436f2dfe7317c6049da8961211aa09 diff --git a/Repository_Access.md b/Repository_Access.md index 4894e93..6cf5060 100644 --- 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,7 +33,7 @@ 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 @@ -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