From: nyov Date: Sat, 22 Nov 2014 22:51:15 +0000 (+0000) Subject: include old redmine-hosted files X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=099a5e282826eb8d255bbd1d91065f458a1ed5fd;p=xonotic%2Fxonotic.wiki.git include old redmine-hosted files and remove most traces to dev.xonotic.org attachements To cut down a bit on binary size, the images have been run through pngcrush and jpegoptim first. --- diff --git a/Announcement.md b/Announcement.md index b745d4d..5d7c2dc 100644 --- a/Announcement.md +++ b/Announcement.md @@ -174,7 +174,7 @@ v7, edited by Dokujisan We would like to formally announce the arrival of **[Xonotic](http://xonotic.org)** - A free (GPL), fast-paced first-person shooter that works on Microsoft Windows, Mac OSX and Linux. Xonotic is a direct successor of the **[Nexuiz Project](http://alientrap.org/nexuiz)**. -Xonotic came about in the wake of recent troublesome **[changes](http://dev.xonotic.org/projects/xonotic/wiki/Faq#What-prompted-the-split-from-Nexuiz)** to the Nexuiz project, changes that have left many of the core contributors and community members feeling that the project has been **[mishandled](http://alientrap.org/forum/viewtopic.php?f=4&t=6079)**. As a result, we felt the need to organize a departure to start with a clean slate. +Xonotic came about in the wake of recent troublesome **[changes](Faq#what-prompted-the-split-from-nexuiz)** to the Nexuiz project, changes that have left many of the core contributors and community members feeling that the project has been **[mishandled](http://alientrap.org/forum/viewtopic.php?f=4&t=6079)**. As a result, we felt the need to organize a departure to start with a clean slate. **[Xonotic](http://xonotic.org)** will place focus on the things we love about Nexuiz, and extend our goals to become the game that many thought Nexuiz should have been. While technically being a direct successor of Nexuiz, the **[Xonotic](http://xonotic.org)** project is a rethink of the Nexuiz project that recognizes the **community** around it as its principal driving force and will restructure itself to respect that. This means that there will never be a single person with total control over the project. In addition to the stronger focus on the community, Xonotic will also pursue a clearer agenda including the following: diff --git a/Announcement_vote.md b/Announcement_vote.md index 61a73b8..5b786b5 100644 --- a/Announcement_vote.md +++ b/Announcement_vote.md @@ -6,7 +6,7 @@ and now .. lets vote for our official Announcement !!! Candidates ---------- -See current candidates at http://dev.xonotic.org/projects/xonotic/wiki/Announcement +See current candidates at [Announcement](Announcement) v1 by -z- v2 by Spaceman diff --git a/Art_Roadmap.md b/Art_Roadmap.md index 58bf146..37e742e 100644 --- a/Art_Roadmap.md +++ b/Art_Roadmap.md @@ -9,13 +9,13 @@ Player Models |Name|Species|Thread(s)|Mesh|Textures|Animations|LOD1|LOD2|TODO|Artist(s)|Status|Git Branch|Priority| |----|-------|---------|----|--------|----------|----|----|----|---------|------|----------|--------| -|[Umbra](http://dev.xonotic.org/projects/xonotic/wiki/Players#Umbra)|Human|[1](http://dev.xonotic.org/issues/25) [2](http://www.alientrap.org/forum/viewtopic.php?f=2&t=6051)|COMPLETED|IN PROGRESS|COMPLETED|INCOMPLETE|INCOMPLETE|Merge pants to glow|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|diabolik/umbraplayermodel|HIGH| -|[Pyria](http://dev.xonotic.org/projects/xonotic/wiki/Players#Pyria)|Human|[1](http://www.alientrap.org/forum/viewtopic.php?f=2&t=6088&p=76962&hilit=pyria#p76962)|COMPLETED|IN PROGRESS|Fix duckwalk|INCOMPLETE|INCOMPLETE|Animations, Merge pants to glow|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|diabolik/pyriaplayermodel|HIGH| -|[Ignis-3 versions](http://dev.xonotic.org/projects/xonotic/wiki/Players#Ignis)|Human|[1](http://dev.xonotic.org/issues/39) [2](http://forums.xonotic.org//showthread.php?tid=498) [3](http://forums.xonotic.org//showthread.php?tid=500)|COMPLETED|COMPLETED|COMPLETED|IN PROGRESS|IN PROGRESS|LODs|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|diabolik/ignisplayermodel|HIGH| -|[Gak-3 versions](http://dev.xonotic.org/projects/xonotic/wiki/Players#Gak)|Alien|[1](http://forums.xonotic.org//showthread.php?tid=497) [2](http://www.alientrap.org/forum/viewtopic.php?f=2&t=5997)|COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs, merge pants to glow|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|NA|HIGH| -|[Erebus](http://dev.xonotic.org/projects/xonotic/wiki/Players#Erebus)|Cyborg||COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs|Oblivion, DiaboliK, theShadow|IN PROGRESS|NA|HIGH| -|[Nyx](http://dev.xonotic.org/projects/xonotic/wiki/Players#Nyx)|Cyborg||COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs|Oblivion, DiaboliK, theShadow|IN PROGRESS|NA|HIGH| -|[Seraphina-2 versions](http://dev.xonotic.org/projects/xonotic/wiki/Players#Seraphina)|Human||COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs, use more glow|Oblivion, DiaboliK, theShadow|IN PROGRESS|NA|HIGH| +|[Umbra](Players#umbra)|Human|[1](http://dev.xonotic.org/issues/25) [2](http://www.alientrap.org/forum/viewtopic.php?f=2&t=6051)|COMPLETED|IN PROGRESS|COMPLETED|INCOMPLETE|INCOMPLETE|Merge pants to glow|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|diabolik/umbraplayermodel|HIGH| +|[Pyria](Players#pyria)|Human|[1](http://www.alientrap.org/forum/viewtopic.php?f=2&t=6088&p=76962&hilit=pyria#p76962)|COMPLETED|IN PROGRESS|Fix duckwalk|INCOMPLETE|INCOMPLETE|Animations, Merge pants to glow|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|diabolik/pyriaplayermodel|HIGH| +|[Ignis-3 versions](Players#ignis)|Human|[1](http://dev.xonotic.org/issues/39) [2](http://forums.xonotic.org//showthread.php?tid=498) [3](http://forums.xonotic.org//showthread.php?tid=500)|COMPLETED|COMPLETED|COMPLETED|IN PROGRESS|IN PROGRESS|LODs|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|diabolik/ignisplayermodel|HIGH| +|[Gak-3 versions](Players#gak)|Alien|[1](http://forums.xonotic.org//showthread.php?tid=497) [2](http://www.alientrap.org/forum/viewtopic.php?f=2&t=5997)|COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs, merge pants to glow|Oblivion, tZork, DiaboliK, theShadow|IN PROGRESS|NA|HIGH| +|[Erebus](Players#erebus)|Cyborg||COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs|Oblivion, DiaboliK, theShadow|IN PROGRESS|NA|HIGH| +|[Nyx](Players#nyx)|Cyborg||COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs|Oblivion, DiaboliK, theShadow|IN PROGRESS|NA|HIGH| +|[Seraphina-2 versions](Players#seraphina)|Human||COMPLETED|COMPLETED|COMPLETED|INCOMPLETE|INCOMPLETE|LODs, use more glow|Oblivion, DiaboliK, theShadow|IN PROGRESS|NA|HIGH| Weapon Models ------------- diff --git a/Basic_mapping_in_Radiant.md b/Basic_mapping_in_Radiant.md index 0adb31d..bacf79a 100644 --- a/Basic_mapping_in_Radiant.md +++ b/Basic_mapping_in_Radiant.md @@ -6,7 +6,7 @@ Layout of Radiant This section will introduce the Radiant interface. Before you begin mapping, one must become acquainted with the basic user interface first. Radiant has five main sections by default, as numbered in the screenshot below. Let’s examine these panels a bit more in depth: -[![]({width:200px}radiant_sections_thumb.png)](http://dev.xonotic.org/attachments/download/87/radiant_sections.png) +[![Radient](assets/images/radiant_sections_thumb.png)](assets/images/radiant_sections.png) The Workspace ------------- diff --git a/Blender_to_IQM.md b/Blender_to_IQM.md index adb3bea..824d8c4 100644 --- a/Blender_to_IQM.md +++ b/Blender_to_IQM.md @@ -6,9 +6,9 @@ Blender when exporting to IQM ### Needed/Example files -* Bounding Box for Stand and Crouch: http://dev.xonotic.org/attachments/download/33/bbox_crouch_stand.zip -* Erebus example blend: http://dev.xonotic.org/attachments/download/291/erebus.blend -* Erebus example framegroups: http://dev.xonotic.org/attachments/download/292/erebus.iqm.framegroups +* Bounding Box for Stand and Crouch: [bbox_crouch.blend](assets/files/bbox_crouch_stand/bbox_crouch.blend), [bbox_standing.blend](assets/files/bbox_crouch_stand/bbox_standing.blend) +* Erebus example blend: [erebus.blend](https://gitlab.com/xonotic/mediasource/raw/master/models/player/erebus.blend) +* Erebus example framegroups: [erebus.iqm.framegroups](https://gitlab.com/xonotic/xonotic-data.pk3dir/raw/master/models/player/erebus.iqm.framegroups) * Link to exporter: http://sauerbraten.org/iqm/ ### Before You Start diff --git a/Compiling_In_Windows.md b/Compiling_In_Windows.md index 19ea793..422ee44 100644 --- a/Compiling_In_Windows.md +++ b/Compiling_In_Windows.md @@ -11,8 +11,9 @@ Step 1: installing the prerequisites ------------------------------------ To compile and run Xonotic in Windows, you will need to download the following. Do not install anything yet, this is covered in the next section. -\* The latest version of [MinGW](http://sourceforge.net/projects/mingw/files/). At the time of writing this guide, mingw provides an installer (mingw-get-inst). More up-to-date information on how to get MinGW can be found on http://mingw.org -\* [msysgit](https://code.google.com/p/msysgit/downloads/list). Make sure you get the latest **full installer for official Git** (not the self-contained packages). At the time of writing this, the latest installer is called Git-1.7.11-preview20120710.exe. + +- The latest version of [MinGW](http://sourceforge.net/projects/mingw/files/). At the time of writing this guide, mingw provides an installer (mingw-get-inst). More up-to-date information on how to get MinGW can be found on http://mingw.org +- [msysgit](https://code.google.com/p/msysgit/downloads/list). Make sure you get the latest **full installer for official Git** (not the self-contained packages). At the time of writing this, the latest installer is called Git-1.7.11-preview20120710.exe. ### Installing MinGW @@ -24,7 +25,20 @@ When the setup is complete, you will get a “MinGW Shell” in your start menu. ### Installing msysgit -Run the installer. At the component selection screen (screenhsot: attachment:“git-1-components.png”), uncheck the “Associate .sh files” option. Windows Explorer Integration can also optionnally be unselected — it is only useful if you plan on contributing and do not like using git purely from the command line to do so. When you get to the PATH adjusting screen (screenshot: attachment:git-2-path.png), you need to select the second option (Run Git from the Windows Command Prompt). This ensures that git can be run from the MinGW shell, as we will not use the shell that comes with msysgit for this. Finally, in the line ending screen (screenshot: attachment:git-3-crlf.png), keep the first option selected unless you know what you’re doing. +Run the installer. +At the component selection screen (screenshot), uncheck the “Associate .sh files” option. + +![](assets/images/git-1-components.png) + +Windows Explorer Integration can also optionnally be unselected — it is only useful if you plan on contributing and do not like using git purely from the command line to do so. +When you get to the PATH adjusting screen (screenshot), you need to select the second option (Run Git from the Windows Command Prompt). + +![](assets/images/git-2-path.png) + +This ensures that git can be run from the MinGW shell, as we will not use the shell that comes with msysgit for this. +Finally, in the line ending screen (screenshot), keep the first option selected unless you know what you’re doing. + +![](assets/images/git-3-crlf.png) ### Installing the dependencies in MinGW diff --git a/Concept_Art.md b/Concept_Art.md index fe8ca1e..69be3c7 100644 --- a/Concept_Art.md +++ b/Concept_Art.md @@ -4,6 +4,6 @@ Concept Art Logos and Emblems ----------------- -[![](http://dev.xonotic.org/attachments/14/xonotic_phoenix-1g.png)](http://dev.xonotic.org/attachments/15/xonotic_phoenix-1g.svg) +[![](assets/images/xonotic_phoenix-1g.png)](assets/images/xonotic_phoenix-1g.svg) Phoenix 1b Concept by -z- diff --git a/Framegroups.md b/Framegroups.md index a79b753..40c23aa 100644 --- a/Framegroups.md +++ b/Framegroups.md @@ -6,7 +6,7 @@ This file is needed to make md3, dpm, or iqm models play some animations in Xono For modelers ------------ -It is named .framegroups. So if you are editing Ignis, it would be called `ignis.iqm.framegroups`. +It is named `.framegroups`. So if you are editing Ignis, it would be called `ignis.iqm.framegroups`. Inside the file, the playermodel’s animations are defined one per line. diff --git a/Hardware_Requirements.md b/Hardware_Requirements.md index 58c34b7..fe5f9c6 100644 --- a/Hardware_Requirements.md +++ b/Hardware_Requirements.md @@ -139,7 +139,8 @@ Note: The benchmark list is sorted by “normal” FPS as primary sort key, “m * b) the OpenGL 1.x renderer is disqualified at normal and above for lack of support of: deluxemapping, gloss, offsetmapping, reliefmapping, postprocessing **Benchmark results :** - * 2013-08-28: attachment:benchmark.png + * 2013-08-28: + ![Benchmark results](assets/images/benchmark.png) How to run the benchmark ------------------------ diff --git a/Home.md b/Home.md index 76e78fc..14023d2 100644 --- a/Home.md +++ b/Home.md @@ -15,7 +15,6 @@ Project - [Community development](Community_development) planning - [Licensing / Legal](Legal) - [Announcements](Announcements) -- [Roadmap to v1](http://dev.xonotic.org/versions/show/3) - [Repository Access](Repository_Access) (how to compile from git) (see also [Git](Git)) - [Website](Website) Plannning - [Xonotic compatibility pack](Xonotic_compatibility_pack) a small pk3 that will rebrand a default Nexuiz install @@ -27,10 +26,10 @@ Gameplay - [HALOGENE’S NEWBIE CORNER](Halogenes_Newbie_Corner) - [Movement](Halogenes_Newbie_Corner#movement) - - [Bunny Hopping](Halogenes_Newbie_Corner#bunny hopping) - - [Laser Jumping](Halogenes_Newbie_Corner#laser jumping) - - [Wall Lasering](Halogenes_Newbie_Corner#wall lasering) - - [Ramp Jumping](Halogenes_Newbie_Corner#ramp jumping) + - [Bunny Hopping](Halogenes_Newbie_Corner#bunny-hopping) + - [Laser Jumping](Halogenes_Newbie_Corner#laser-jumping) + - [Wall Lasering](Halogenes_Newbie_Corner#wall-lasering) + - [Ramp Jumping](Halogenes_Newbie_Corner#ramp-jumping) - [Weapons](Halogenes_Newbie_Corner#weapons) - [Laser](Halogenes_Newbie_Corner#laser) - [Shotgun](Halogenes_Newbie_Corner#shotgun) @@ -40,23 +39,23 @@ Gameplay - [Crylink](Halogenes_Newbie_Corner#crylink) - [Nex](Halogenes_Newbie_Corner#nex) - [Hagar](Halogenes_Newbie_Corner#hagar) - - [Rocket Launcher](Halogenes_Newbie_Corner#rocket launcher) - - [Gameplay Tricks](Halogenes_Newbie_Corner#gameplay tricks) - - [Weapon Comboing](Halogenes_Newbie_Corner#weapon comboing) - - [Keyboard Setup](Halogenes_Newbie_Corner#keyboard setup) - - [Splash Damage Travels Through Walls](Halogenes_Newbie_Corner#splash damage travels through walls) - - [Stay Healthy](Halogenes_Newbie_Corner#stay healthy) + - [Rocket Launcher](Halogenes_Newbie_Corner#rocket-launcher) + - [Gameplay Tricks](Halogenes_Newbie_Corner#gameplay-tricks) + - [Weapon Comboing](Halogenes_Newbie_Corner#weapon-comboing) + - [Keyboard Setup](Halogenes_Newbie_Corner#keyboard-setup) + - [Splash Damage Travels Through Walls](Halogenes_Newbie_Corner#splash-damage-travels-through-walls) + - [Stay Healthy](Halogenes_Newbie_Corner#stay-healthy) - [Listen](Halogenes_Newbie_Corner#listen) - - [Console ABC](Halogenes_Newbie_Corner#console abc) - - [Optimizing Perception](Halogenes_Newbie_Corner#optimizing perception) + - [Console ABC](Halogenes_Newbie_Corner#console-abc) + - [Optimizing Perception](Halogenes_Newbie_Corner#optimizing-perception) - [Visuals](Halogenes_Newbie_Corner#visuals) - - [Damage Blur](Halogenes_Newbie_Corner#damage blur) - - [Field of View](Halogenes_Newbie_Corner#field of view) - - [Visible Players](Halogenes_Newbie_Corner#visible players) - - [Reducing Effects](Halogenes_Newbie_Corner#reducing effects) - - [Picmip and Simple Items](Halogenes_Newbie_Corner#picmip and simple items) + - [Damage Blur](Halogenes_Newbie_Corner#damage-blur) + - [Field of View](Halogenes_Newbie_Corner#field-of-view) + - [Visible Players](Halogenes_Newbie_Corner#visible-players) + - [Reducing Effects](Halogenes_Newbie_Corner#reducing-effects) + - [Picmip and Simple Items](Halogenes_Newbie_Corner#picmip-and-simple-items) - [Crosshair](Halogenes_Newbie_Corner#crosshair) - - [Fine Tuning](Halogenes_Newbie_Corner#fine tuning) + - [Fine Tuning](Halogenes_Newbie_Corner#fine-tuning) - [Audio](Halogenes_Newbie_Corner#audio) - Game Mechanics diff --git a/Logo.md b/Logo.md index a1c8a36..1c8a825 100644 --- a/Logo.md +++ b/Logo.md @@ -13,7 +13,7 @@ Original Concepts - [Source for current official logo](http://www.nullgaming.com/stuff/x/source) - [Spaceman](http://leela.org.uk/xonotic/index.htm) - Morphed [1](http://img688.imageshack.us/img688/2221/xonoticlogo9.jpg) [2](http://img708.imageshack.us/img708/8302/xonoticlogo8.jpg) [3](http://www.morphed.planetnexuiz.com/xonotich264v3.mp4) -- MirceaKitsune [1b](http://dev.xonotic.org/attachments/download/17/logo_idea_5.jpg) [1o](http://dev.xonotic.org/attachments/download/18/logo_idea_7.jpg) [2b](http://dev.xonotic.org/attachments/download/20/logo_idea_8.jpg) [2o](http://dev.xonotic.org/attachments/download/21/logo_idea_9.jpg) [3b](http://dev.xonotic.org/attachments/download/23/logo_idea_10.jpg) [3o](http://dev.xonotic.org/attachments/download/24/logo_idea_11.jpg) [1-2-3src](http://dev.xonotic.org/attachments/download/22/xonotic_logo1_mirceakitsune_v2.psd) +- MirceaKitsune [1b](assets/images/logo_idea_5.jpg) [1o](assets/images/logo_idea_7.jpg) [2b](assets/images/logo_idea_8.jpg) [2o](assets/images/logo_idea_9.jpg) [3b](assets/images/logo_idea_10.jpg) [3o](assets/images/logo_idea_11.jpg) [1-2-3src](assets/files/xonotic_logo1_mirceakitsune_v2.psd) - [XenoTheBlind](http://xeno.planetnexuiz.com/xeno/xonotic_logo_basic_svg_26.svg) - *[Logo vote](Logo_vote)* - *[Logo vote results](Logo_vote_results)* diff --git a/Logo_vote.md b/Logo_vote.md index e396e03..4f267ff 100644 --- a/Logo_vote.md +++ b/Logo_vote.md @@ -5,7 +5,7 @@ Candidates ---------- -z- - http://dev.xonotic.org/projects/xonotic/wiki/Concept_Art + [Concept_Art](Concept_Art) Dokujisan (with some of morphed’s on there too, like \#29) http://www.nullgaming.com/stuff/x/ @@ -18,12 +18,12 @@ Morphed http://www.morphed.planetnexuiz.com/xonotich264v3.mp4 MirceaKitsune - http://dev.xonotic.org/attachments/download/17/logo_idea_5.jpg (blue) - http://dev.xonotic.org/attachments/download/18/logo_idea_7.jpg (red) - http://dev.xonotic.org/attachments/download/20/logo_idea_8.jpg (blue nodetail) - http://dev.xonotic.org/attachments/download/21/logo_idea_9.jpg (red nodetail) - http://dev.xonotic.org/attachments/download/23/logo_idea_10.jpg (blue on red nodetail) - http://dev.xonotic.org/attachments/download/24/logo_idea_11.jpg (red on blue nodetail) + [logo_idea_5.jpg](assets/images/logo_idea_5.jpg) (blue) + [logo_idea_7.jpg](assets/images/logo_idea_7.jpg) (red) + [logo_idea_8.jpg](assets/images/logo_idea_8.jpg) (blue nodetail) + [logo_idea_9.jpg](assets/images/logo_idea_9.jpg) (red nodetail) + [logo_idea_10.jpg](assets/images/logo_idea_10.jpg) (blue on red nodetail) + [logo_idea_11.jpg](assets/images/logo_idea_11.jpg) (red on blue nodetail) Deiz http://deiz2.ath.cx/firebird.png @@ -77,7 +77,7 @@ morphs flamy one. Spaceman 1. Morphed xonoticlogo11.jpg 2. Dokujisan \#6 or \#7 -3. -z- http://dev.xonotic.org/attachments/15/xonotic_phoenix-1g.svg +3. -z- [xonotic_phoenix-1g.svg](assets/images/xonotic_phoenix-1g.svg) Oblivion 1. Doku \#28 @@ -99,11 +99,11 @@ I like Dokujisan’s logos and those using their exact design. From his list: lda17h: 1. http://img196.imageshack.us/img196/3679/xonoticlogo13.jpg 2. http://www.nullgaming.com/stuff/x/ \#9 -3. http://dev.xonotic.org/attachments/download/18/logo_idea_7.jpg +3. [logo_idea_7.jpg](assets/images/logo_idea_7.jpg) rabs 1. Doku \#28 http://www.nullgaming.com/stuff/x/xonotic_logo_idea28.jpg -2. -z- main picture at http://dev.xonotic.org/projects/xonotic/wiki/Concept_Art +2. -z- main picture at [Concept_Art](Concept_Art) 3. Doku \#7 http://www.nullgaming.com/stuff/x/xonotic_logo_idea9.jpg RoKenn diff --git a/Logo_vote_results.md b/Logo_vote_results.md index c7463b5..c0296ad 100644 --- a/Logo_vote_results.md +++ b/Logo_vote_results.md @@ -87,7 +87,7 @@ The cleaned and tidied votes **Spaceman** 1. Morphed xonoticlogo11.jpg 2. Dokujisan \#6 or \#7 -3. -Z- http://dev.xonotic.org/attachments/15/xonotic_phoenix-1g.svg +3. -Z- [xonotic_phoenix-1g.svg](assets/images/xonotic_phoenix-1g.svg) **Oblivion** 1. Doku \#28 @@ -107,11 +107,11 @@ The cleaned and tidied votes **lda17h** 1. http://img196.imageshack.us/img196/3679/xonoticlogo13.jpg 2. http://www.nullgaming.com/stuff/x/ \#9 -3. http://dev.xonotic.org/attachments/download/18/logo_idea_7.jpg +3. [logo_idea_7.jpg](assets/images/logo_idea_7.jpg) **rabs** 1. Doku \#28 http://www.nullgaming.com/stuff/x/xonotic_logo_idea28.jpg -2. -z- main picture at http://dev.xonotic.org/projects/xonotic/wiki/Concept_Art +2. -z- main picture at [Concept_Art](Concept_Art) 3. Doku \#7 http://www.nullgaming.com/stuff/x/xonotic_logo_idea9.jpg **RoKenn** diff --git a/NewQC.md b/NewQC.md index 6b33663..b2fd90d 100644 --- a/NewQC.md +++ b/NewQC.md @@ -3,7 +3,10 @@ New QC Syntax It is possible that at some point we decide to switch QC-compiler which requires some changes to the code. -**For more information see** http://dev.xonotic.org/projects/bocc +~~For more information see http://dev.xonotic.org/projects/bocc~~ + +(Update: Blub's bocc compiler didn't make it, but someone else came along, both devs [joined forces](https://github.com/graphitemaster/gmqcc/graphs/contributors) and brought us [GMQCC](https://graphitemaster.github.io/gmqcc/doc.html). + This is now the QuakeC compiler used by the Xonotic project.) Clean syntax: ------------- diff --git a/Organizational_Structure.md b/Organizational_Structure.md index 4b63039..9e6aafe 100644 --- a/Organizational_Structure.md +++ b/Organizational_Structure.md @@ -77,7 +77,7 @@ These coordination positions are time-consuming roles that require dedication, k Other Contributors ================== -See the [Development Home Page](http://dev.xonotic.org/projects/xonotic) for the most up-to-date list of contributors and supporters. +See the [Development Home Page](https://gitlab.com/xonotic) for the most up-to-date list of contributors and supporters. Needed Positions ---------------- diff --git a/Outdated_Compiling_In_Windows.md b/Outdated_Compiling_In_Windows.md index 5276c60..e198b67 100644 --- a/Outdated_Compiling_In_Windows.md +++ b/Outdated_Compiling_In_Windows.md @@ -51,9 +51,9 @@ Setting up the environment To run and compile Xonotic, the “all” script must be able to access msysGit from MSYS, as well as wget and unzip. The xonpatch bundle patches your MSYS installation to sort this out. -**Important**: if you have followed a previous version of this guide where the “profile” file had to be edited manually, download the original msys1.0.11 profile file from the attachments on this page (or from [this link](http://dev.xonotic.org/attachments/84/profile.zip)), and unzip it in `c:\msys\1.0\etc` before applying the xonpatch. +**Important**: if you have followed a previous version of this guide where the “profile” file had to be edited manually, download the original msys1.0.11 profile file from [this link](http://dev.xonotic.org/attachments/84/profile.zip), and unzip it in `c:\msys\1.0\etc` before applying the xonpatch. -The process is simple: download the latest xonpatch from the attachments (or from [this link](http://dev.xonotic.org/attachments/91/xonpatch_1-2.zip)), and extract it in `c:\msys\1.0`. Then launch `xonpatch.bat`. This will make msysGit visible from MSYS, and add wget as well as unzip. +The process is simple: download the latest xonpatch from [this link](http://dev.xonotic.org/attachments/91/xonpatch_1-2.zip), and extract it in `c:\msys\1.0`. Then launch `xonpatch.bat`. This will make msysGit visible from MSYS, and add wget as well as unzip. Compiling and running the game ------------------------------ diff --git a/Proposal_for_Board_of_Leaders_elections_draft.md b/Proposal_for_Board_of_Leaders_elections_draft.md index c2363d0..45e0f98 100644 --- a/Proposal_for_Board_of_Leaders_elections_draft.md +++ b/Proposal_for_Board_of_Leaders_elections_draft.md @@ -68,7 +68,7 @@ Board of Leaders can create other groups on demand with some special purpose. Ex Election process ---------------- -Voting is done by all those who are registered at development tracker at dev.xonotic.org Those supposedly are community members who help game development and have clues how inner game development is going on. Leaders are elected for 2 year terms and can be reelected again after their service time finished. If somebody leaves the board during the service time, new elections are made and elected person serves the remaining time until new elections. +Voting is done by all those who are registered at development tracker at dev.xonotic.org [Ed. Note: Now at https://gitlab.com/xonotic] Those supposedly are community members who help game development and have clues how inner game development is going on. Leaders are elected for 2 year terms and can be reelected again after their service time finished. If somebody leaves the board during the service time, new elections are made and elected person serves the remaining time until new elections. Votes are counted using Borda Count method: http://en.wikipedia.org/wiki/Borda_count For example, in an election for a leader position with 6 candidates, the rankings are scored as follows: diff --git a/Website.md b/Website.md index 6aa5868..a0024d4 100644 --- a/Website.md +++ b/Website.md @@ -89,7 +89,7 @@ Developer discussion of experimental fixes, changes, and improvements. ### Xonotic - Map Releases -(Locked section, with sticky thread which points people to dev.xonotic.org “How to report bugs”) +(Locked section, with sticky thread which points people to https://gitlab.com/xonotic/xonotic/wikis/home “How to report bugs”) ### Xonotic - Map Reviews diff --git a/assets/files/bbox_crouch_stand/bbox_crouch.blend b/assets/files/bbox_crouch_stand/bbox_crouch.blend new file mode 100644 index 0000000..3b3c4c2 Binary files /dev/null and b/assets/files/bbox_crouch_stand/bbox_crouch.blend differ diff --git a/assets/files/bbox_crouch_stand/bbox_standing.blend b/assets/files/bbox_crouch_stand/bbox_standing.blend new file mode 100644 index 0000000..6b2da6b Binary files /dev/null and b/assets/files/bbox_crouch_stand/bbox_standing.blend differ diff --git a/assets/files/xonotic_logo1_mirceakitsune_v2.psd b/assets/files/xonotic_logo1_mirceakitsune_v2.psd new file mode 100644 index 0000000..ee1f709 Binary files /dev/null and b/assets/files/xonotic_logo1_mirceakitsune_v2.psd differ diff --git a/assets/imagecrush.sh b/assets/imagecrush.sh new file mode 100755 index 0000000..0068880 --- /dev/null +++ b/assets/imagecrush.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# optimizing binary file size + +SRC_DIR="images-prep" +DST_DIR="images" +OLD_DIR="images-old" + + +SELF=`basename $0`; +if ! [ -f ./$SELF ]; then + echo "Cannot find myself." + exit 1 +fi +d=`pwd` +SELF="$d/$SELF" +cd $d + +mkdir -p ${OLD_DIR} + +cd ${SRC_DIR} +for image in `ls *.png`; do + pngcrush -oldtimestamp ${image} $d/${DST_DIR}/${image} #|| echo "error processing $image - fix it" && exit 1 + mv ${image} $d/${OLD_DIR}/${image} +done +for image in `ls *.jp*g`; do + jpegoptim --preserve -d $d/${DST_DIR}/ ${image} #|| echo "error processing $image - fix it" && exit 1 + mv ${image} $d/${OLD_DIR}/${image} +done +cd $d diff --git a/assets/images/benchmark.png b/assets/images/benchmark.png new file mode 100644 index 0000000..5c4ada4 Binary files /dev/null and b/assets/images/benchmark.png differ diff --git a/assets/images/git-1-components.png b/assets/images/git-1-components.png new file mode 100644 index 0000000..cf25317 Binary files /dev/null and b/assets/images/git-1-components.png differ diff --git a/assets/images/git-2-path.png b/assets/images/git-2-path.png new file mode 100644 index 0000000..84dcb28 Binary files /dev/null and b/assets/images/git-2-path.png differ diff --git a/assets/images/git-3-crlf.png b/assets/images/git-3-crlf.png new file mode 100644 index 0000000..f42b16c Binary files /dev/null and b/assets/images/git-3-crlf.png differ diff --git a/assets/images/logo_idea_10.jpg b/assets/images/logo_idea_10.jpg new file mode 100644 index 0000000..df3eee7 Binary files /dev/null and b/assets/images/logo_idea_10.jpg differ diff --git a/assets/images/logo_idea_11.jpg b/assets/images/logo_idea_11.jpg new file mode 100644 index 0000000..3c7dc22 Binary files /dev/null and b/assets/images/logo_idea_11.jpg differ diff --git a/assets/images/logo_idea_5.jpg b/assets/images/logo_idea_5.jpg new file mode 100644 index 0000000..f4b8a80 Binary files /dev/null and b/assets/images/logo_idea_5.jpg differ diff --git a/assets/images/logo_idea_7.jpg b/assets/images/logo_idea_7.jpg new file mode 100644 index 0000000..7d4d41b Binary files /dev/null and b/assets/images/logo_idea_7.jpg differ diff --git a/assets/images/logo_idea_8.jpg b/assets/images/logo_idea_8.jpg new file mode 100644 index 0000000..e19e29b Binary files /dev/null and b/assets/images/logo_idea_8.jpg differ diff --git a/assets/images/logo_idea_9.jpg b/assets/images/logo_idea_9.jpg new file mode 100644 index 0000000..7e976e3 Binary files /dev/null and b/assets/images/logo_idea_9.jpg differ diff --git a/assets/images/radiant_sections.png b/assets/images/radiant_sections.png new file mode 100644 index 0000000..c6e4079 Binary files /dev/null and b/assets/images/radiant_sections.png differ diff --git a/assets/images/radiant_sections_thumb.png b/assets/images/radiant_sections_thumb.png new file mode 100644 index 0000000..b45de37 Binary files /dev/null and b/assets/images/radiant_sections_thumb.png differ diff --git a/assets/images/xonotic_phoenix-1g.png b/assets/images/xonotic_phoenix-1g.png new file mode 100644 index 0000000..46e2df6 Binary files /dev/null and b/assets/images/xonotic_phoenix-1g.png differ diff --git a/assets/images/xonotic_phoenix-1g.svg b/assets/images/xonotic_phoenix-1g.svg new file mode 100644 index 0000000..b80883d --- /dev/null +++ b/assets/images/xonotic_phoenix-1g.svg @@ -0,0 +1,6524 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + Xonotic Phoenix Concept 1gGPL License (by -z-) + xon tic + + a + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +