]> de.git.xonotic.org Git - xonotic/xonotic.wiki.git/blobdiff - Home.md
reword
[xonotic/xonotic.wiki.git] / Home.md
diff --git a/Home.md b/Home.md
index e6d8adf12f85abd3a23f7e1971e9acae33ca0c97..f68a823ff7a636ab65a9f8dd484c27458793e462 100644 (file)
--- a/Home.md
+++ b/Home.md
@@ -1,15 +1,12 @@
 # Xonotic Wiki
 
-Welcome to the official Xonotic wiki.
+Welcome to the Xonotic wiki. If you wish to contribute, see [Editing](Editing).
 
-If you wish to contribute, see [Editing](Editing).
-
-## Documentation, Communication and Social Networks
--      [Official Website](http://xonotic.org)
-       -       [Official Forums](http://forums.xonotic.org) are a lively place for Xonotic players to discuss anything.
-       -       [Xonotic game stats](http://stats.xonotic.org/) shows useful statistics information about servers, players, scores, maps, etc.
--      You are looking at the [official wiki](https://gitlab.com/xonotic/xonotic/wikis/home).
+-      You are looking at the [official wiki](https://gitlab.com/xonotic/xonotic/wikis/home) or its [mirror](https://github.com/xonotic/xonotic/wiki).
        -       [Unofficial wiki](http://xonotic.wikia.com/wiki/Xonotic_Wiki) may contain dated but still helpful information.
+-      [Website](http://xonotic.org)
+       -       [Forums](http://forums.xonotic.org) are a lively place for Xonotic players to discuss anything.
+       -       [Xonotic game stats](http://stats.xonotic.org/) show useful statistics information about servers, players, scores, maps, etc.
 -      [IRC channels](Channels) are where most players ask/answer questions, exchange ideas, organize game events, etc. in **real time**. You can even chat with players in the game.
 -      [Facebook](https://www.facebook.com/xonotic/)
 -      [Twitter](https://twitter.com/xonotic)
@@ -17,8 +14,8 @@ If you wish to contribute, see [Editing](Editing).
 ## Gameplay
 
 ### Tutorials
-- [HALOGENE’S NEWBIE CORNER](Halogenes_Newbie_Corner) has rich information for beginners. **Must read!** You will enjoy the game more!
-- [Overkill Tutorial](Overkill-Tutorial)
+- [HALOGENE’S NEWBIE CORNER](https://xonotic.org/guide/) has rich information for beginners. **Must read!** You will enjoy the game more!
+- [Overkill Tutorial](https://xonotic.org/okguide/)
 
 ### Game Mechanics
 -   [Maps](Maps)
@@ -27,9 +24,7 @@ If you wish to contribute, see [Editing](Editing).
 -   [Vehicles](Vehicles)
 -   [Weapons](Weapons)
 
-### Game Modes/Types/Mutators/Mods and Special Servers
-
-#### Game Modes (or Game Types)
+### Game Modes (or Game Types)
 In Xonotic, game modes and game types mean the same thing -- different modes/types have different goals to achieve in a game.
 
 The following modes are more popular ones:
@@ -46,18 +41,17 @@ The following modes are more popular ones:
 
 The following modes are available, although slightly less common than the above:
 
--   [Arena](Arena)
+-   [Arena](Arena) (removed)
 -   [Assault](Assault)
--   [Conquest](Conquest)
+-   [Invasion](Invasion)
 -   [Domination](Domination)
 -   [Last Man Standing](Last-Man-Standing)
 -   [Nexball](Nexball)
 -   [Onslaught](Onslaught)
 -   [Race](Race)
--   [Runematch](Rune)
 
-#### Standard Mutators
-Mutators change the configuration of the game play, e.g. how weapon appears, which special weapons are availabale, or the physics in the game. This is usually set by the game admins who set up games for other players.  Standard Mutators are available in the game menu.
+### Standard Mutators
+Mutators change the configuration of the game play, e.g. how weapon appears, which special weapons are availabale, or the physics in the game. This is usually set by the game admins who set up games for other players. Standard Mutators are available in the game menu.
 
 -   [Dodging](Dodging)
 -   [Midair](Midair)
@@ -68,60 +62,74 @@ Mutators change the configuration of the game play, e.g. how weapon appears, whi
 -   [Relics](Relics)
 -   [Weapon Arena](Weapon-Arena)
 -   [Grappling Hook](Grappling-Hook)
+-   [Offhand blaster](Offhand-blaster)
 -   [Jet Pack](Jet-Pack)
 -   [Rocket Flying](Rocket-Flying)
 -   [Pinata](Pinata)
 -   [Weapons Stay](Weapons-Stay)
 -   [InstaGib](InstaGib)
 -   [NIX](NIX)
+-   [Dynamic handicap](dynamic-handicap)
+-   [New Toys](new-toys)
+
+### [Special Servers](Special-Servers)
 
-#### [Special Servers](Special-Servers)
+### [Mods](Mods)
 
-#### [Mods](Mods)
+### Unofficial Web-based Server Lists
+-   [dpmaster.deathmask.net](http://dpmaster.deathmask.net/?game=xonotic) - one of the 2 master servers, doesn't always have all servers but the other one doesn't have a web interface
+-   [arena.sh/xo](https://arena.sh/xo/)
+-   [xonotic.lifeisabug.com](https://xonotic.lifeisabug.com/)
 
 ### Misc
+-   [Autobuilds](Autobuilds)
+-   [Privacy and Security](privacy-and-security)
+-   [Handicap](handicap)
 -   [Camera for demos explained](Demo-Camera)
+-   [Capturing video clips and using the demo camera](Democapture)
 -   [Xonotic Bot Orchestra](Xonotic-Bot-Orchestra)
 -   [Impulse map](impulse-map)
+-   [Hardware Requirements](Hardware-Requirements)
 
 
-## The Software
--   [Repository Access](Repository_Access) (how to compile from git) (see also [Git repo structure](Git))
--   [Privacy and Security](privacy-and-security)
--   [Hardware Requirements](Hardware-Requirements)
+## Server Administration
+### Tutorials
+-   [Local test server on GNU/Linux](local-test-server-on-gnu-linux)
 
-## Arts & Media
--   [Art Roadmap](Art-Roadmap)
--   [Artistic Style](Artistic-Style)
--   [Xonotic Logo](Logo)
--   [Maps Makeover](Maps-Makeover)
--   [Weapons Makeover](Weapons-Makeover)
-    -   [New weapon names discussion](NamesWeapons)
--   [2d art](2d art)
--   [Music](Music)
-    -   [Music contributions](Music-contributions)
--   [Sound FX](Sound-FX)
-    -   [Sound FX contributions](Sound-FX-contributions)
--   Story Themes
-    -   [Close to home](Close-to-home)
-    -   [Tech Conglomerate](Tech-Conglomerate)
+### Configuration
+-   [Basic server configuration](basic-server-configuration)
+-   [Custom server votes](custom-server-votes)
+-   [Custom user directory](custom-user-directory)
+-   [The `info` command](https://forums.xonotic.org/showthread.php?tid=7474&pid=81277#pid81277)
+-   [Random start weapons](Random-start-weapons)
+-   [Automatic map downloads](Automatic-map-downloads)
+-   [Event logging](Event-logging)
+-   [Score logging](Score-logging)
 
+### Troubleshooting
+-   [Performance](https://forums.xonotic.org/showthread.php?tid=7374&pid=80938#pid80938)
 
-## Editing
+### External Tools
+-   [Xonotic Map Manager](https://github.com/z/xonotic-map-manager)
+-   [Xonotic Server Management Suite](https://github.com/z/xonotic-server-management-suite)
 
-In this section you will find helpful information about editing Xonotic in general, let that be coding, texturing, modeling, mapping, etc
+## Development
+
+-   [Repository Access](Repository_Access) (how to compile from git) (see also [Git repo structure](Git))
+-   [Licensing / Legal](Legal)
 
 ### Programming
 -   [Introduction to QuakeC](Introduction-to-QuakeC)
--   [DarkPlaces Wiki](index)
+-   [DarkPlaces Wiki](DarkPlaces-Index)
 -   [QuakeC Specifications v1.0](QuakeC-Wiki)
 -   [QuakeC tutorials](http://www.inside3d.com/tutorials.php) at inside3d.com
 -   [NewQC](NewQC) - Possible changes regarding QC (compiler, syntax, …)
+-   [Writing your first mutator](writing-your-first-mutator)
+-   [Tips for new developers](Programming-Tips)
 
 ### [Modeling](Modeling)
 -   [Textures know-how](Textures)
 -   [Normal Maps know-how](Normal-Maps)
--   [Polygon count](Polycounts) on Weapons and Models
 -   [.framegroups](framegroups) file (allow self playing animations) know-how
 -   [.sounds](Voices-and-sounds) file (player model sounds) know-how
 -   [How to compile dpm models](dpmodel)
@@ -132,44 +140,30 @@ In this section you will find helpful information about editing Xonotic in gener
 -   [Blender to IQM](Blender-to-IQM)
 
 ### Texturing
--   Tutorials [1](http://www.cgtextures.com/content.php?action=tutorials)
--   [Recovering detailed normals from photo textures](http://www.cgtextures.com/content.php?action=tutorial&name=normalmap)
+-   [Tutorial](https://web.archive.org/web/20140328060504/http://www.cgtextures.com/content.php?action=tutorials)
+-   [Recovering detailed normals from photo textures](https://web.archive.org/web/20140730154028/http://www.cgtextures.com/content.php?action=tutorial&name=normalmap)
 -   [Hard Surface Texture Painting](http://forums.cgsociety.org/showthread.php?t=373024)
 -   Some [tips](http://forums.xonotic.org/showthread.php?tid=63&pid=445#pid445) by *FruitieX*
 -   [Q3A Shader Manual](http://toolz.nexuizninjaz.com/shader/)
 
-### Configuration
--   [Capturing video clips and using the demo camera](Democapture)
--   [Git](Git)
-
 ### [Mapping](Mapping)
 -   [Creating Maps](Creating-Maps)
 -   [Mapper resources](Mapper-resources)
--   [Map naming convention](http://alientrap.org/forum/viewtopic.php?f=2&t=2363&sid=4f8a9e06ada52255e98bdfa744ec6beb#p27330)
-
-## Project
-
-### Team, Community, and Public Relations
--   [Organizational Structure](Organizational-Structure)
--   [Roles and Skills](Roles) of contributing community members
--   [Community development](Community-development) planning
--   [Public Relations](Pr)
 
-### Plans
--   Check out our [Project Plan](Plan) so far
--   [Website planning](Website)
--   Notes from brainstorming [ideas for names](names)
--   [Xonotic compatibility pack](Xonotic-compatibility-pack) a small pk3 that will rebrand a default Nexuiz install
-
-## Nexuiz-related
+### Arts & Media
+-   [Artistic Style](Artistic-Style)
+-   [Xonotic Logo](Logo)
+-   [Weapons Makeover](Weapons-Makeover)
+-   [Music](Music)
+    -   [Music contributions](Music-contributions)
+-   [Sound FX](Sound-FX)
+    -   [Sound FX contributions](Sound-FX-contributions)
+-   Story Themes
+    -   [Close to home](Close-to-home)
+    -   [Tech Conglomerate](Tech-Conglomerate)
 
-### General Info
--   [Licensing / Legal](Legal)
--   [Announcements](Announcements)
--   [About Xonotic and Nexuiz](Faq)
 
-## References
+## Misc
 
--   [Git repo structure](Git)
--   [Forbidden disposable e-mail providers](Forbidden-disposable-email-providers)
--   [Gitlab Markdown Reference](https://gitlab.com/help/markdown/markdown.md) (for editing this wiki)
+-   [Archive](Archive)
+-   [Gitlab Markdown Reference](https://gitlab.com/help/user/markdown.md) (for editing this wiki)