X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic.wiki.git;a=blobdiff_plain;f=Repository_Access.md;h=8d034b005e206f767ed63dbc1c6e17fb63163130;hp=83d1574a433e39c4c66be481a81005b72919feb0;hb=97c6c5a6e64c58ce77e59c87cda7ae12381d5b44;hpb=af88ff233867fa38e2deb5bd20e29ad7daf03a73 diff --git a/Repository_Access.md b/Repository_Access.md index 83d1574..8d034b0 100644 --- a/Repository_Access.md +++ b/Repository_Access.md @@ -1,7 +1,7 @@ Repository Access and Compiling =============================== -Xonotic uses [several Git repositories](Git). The `all` in the main repository manages them, builds Xonotic and runs it. Each repo can also contain feature branches next to the stable “master” branch, check them out for WIP features. +Xonotic uses [several Git repositories](Git). The `all` script in the main repo manages them, builds Xonotic and runs it. Each repo can also contain feature branches next to the stable `master` branch, check them out for WIP features. *** @@ -18,9 +18,9 @@ Linux already is adequate for development, all we need are the **dependencies** sudo apt-get install build-essential curl xserver-xorg-dev x11proto-xf86dri-dev x11proto-xf86dga-dev x11proto-xf86vidmode-dev libxxf86dga-dev libxcb-xf86dri0-dev libxpm-dev libxxf86vm-dev libsdl1.2-dev libsdl2-dev libsdl2-image-dev libclalsadrv-dev libasound2-dev libxext-dev libjpeg-turbo8-dev git-core unzip wget zlib1g-dev -Note: If using **i386** architecture, you can replace `libdsl1.2debian` with `libsdl1.2debian:i386` in the list above. On Debian, use `libjpeg8-dev` if `libjpeg-turbo8-dev` isn’t available in the package repositories. +Note: If using **i386** architecture, you can replace `libsdl1.2debian` with `libsdl1.2debian:i386` in the list above. On Debian, use `libjpeg8-dev` if `libjpeg-turbo8-dev` isn’t available in the package repositories. -For **Fedora** and other **RPM based** distro’s, compiling dependencies are as follows: +For **Fedora** and other **RPM based** distros dependencies: x11-proto-devel libalsa2-static-devel libjpeg62-devel libjpeg62-static-devel libSDL2-devel @@ -79,9 +79,9 @@ The `run` command can also be followed by standard DarkPlaces commandline argume To update your Git clone: cd xonotic - ./all checkout - ./all update - ./all compile -r + ./all checkout # switch to main branch on all repos (usually master) + ./all update # pull and prune + ./all compile -r # recompile what changed **Note:** The compiled binary will have a faint watermark with the git revision. To remove it completely put `set menu_watermark ""` into your `autoexec.cfg`. @@ -89,7 +89,7 @@ To update your Git clone: *** -If you run into issues with the latest version you can easily revert to an older one. Since most bugs are caused by the game code rather that the engine, you just need to downgrade that repository. Inside the main xonotic repository, use `cd data/xonotic-data` and then `git checkout `. After that go back `cd -` and `./all compile` (with the optional `-r` flag). +If you run into issues with the latest version you can easily revert to an older one. Since most bugs are caused by the game code rather that the engine, you just need to downgrade that repository. Inside the main xonotic repository, use `cd data/xonotic-data.pk3dir` and then `git checkout `. After that go back `cd -` and `./all compile` (with the optional `-r` flag). *** @@ -100,7 +100,7 @@ A condition for write (push) access is that you agree that any code or data you \* data/qcsrc/warpzonelib - 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 channel. +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. ### Windows/Linux/OS X