reword

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

diff --git a/Home.md b/Home.md
index 93376e09ef5f9f78baeb885d47277bb876da58f3..f68a823ff7a636ab65a9f8dd484c27458793e462 100644 (file)
--- a/Home.md
+++ b/Home.md
@@ -14,8 +14,8 @@ Welcome to the Xonotic wiki. 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)
@@ -43,7 +43,7 @@ The following modes are available, although slightly less common than the above:
 
 -   [Arena](Arena) (removed)
 -   [Assault](Assault)
--   [Conquest](Conquest)
+-   [Invasion](Invasion)
 -   [Domination](Domination)
 -   [Last Man Standing](Last-Man-Standing)
 -   [Nexball](Nexball)
@@ -62,6 +62,7 @@ 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)
@@ -69,16 +70,23 @@ Mutators change the configuration of the game play, e.g. how weapon appears, whi
 -   [InstaGib](InstaGib)
 -   [NIX](NIX)
 -   [Dynamic handicap](dynamic-handicap)
+-   [New Toys](new-toys)
 
 ### [Special Servers](Special-Servers)
 
 ### [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)
@@ -94,12 +102,16 @@ Mutators change the configuration of the game play, e.g. how weapon appears, whi
 -   [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)
-
-### Map hosting
+-   [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)
 
+### External Tools
+-   [Xonotic Map Manager](https://github.com/z/xonotic-map-manager)
+-   [Xonotic Server Management Suite](https://github.com/z/xonotic-server-management-suite)
 
 ## Development
 
@@ -113,11 +125,11 @@ Mutators change the configuration of the game play, e.g. how weapon appears, whi
 -   [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)
@@ -128,29 +140,20 @@ Mutators change the configuration of the game play, e.g. how weapon appears, whi
 -   [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)
 
 ### 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)
@@ -160,8 +163,7 @@ Mutators change the configuration of the game play, e.g. how weapon appears, whi
     -   [Tech Conglomerate](Tech-Conglomerate)
 
 
-## References
+## Misc
 
--   [Git repo structure](Git)
 -   [Archive](Archive)
 -   [Gitlab Markdown Reference](https://gitlab.com/help/user/markdown.md) (for editing this wiki)