X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Wiki.textile;h=cfcf496bd250a4727929a60cbe1003aa7ed2fef4;hb=ff735ac08f8f164bf3522f29ddaf6b778001f1ba;hp=48b36e2e5c0d4f4f0dc5eba4576aa38eb57206ec;hpb=f290e7dd56f2b0e4690d4e5386c3880213a176f2;p=xonotic%2Fxonotic.wiki.git

diff --git a/Wiki.textile b/Wiki.textile
index 48b36e2..cfcf496 100644
--- a/Wiki.textile
+++ b/Wiki.textile
@@ -1,55 +1,107 @@
 h1. Xonotic Wiki
 
+{{>toc}}
+
 This is a wiki / development system where we can gather information for the future of this project.
 
 h2. Project
 
 * [[Faq|Frequently Asked Questions]] 
-* [[Pr|Public-Relations]] 
-* Our public [[Announcement]] drafts
-** [[Announcement vote]]
-** [[Announcement vote results|Vote results]]
-** [[Announcement script|In-game announcement script]]
+* [[Pr|Public Relations]] 
 * Check out our [[plan|Project Plan]] so far
-* Notes from brainstorming [[names|ideas for names]]
-* Here is the [[Irclog|IRC Log]] (warning: it's very long)
-* New names for weapons [[NamesWeapons|discussion]]
-* [[Organizational Structure]] (still being defined)
+* [[Organizational Structure]]
 * [[Roles|Roles and Skills]] of contributing community members
-* [[Repository Access]]
-* [[Xonotic compatibility pack]] a small pk3 that will rebrand a default Nexuiz install
 * [[IRC]] channels
-* [[Website]] Plannning
-* "Roadmap to v1":http://dev.xonotic.org/versions/show/3
 * [[Community development]] planning
+* [[Legal|Licensing / Legal]]
+* [[Announcements]]
+* "Roadmap to v1":http://dev.xonotic.org/versions/show/3
+* [[Repository Access]] _(see also [[Git]] and [[Compiling in Windows]])_
+* [[Website]] Plannning
+* [[Xonotic compatibility pack]] a small pk3 that will rebrand a default Nexuiz install
+* Notes from brainstorming [[names|ideas for names]]
+
+h2. Gameplay
+
+* Game Mechanics
+** [[Weapons]]
+** [[Players]]
+** [[Items]]
+
+* Gamemodes
+** [[Deathmatch]]
+*** [[1v1_Duel|1v1 Duel]]
+** [[Last Man Standing]]
+** [[Arena]]
+** [[Keepaway]]
+** [[Race]]
+** [[Race CTS]]
+** [[Team Deathmatch]]
+** [[Capture the Flag]]
+** [[Clan Arena]]
+** [[Freeze Tag]]
+** [[Domination]]
+** [[Key Hunt]]
+** [[Assault]]
+** [[Onslaught]]
+** [[Nexball]]
+
+
+* Mutators
+** [[Dodging]]
+** [[Midair]]
+** [[Vampire]]
+** [[Blood Loss]]
+** [[Low Gravity]]
+** [[Cloak]]
+** [[Relics]]
+** [[Weapon Arena]]
+** [[Grappling Hook]]
+** [[Jet Pack]]
+** [[Rocket Flying]]
+** [[Pinata]]
+** [[Weapons Stay]]
+** [[MinstaGib]]
+** [[NIX]]
 
 h2. Art & Media 
 
-* Logo proposals
-** -z- [[Concept Art]]
-** "Dokujisan":http://www.nullgaming.com/stuff/x/
-** "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
-** "XenoTheBlind":http://xeno.planetnexuiz.com/xeno/xonotic_logo_basic_svg_26.svg
-** _[[Logo vote]]_
-** _[[Logo vote results]]_
+* [[Art Roadmap]]
+* [[Artistic Style]]
+* [[Logo|Xonotic Logo]]
 * [[Maps Makeover]]
+* [[Weapons Makeover]]
+** [[NamesWeapons|New weapon names discussion]]
 * [[2d art]]
-* [[Sound FX and music]]
+* [[Music]]
+** [[Music contributions]]
+* [[Sound FX]]
+** [[Sound FX contributions]]
+* Story Themes
+** [[Close to home]]
+** [[Tech Conglomerate]]
 
-h2. References
+h2. Additional Engine References
+
+* [[Darkplaces Parameters]]
+
+h2. Editing
+
+In this section you will find helpful information about editing Xonotic in general, let that be coding, texturing, modeling, mapping, etc
 
 * Programming
 ** [[Introduction to QuakeC]]
 ** "DarkPlaces Wiki":http://dpwiki.slipgateconstruct.com/
 ** "QuakeC Specifications v1.0":http://www.gamers.org/dEngine/quake/spec/quake-spec34/qc-menu.htm
 ** "QuakeC tutorials":http://www.inside3d.com/tutorials.php at inside3d.com
+** [[NewQC]] - Possible changes regarding QC (compiler, syntax, ...)
 
-* Modeling
+* [[Modeling]]
 ** [[Textures|Textures know-how]]
+** [[Normal Maps|Normal Maps know-how]]
 ** [[Polycounts|Polygon count]] on Weapons and Models
-** [[framegroups|.framegroups]] file (allow self playing animations) know-how 
+** [[framegroups|.framegroups]] file (allow self playing animations) know-how
+** [[Voices and sounds|.sounds]] file (player model sounds) know-how 
 ** [[dpmodel|How to compile dpm models]]
 ** "Q3A Shader Manual":http://toolz.nexuizninjaz.com/shader/
 ** How to get an animated mesh from [[Blender to DPM]]
@@ -65,17 +117,16 @@ h2. References
 
 * Configuration
 ** [[democapture|Capturing video clips and using the demo camera]]
+** [[Git]]
 
+* [[Mapping]]
+** [[Creating Maps]]
+** [[Mapper resources]]
+** "Map naming convention":http://alientrap.org/forum/viewtopic.php?f=2&t=2363&sid=4f8a9e06ada52255e98bdfa744ec6beb#p27330
 
-h2. Editing
 
-In this section you'll find lots of helpful information about editing Xonotic in general, let that be coding, texturing, modeling, mapping
+h2. References
 
-* [[Coding]] QuakeC, CSQC
-* [[Modeling]]
-* [[Mapping]]
 * [[Git]]
-
-h2. Misc
-
+* "Redmine Wiki formatting":http://www.redmine.org/wiki/1/RedmineTextFormatting
 * [[Forbidden disposable e-mail providers]]