From 22b7a638c3c53bbe50c72f04ac2ba3aa04124c25 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sun, 17 May 2015 15:46:12 +1000 Subject: [PATCH] Restructure --- Announcements.md | 8 +- .../Compiling_In_Windows.md | 0 .../Outdated_Compiling_In_Windows.md | 0 Music.md => Audio/Music.md | 2 +- .../Music_contributions.md | 0 Sound_FX.md => Audio/Sound_FX.md | 0 .../Sound_FX_contributions.md | 0 Capture_the_Flag.md | 39 ------ DarkPlaces_QC_Tutorials.md | 10 -- .../Authors.md | 0 DarkPlaces_CSQC.md => Darkplaces/CSQC.md | 0 DarkPlaces_CVars.md => Darkplaces/CVars.md | 0 .../Commands.md | 0 .../Effectinfo.md | 0 .../Extensions.md | 0 .../Features.md | 6 +- .../Materials.md | 0 .../Modeling.md | 0 .../Parameters.md | 0 .../index.md | 21 ++- Arena.md => Gamemodes/Arena.md | 0 Assault.md => Gamemodes/Assault.md | 4 +- .../Capture_the_Flag.md | 49 ++++++- Clan_Arena.md => Gamemodes/Clan_Arena.md | 2 +- Deathmatch.md => Gamemodes/Deathmatch.md | 3 +- Domination.md => Gamemodes/Domination.md | 0 1v1_Duel.md => Gamemodes/Duel.md | 0 Freeze_Tag.md => Gamemodes/Freeze_Tag.md | 7 +- Keepaway.md => Gamemodes/Keepaway.md | 2 +- Key_Hunt.md => Gamemodes/Key_Hunt.md | 5 +- .../Last_Man_Standing.md | 4 +- Nexball.md => Gamemodes/Nexball.md | 0 Onslaught.md => Gamemodes/Onslaught.md | 0 Race.md => Gamemodes/Race.md | 0 Race_CTS.md => Gamemodes/Race_CTS.md | 2 +- Rune.md => Gamemodes/Rune.md | 0 .../Team_Deathmatch.md | 5 +- Halogenes_Newbie_Corner.markdown | 4 +- Home.markdown | 126 +++++++++--------- Introduction.md | 2 - .../Basic_mapping_in_Radiant.md | 0 ...omplete_list_of_command_line_parameters.md | 0 .../Complete_list_of_entity_keys.md | 0 .../Complete_list_of_shader_keywords.md | 0 Creating_Maps.md => Mapping/Creating_Maps.md | 0 .../Creation_de_cartes.md | 0 Hinting.md => Mapping/Hinting.md | 0 Lighting.md => Mapping/Lighting.md | 0 .../Mapper_resources.md | 0 .../Mapping-FirstRoom.md | 0 .../Mapping-Introduction.md | 0 .../Mapping-NetRadiant.md | 0 Mapping-Setup.md => Mapping/Mapping-Setup.md | 0 .../Mapping-entity-func_button.md | 0 .../Mapping-textures-skybox-blender.md | 0 Mapping.md => Mapping/Mapping.md | 0 Netradiant.md => Mapping/Netradiant.md | 0 .../Old_Creating_Maps.md | 0 WarpZones.md => Mapping/WarpZones.md | 0 .../Blender_to_IQM.md | 0 .../Blender_to_dpm.md | 0 Dpmodel.md => Modeling/Dpmodel.md | 0 Framegroups.md => Modeling/Framegroups.md | 0 Modelling.md => Modeling/Modelling.md | 0 Normal_Maps.md => Modeling/Normal_Maps.md | 0 .../Player_Model_Spec.md | 0 Textures.md => Modeling/Textures.md | 0 Weaponsystem.md => Modeling/Weaponsystem.md | 0 .../Grappling_Hook.md | 11 +- MinstaGib.md => Mutators/InstaGib.md | 8 +- Relics.md => Mutators/Relics.md | 0 .../Announcement/Announcement.md | 0 .../Announcement/Announcement_script.md | 0 .../Announcement/Announcement_vote.md | 0 .../Announcement/Announcement_vote_results.md | 0 .../Announcement/Before_Announcement.md | 0 Bot.md => Planning/Bot.md | 0 Concept_Art.md => Planning/Concept_Art.md | 0 Irclog.md => Planning/Irclog.md | 0 Logo.md => Planning/Logo/Logo.md | 0 Logo_vote.md => Planning/Logo/Logo_vote.md | 0 .../Logo/Logo_vote_results.md | 0 Maps_Makeover.md => Planning/Maps_Makeover.md | 0 Names.md => Planning/Names.md | 0 NamesWeapons.md => Planning/NamesWeapons.md | 0 ...al_for_Board_of_Leaders_elections_draft.md | 0 .../Themes/Close_to_home.md | 0 .../Themes/Tech_Conglomerate.md | 0 .../Themes/Tech_Conglomerate_Script.md | 0 .../Weapons_Makeover.md | 0 Website.md => Planning/Website.md | 0 Powerups.md | 13 ++ .../Introduction_to_QuakeC.md | 0 NewQC.md => QuakeC/NewQC.md | 0 QuakeC_Wiki.md => QuakeC/QuakeC_Wiki.md | 0 Demo_Camera.md => Recording/Demo_Camera.md | 0 .../Democapture.md | 0 Shield.md | 5 - Strength.md | 5 - _Footer.md | 7 +- _Sidebar.md | 4 +- 101 files changed, 181 insertions(+), 173 deletions(-) rename Compiling_In_Windows.md => Archive/Compiling_In_Windows.md (100%) rename Outdated_Compiling_In_Windows.md => Archive/Outdated_Compiling_In_Windows.md (100%) rename Music.md => Audio/Music.md (99%) rename Music_contributions.md => Audio/Music_contributions.md (100%) rename Sound_FX.md => Audio/Sound_FX.md (100%) rename Sound_FX_contributions.md => Audio/Sound_FX_contributions.md (100%) delete mode 100644 Capture_the_Flag.md delete mode 100644 DarkPlaces_QC_Tutorials.md rename DarkPlaces_Authors.md => Darkplaces/Authors.md (100%) rename DarkPlaces_CSQC.md => Darkplaces/CSQC.md (100%) rename DarkPlaces_CVars.md => Darkplaces/CVars.md (100%) rename DarkPlaces_Commands.md => Darkplaces/Commands.md (100%) rename DarkPlaces_Effectinfo.md => Darkplaces/Effectinfo.md (100%) rename DarkPlaces_Extensions.md => Darkplaces/Extensions.md (100%) rename DarkPlaces_Features.md => Darkplaces/Features.md (79%) rename DarkPlaces_Materials.md => Darkplaces/Materials.md (100%) rename DarkPlaces_Modeling.md => Darkplaces/Modeling.md (100%) rename Darkplaces_Parameters.md => Darkplaces/Parameters.md (100%) rename DarkPlaces_Wiki.markdown => Darkplaces/index.md (71%) rename Arena.md => Gamemodes/Arena.md (100%) rename Assault.md => Gamemodes/Assault.md (87%) rename CTF_-_Capture_the_flag.md => Gamemodes/Capture_the_Flag.md (56%) rename Clan_Arena.md => Gamemodes/Clan_Arena.md (82%) rename Deathmatch.md => Gamemodes/Deathmatch.md (90%) rename Domination.md => Gamemodes/Domination.md (100%) rename 1v1_Duel.md => Gamemodes/Duel.md (100%) rename Freeze_Tag.md => Gamemodes/Freeze_Tag.md (74%) rename Keepaway.md => Gamemodes/Keepaway.md (89%) rename Key_Hunt.md => Gamemodes/Key_Hunt.md (83%) rename Last_Man_Standing.md => Gamemodes/Last_Man_Standing.md (53%) rename Nexball.md => Gamemodes/Nexball.md (100%) rename Onslaught.md => Gamemodes/Onslaught.md (100%) rename Race.md => Gamemodes/Race.md (100%) rename Race_CTS.md => Gamemodes/Race_CTS.md (93%) rename Rune.md => Gamemodes/Rune.md (100%) rename Team_Deathmatch.md => Gamemodes/Team_Deathmatch.md (84%) delete mode 100644 Introduction.md rename Basic_mapping_in_Radiant.md => Mapping/Basic_mapping_in_Radiant.md (100%) rename Complete_list_of_command_line_parameters.md => Mapping/Complete_list_of_command_line_parameters.md (100%) rename Complete_list_of_entity_keys.md => Mapping/Complete_list_of_entity_keys.md (100%) rename Complete_list_of_shader_keywords.md => Mapping/Complete_list_of_shader_keywords.md (100%) rename Creating_Maps.md => Mapping/Creating_Maps.md (100%) rename Creation_de_cartes.md => Mapping/Creation_de_cartes.md (100%) rename Hinting.md => Mapping/Hinting.md (100%) rename Lighting.md => Mapping/Lighting.md (100%) rename Mapper_resources.md => Mapping/Mapper_resources.md (100%) rename Mapping-FirstRoom.md => Mapping/Mapping-FirstRoom.md (100%) rename Mapping-Introduction.md => Mapping/Mapping-Introduction.md (100%) rename Mapping-NetRadiant.md => Mapping/Mapping-NetRadiant.md (100%) rename Mapping-Setup.md => Mapping/Mapping-Setup.md (100%) rename Mapping-entity-func_button.md => Mapping/Mapping-entity-func_button.md (100%) rename Mapping-textures-skybox-blender.md => Mapping/Mapping-textures-skybox-blender.md (100%) rename Mapping.md => Mapping/Mapping.md (100%) rename Netradiant.md => Mapping/Netradiant.md (100%) rename Old_Creating_Maps.md => Mapping/Old_Creating_Maps.md (100%) rename WarpZones.md => Mapping/WarpZones.md (100%) rename Blender_to_IQM.md => Modeling/Blender_to_IQM.md (100%) rename Blender_to_dpm.md => Modeling/Blender_to_dpm.md (100%) rename Dpmodel.md => Modeling/Dpmodel.md (100%) rename Framegroups.md => Modeling/Framegroups.md (100%) rename Modelling.md => Modeling/Modelling.md (100%) rename Normal_Maps.md => Modeling/Normal_Maps.md (100%) rename Player_Model_Spec.md => Modeling/Player_Model_Spec.md (100%) rename Textures.md => Modeling/Textures.md (100%) rename Weaponsystem.md => Modeling/Weaponsystem.md (100%) rename Grappling_Hook.md => Mutators/Grappling_Hook.md (52%) rename MinstaGib.md => Mutators/InstaGib.md (51%) rename Relics.md => Mutators/Relics.md (100%) rename Announcement.md => Planning/Announcement/Announcement.md (100%) rename Announcement_script.md => Planning/Announcement/Announcement_script.md (100%) rename Announcement_vote.md => Planning/Announcement/Announcement_vote.md (100%) rename Announcement_vote_results.md => Planning/Announcement/Announcement_vote_results.md (100%) rename Before_Announcement.md => Planning/Announcement/Before_Announcement.md (100%) rename Bot.md => Planning/Bot.md (100%) rename Concept_Art.md => Planning/Concept_Art.md (100%) rename Irclog.md => Planning/Irclog.md (100%) rename Logo.md => Planning/Logo/Logo.md (100%) rename Logo_vote.md => Planning/Logo/Logo_vote.md (100%) rename Logo_vote_results.md => Planning/Logo/Logo_vote_results.md (100%) rename Maps_Makeover.md => Planning/Maps_Makeover.md (100%) rename Names.md => Planning/Names.md (100%) rename NamesWeapons.md => Planning/NamesWeapons.md (100%) rename Proposal_for_Board_of_Leaders_elections_draft.md => Planning/Proposal_for_Board_of_Leaders_elections_draft.md (100%) rename Close_to_home.md => Planning/Themes/Close_to_home.md (100%) rename Tech_Conglomerate.md => Planning/Themes/Tech_Conglomerate.md (100%) rename Tech_Conglomerate_Script.md => Planning/Themes/Tech_Conglomerate_Script.md (100%) rename Weapons_Makeover.md => Planning/Weapons_Makeover.md (100%) rename Website.md => Planning/Website.md (100%) create mode 100644 Powerups.md rename Introduction_to_QuakeC.markdown => QuakeC/Introduction_to_QuakeC.md (100%) rename NewQC.md => QuakeC/NewQC.md (100%) rename QuakeC_Wiki.md => QuakeC/QuakeC_Wiki.md (100%) rename Demo_Camera.md => Recording/Demo_Camera.md (100%) rename Democapture.markdown => Recording/Democapture.md (100%) delete mode 100644 Shield.md delete mode 100644 Strength.md diff --git a/Announcements.md b/Announcements.md index 8808cc2..cb706f6 100644 --- a/Announcements.md +++ b/Announcements.md @@ -4,8 +4,8 @@ Announcements First Public announcement ------------------------- -- [Announcement](Announcement) drafts -- [Announcement vote](Announcement_vote) -- [Vote results](Announcement_vote_results) -- [In-game announcement script](Announcement_script) +- [Announcement drafts](Planning/Announcement/Announcement) +- [Announcement vote](Planning/Announcement/Announcement_vote) +- [Vote results](Planning/Announcement/Announcement_vote_results) +- [In-game announcement script](Planning/Announcement/Announcement_script) diff --git a/Compiling_In_Windows.md b/Archive/Compiling_In_Windows.md similarity index 100% rename from Compiling_In_Windows.md rename to Archive/Compiling_In_Windows.md diff --git a/Outdated_Compiling_In_Windows.md b/Archive/Outdated_Compiling_In_Windows.md similarity index 100% rename from Outdated_Compiling_In_Windows.md rename to Archive/Outdated_Compiling_In_Windows.md diff --git a/Music.md b/Audio/Music.md similarity index 99% rename from Music.md rename to Audio/Music.md index c362b53..7f0650e 100644 --- a/Music.md +++ b/Audio/Music.md @@ -60,7 +60,7 @@ Links ----- - Licensing - - Our [Legal](Legal) wiki page + - Our [Legal](../Legal) wiki page - http://wiki.creativecommons.org/GarageBand - Tools - OpenMPT http://www.lpchip.com/modplug diff --git a/Music_contributions.md b/Audio/Music_contributions.md similarity index 100% rename from Music_contributions.md rename to Audio/Music_contributions.md diff --git a/Sound_FX.md b/Audio/Sound_FX.md similarity index 100% rename from Sound_FX.md rename to Audio/Sound_FX.md diff --git a/Sound_FX_contributions.md b/Audio/Sound_FX_contributions.md similarity index 100% rename from Sound_FX_contributions.md rename to Audio/Sound_FX_contributions.md diff --git a/Capture_the_Flag.md b/Capture_the_Flag.md deleted file mode 100644 index 52999c6..0000000 --- a/Capture_the_Flag.md +++ /dev/null @@ -1,39 +0,0 @@ -Capture The Flag (CTF) -====================== - -[![](http://pics.nexuizninjaz.com/images/zh1xq7e8jbjjwxk6ggh.jpg)](http://pics.nexuizninjaz.com/images/r9bwz58b2dli06rrqdsx.jpg) -[![](http://pics.nexuizninjaz.com/images/hm0x93hvbm1npbecvi30.jpg)](http://pics.nexuizninjaz.com/images/r9d27gmnj4kv5piexh6t.jpg) -*Click for bigger pictures* - -Object of the Game ------------------- - -In CTF there are 2 teams (red & blue), while each team got a base with their flag. The goal is to steal the other teams’ flag and bring it to your own to capture it. That’s only possible if your own flag is in your base and not taken by the other team. Usually a team needs 10 captures (caps) to win a map. - -![](http://pics.nexuizninjaz.com/images/tn6dbyyeq2hjoq1rwwu7.jpg) - -How To: - -- Get the flag? Just walk over it. -- Return our flag? Kill the enemy and walk over the flag. -- Capture the flag? Hold the enemy’s flag and walk over your own in your base. - -Map Entities ------------- - -_(Insert Map Entities here)_ - -Helpful Hints and Tips ----------------------- - -- Some maps can contain powerups like “[Strength](Strength)” or “[Shield](Shield)” (which usually spawn every 2 minutes). They can be useful tools to win a match! -- [Binds](Binds) are useful to organize your team, e.g. to let them know if you are going to attack. There are several default binds on the Numpad. -- There is always a yellow waypoint above your Flag Carrier (FC) with a bar that shows his health and obviously it shows his position. Especially if he is on very low health try to assist and help him to capture the flag. - -List of Demos and Videos ------------------------- - -- Demo: _(Insert Demo or Video Here)_ -- Players: _(Insert Player Names Here)_ -- Key Points: _(Insert key points in match here)_ - diff --git a/DarkPlaces_QC_Tutorials.md b/DarkPlaces_QC_Tutorials.md deleted file mode 100644 index ef5544d..0000000 --- a/DarkPlaces_QC_Tutorials.md +++ /dev/null @@ -1,10 +0,0 @@ -DarkPlaces Wiki -=============== - -QC Tutorials -============ - -QuakeC Utilizing Darkplaces ---------------------------- - -- FRIK_FILE Precaches _(link lost)_ diff --git a/DarkPlaces_Authors.md b/Darkplaces/Authors.md similarity index 100% rename from DarkPlaces_Authors.md rename to Darkplaces/Authors.md diff --git a/DarkPlaces_CSQC.md b/Darkplaces/CSQC.md similarity index 100% rename from DarkPlaces_CSQC.md rename to Darkplaces/CSQC.md diff --git a/DarkPlaces_CVars.md b/Darkplaces/CVars.md similarity index 100% rename from DarkPlaces_CVars.md rename to Darkplaces/CVars.md diff --git a/DarkPlaces_Commands.md b/Darkplaces/Commands.md similarity index 100% rename from DarkPlaces_Commands.md rename to Darkplaces/Commands.md diff --git a/DarkPlaces_Effectinfo.md b/Darkplaces/Effectinfo.md similarity index 100% rename from DarkPlaces_Effectinfo.md rename to Darkplaces/Effectinfo.md diff --git a/DarkPlaces_Extensions.md b/Darkplaces/Extensions.md similarity index 100% rename from DarkPlaces_Extensions.md rename to Darkplaces/Extensions.md diff --git a/DarkPlaces_Features.md b/Darkplaces/Features.md similarity index 79% rename from DarkPlaces_Features.md rename to Darkplaces/Features.md index 1d7481e..c8b4c87 100644 --- a/DarkPlaces_Features.md +++ b/Darkplaces/Features.md @@ -10,9 +10,9 @@ Graphics Features - Realtime Dynamic Lighting - Diffuse, Normal, Gloss & Glow Mapping - Omnidirectional Shadow Mapping -- [Scriptable particle effects](DarkPlaces_Effectinfo) -- [Skeletal Animation](DarkPlaces_Modeling) -- [Scriptable Surface Materials](DarkPlaces_Materials) +- [Scriptable particle effects](./Effectinfo) +- [Skeletal Animation](./Modeling) +- [Scriptable Surface Materials](./Materials) - Reflective/Refractive Water Supported Formats diff --git a/DarkPlaces_Materials.md b/Darkplaces/Materials.md similarity index 100% rename from DarkPlaces_Materials.md rename to Darkplaces/Materials.md diff --git a/DarkPlaces_Modeling.md b/Darkplaces/Modeling.md similarity index 100% rename from DarkPlaces_Modeling.md rename to Darkplaces/Modeling.md diff --git a/Darkplaces_Parameters.md b/Darkplaces/Parameters.md similarity index 100% rename from Darkplaces_Parameters.md rename to Darkplaces/Parameters.md diff --git a/DarkPlaces_Wiki.markdown b/Darkplaces/index.md similarity index 71% rename from DarkPlaces_Wiki.markdown rename to Darkplaces/index.md index 09610b4..83937c5 100644 --- a/DarkPlaces_Wiki.markdown +++ b/Darkplaces/index.md @@ -15,25 +15,24 @@ Darkplaces Engine ================= - History -- [Features](DarkPlaces_Features) -- [Executable Parameters](Darkplaces_Parameters) -- [Console Commands](DarkPlaces_Commands) -- [Console Variables](DarkPlaces_CVars) -- [QuakeC Extensions](DarkPlaces_Extensions) -- [Client-Side QuakeC](DarkPlaces_CSQC) +- [Features](./Features) +- [Executable Parameters](./Parameters) +- [Console Commands](./Commands) +- [Console Variables](./CVars) +- [QuakeC Extensions](./Extensions) +- [Client-Side QuakeC](./CSQC) - Menu QuakeC -- [Darkplaces Authors](DarkPlaces_Authors) +- [Darkplaces Authors](./Authors) - Contributing - Compiling Darkplaces from Source Modding With Darkplaces ======================= -- [QC Tutorials](DarkPlaces_QC_Tutorials) -- [Modeling for DP](DarkPlaces_Modeling) +- [Modeling for DP](./Modeling) - Mapping for DP -- [Material creation for DP](DarkPlaces_Materials) -- [Effectinfo Scripting Reference](DarkPlaces_Effectinfo) +- [Material creation for DP](./Materials) +- [Effectinfo Scripting Reference](./Effectinfo) Commercial Games ================ diff --git a/Arena.md b/Gamemodes/Arena.md similarity index 100% rename from Arena.md rename to Gamemodes/Arena.md diff --git a/Assault.md b/Gamemodes/Assault.md similarity index 87% rename from Assault.md rename to Gamemodes/Assault.md index c337951..7081299 100644 --- a/Assault.md +++ b/Gamemodes/Assault.md @@ -20,8 +20,8 @@ _(Insert Map Entities here)_ Helpful Hints and Tips ---------------------- -- [Binds](Binds) like “Enemy seen” are useful to inform the team. -- Maps can include [Turrets](Turrets) (machines that fire e.g. rockets or laser at you). They can be destroyed if you shot them for a while. +- [Binds](../Binds) like “Enemy seen” are useful to inform the team. +- Maps can include [Turrets](../Turrets) (machines that fire e.g. rockets or laser at you). They can be destroyed if you shot them for a while. List of Demos and Videos ------------------------ diff --git a/CTF_-_Capture_the_flag.md b/Gamemodes/Capture_the_Flag.md similarity index 56% rename from CTF_-_Capture_the_flag.md rename to Gamemodes/Capture_the_Flag.md index 71b2d6c..06a74e9 100644 --- a/CTF_-_Capture_the_flag.md +++ b/Gamemodes/Capture_the_Flag.md @@ -1,9 +1,50 @@ -CTF - Capture the flag +Capture The Flag (CTF) ====================== +[![](http://pics.nexuizninjaz.com/images/zh1xq7e8jbjjwxk6ggh.jpg)](http://pics.nexuizninjaz.com/images/r9bwz58b2dli06rrqdsx.jpg) +[![](http://pics.nexuizninjaz.com/images/hm0x93hvbm1npbecvi30.jpg)](http://pics.nexuizninjaz.com/images/r9d27gmnj4kv5piexh6t.jpg) +*Click for bigger pictures* + +Object of the Game +------------------ + +In CTF there are 2 teams (red & blue), while each team got a base with their flag. The goal is to steal the other teams’ flag and bring it to your own to capture it. That’s only possible if your own flag is in your base and not taken by the other team. Usually a team needs 10 captures (caps) to win a map. + +![](http://pics.nexuizninjaz.com/images/tn6dbyyeq2hjoq1rwwu7.jpg) + +How To: + +- Get the flag? Just walk over it. +- Return our flag? Kill the enemy and walk over the flag. +- Capture the flag? Hold the enemy’s flag and walk over your own in your base. + +Map Entities +------------ + +_(Insert Map Entities here)_ + +Helpful Hints and Tips +---------------------- + +- Some maps can contain powerups like “[Strength](../Powerups#strength)” or “[Shield](../Powerups#shield)” (which +usually spawn +every 2 minutes). They can be useful tools to win a match! +- [Binds](../Binds) are useful to organize your team, e.g. to let them know if you are going to attack. There are several default binds on the Numpad. +- There is always a yellow waypoint above your Flag Carrier (FC) with a bar that shows his health and obviously it shows his position. Especially if he is on very low health try to assist and help him to capture the flag. + +List of Demos and Videos +------------------------ + +- Demo: _(Insert Demo or Video Here)_ +- Players: _(Insert Player Names Here)_ +- Key Points: _(Insert key points in match here)_ + +Map layouts +----------- + There are three basic types of level layouts that tend to be favored. Each has its advantages and disadvantages. -Rectangular +###Rectangular ----------- Maps with a straightforward, linear route from flag to flag. The map is typically divided into three portions: a base area for each team, with a middle area connecting both of them to one another. @@ -12,7 +53,7 @@ Maps with a straightforward, linear route from flag to flag. The map is typicall **Advantages**: Teammate positions on map are apparent, with attacker, defender, and roamer clearly defined. Fastest way to base is also apparent, with detours leading to health and items. These maps are great for new players because of the simplicity of the layout. Stalemates are easily resolved due to there being no real hiding place for flag carriers. **Disadvantages**: Very easy to defend which results in camping, often making predictable game play. -Ant hill +###Ant hill -------- These maps are often the same shape as rectangular maps, but have many different paths to the bases. They are often enclosed or semi-enclosed, which makes the paths tunnel-like (hence, like an ant hill or a termite mound). For effective play, more attention must be given to the mini-map and and teammate communication than in an ordinary rectangular map. @@ -21,7 +62,7 @@ These maps are often the same shape as rectangular maps, but have many different **Advantages**: Interesting game play, making confrontation with the enemy less frequent, bringing the game back to capture the flag. Deference is a little harder unless spawn points are in base. **Disadvantages**: Carrier is easily hidden. Often resulting in a stalemates which slows game play. Players have to work all positions on the field to be successful. Game becomes very “chase to flag carrier through the tunnels” -S- or Z-shaped +###S- or Z-shaped -------------- This is a non-linear map with a few detours and alternative routes to the bases. It tends to be a balanced level layout that offers a good deal of straightforwardness like a rectangular map with the variety of paths between bases like an ant hill map. diff --git a/Clan_Arena.md b/Gamemodes/Clan_Arena.md similarity index 82% rename from Clan_Arena.md rename to Gamemodes/Clan_Arena.md index 4219766..5634ded 100644 --- a/Clan_Arena.md +++ b/Gamemodes/Clan_Arena.md @@ -14,7 +14,7 @@ _(Insert Map Entities here)_ Helpful Hints and Tips ---------------------- -- Team [binds](binds) are again useful to show your position (e.g. “Roaming” bind on 8 [Numpad]) or to show enemy’s position. +- Team [binds](../binds) are again useful to show your position (e.g. “Roaming” bind on 8 [Numpad]) or to show enemy’s position. List of Demos and Videos ------------------------ diff --git a/Deathmatch.md b/Gamemodes/Deathmatch.md similarity index 90% rename from Deathmatch.md rename to Gamemodes/Deathmatch.md index f0dbe86..a553497 100644 --- a/Deathmatch.md +++ b/Gamemodes/Deathmatch.md @@ -14,7 +14,8 @@ Map Entities - **Weapons** - These can be picked up from various places around the map or from a downed player. - **Ammo** - These may be found in the form of shells, bullets, rockets, jet fuel, or power cells. -- **Powerups** - All maps have “Health” and “Armor” powerups, which extend your lifetime. Some maps may contain powerups like “[Strength](Strength)” or “[Shield](Shield)” (which usually spawn every 2 minutes). +- **Powerups** - All maps have “Health” and “Armor” powerups, which extend your lifetime. Some maps may contain +powerups like “[Strength](../Powerups#strength)” or “[Shield](../Powerups#shield)” (which usually spawn every 2 minutes). Helpful Hints and Tips ---------------------- diff --git a/Domination.md b/Gamemodes/Domination.md similarity index 100% rename from Domination.md rename to Gamemodes/Domination.md diff --git a/1v1_Duel.md b/Gamemodes/Duel.md similarity index 100% rename from 1v1_Duel.md rename to Gamemodes/Duel.md diff --git a/Freeze_Tag.md b/Gamemodes/Freeze_Tag.md similarity index 74% rename from Freeze_Tag.md rename to Gamemodes/Freeze_Tag.md index 9692e45..fffe7cb 100644 --- a/Freeze_Tag.md +++ b/Gamemodes/Freeze_Tag.md @@ -1,7 +1,7 @@ Freeze Tag ========== -![](>http://pics.nexuizninjaz.com/images/gdx5hm4yy93dab41bu.jpg) +![](http://pics.nexuizninjaz.com/images/gdx5hm4yy93dab41bu.jpg) Object of the Game ------------------ @@ -22,8 +22,9 @@ _(Insert Map Entities here)_ Helpful Hints and Tips ---------------------- -- Some maps can contain powerups like “[Strength](Strength)” or “[Shield](Shield)” (which usually spawn every 2 minutes). They can be useful tools to win a match! -- [Binds](Binds) are very useful again to coordinate the team. +- Some maps can contain powerups like “[Strength](../Powerups#strength)” or “[Shield](../Powerups#shield)” (which usually +spawn every 2 minutes). They can be useful tools to win a match! +- [Binds](../Binds) are very useful again to coordinate the team. - You can freeze (or get frozen) in e.g. lava too! Also if you fall into space you will respawn frozen. List of Demos and Videos diff --git a/Keepaway.md b/Gamemodes/Keepaway.md similarity index 89% rename from Keepaway.md rename to Gamemodes/Keepaway.md index 4938650..4c3830b 100644 --- a/Keepaway.md +++ b/Gamemodes/Keepaway.md @@ -4,7 +4,7 @@ Keepaway Object of the Game ------------------ -![](>http://pics.nexuizninjaz.com/images/97kgj2j8monn9twl2e.png) +![](http://pics.nexuizninjaz.com/images/97kgj2j8monn9twl2e.png) There is a ball spawned randomly on the map. The goals are to get the ball by any means possible and — when you have it, kill as many people as possible and protect yourself. diff --git a/Key_Hunt.md b/Gamemodes/Key_Hunt.md similarity index 83% rename from Key_Hunt.md rename to Gamemodes/Key_Hunt.md index a0e8ba2..0b15971 100644 --- a/Key_Hunt.md +++ b/Gamemodes/Key_Hunt.md @@ -23,8 +23,9 @@ _(Insert Map Entities here)_ Helpful Hints and Tips ---------------------- -- Some maps can contain powerups like “[Strength](Strength)” or “[Shield](Shield)” (which usually spawn every 2 minutes). They can be useful tools to win a match! -- [Binds](Binds) are very useful again to coordinate the team. +- Some maps can contain powerups like “[Strength](../Powerups#strength)” or “[Shield](../Powerups#shield)” (which usually +spawn every 2 minutes). They can be useful tools to win a match! +- [Binds](../Binds) are very useful again to coordinate the team. List of Demos and Videos ------------------------ diff --git a/Last_Man_Standing.md b/Gamemodes/Last_Man_Standing.md similarity index 53% rename from Last_Man_Standing.md rename to Gamemodes/Last_Man_Standing.md index 6c0b488..47f0ac2 100644 --- a/Last_Man_Standing.md +++ b/Gamemodes/Last_Man_Standing.md @@ -1,12 +1,12 @@ Last Man Standing (LMS) ======================= -![](>http://pics.nexuizninjaz.com/images/v73uorgsp9f5stya1zx.jpg) +![](http://pics.nexuizninjaz.com/images/v73uorgsp9f5stya1zx.jpg) Object of the Game ------------------ -In LMS you start with a special amount of lives (9 by default) and with every weapon (except [Mine Layer](Weapons); [HLAC](Weapons); [T.A.G. Seeker](Weapons); [Fireball](Weapons); [Grappling Hook](Weapons); [Port-O-Launch](Weapons) and the [@#!%’n Tuba](Weapons)). For each death you lose 1 live and once you run out of your lives you will have to spectate until the end of the map. The last one that survives is the “Last Man Standing” and wins the map. +In LMS you start with a special amount of lives (9 by default) and with every weapon (except [Mine Layer](../Weapons); [HLAC](../Weapons); [T.A.G. Seeker](../Weapons); [Fireball](../Weapons); [Grappling Hook](../Weapons); [Port-O-Launch](../Weapons) and the [@#!%’n Tuba](../Weapons)). For each death you lose 1 live and once you run out of your lives you will have to spectate until the end of the map. The last one that survives is the “Last Man Standing” and wins the map. Map Entities ------------ diff --git a/Nexball.md b/Gamemodes/Nexball.md similarity index 100% rename from Nexball.md rename to Gamemodes/Nexball.md diff --git a/Onslaught.md b/Gamemodes/Onslaught.md similarity index 100% rename from Onslaught.md rename to Gamemodes/Onslaught.md diff --git a/Race.md b/Gamemodes/Race.md similarity index 100% rename from Race.md rename to Gamemodes/Race.md diff --git a/Race_CTS.md b/Gamemodes/Race_CTS.md similarity index 93% rename from Race_CTS.md rename to Gamemodes/Race_CTS.md index 2ec07b0..b0be90c 100644 --- a/Race_CTS.md +++ b/Gamemodes/Race_CTS.md @@ -14,7 +14,7 @@ _(Insert Map Entities here)_ Helpful Hints and Tips ---------------------- -- The physics are different in Race CTS if a server runs the mod ‘[Xonotic Pro Mode](Xonotic Pro Mode)’. +- The physics are different in Race CTS if a server runs the mod ‘[Xonotic Pro Mode](../Xonotic Pro Mode)’. - You can’t push (/frag) other players like in Race. List of Demos and Videos diff --git a/Rune.md b/Gamemodes/Rune.md similarity index 100% rename from Rune.md rename to Gamemodes/Rune.md diff --git a/Team_Deathmatch.md b/Gamemodes/Team_Deathmatch.md similarity index 84% rename from Team_Deathmatch.md rename to Gamemodes/Team_Deathmatch.md index 992e0e0..dd51e8c 100644 --- a/Team_Deathmatch.md +++ b/Gamemodes/Team_Deathmatch.md @@ -15,7 +15,8 @@ Map Entities - **Weapons** - These can be picked up from various places around the map or from a downed player. - **Ammo** - These may be found in the form of shells, bullets, rockets, jet fuel, or power cells. -- **Powerups** - All maps have “Health” and “Armor” powerups, which extend your lifetime. Some maps may contain powerups like “[Strength](Strength)” or “[Shield](Shield)” (which usually spawn every 2 minutes). +- **Powerups** - All maps have “Health” and “Armor” powerups, which extend your lifetime. Some maps may contain +powerups like “[Strength](../Powerups#strength)” or “[Shield](../Powerups#shield)” (which usually spawn every 2 minutes). Helpful Hints and Tips ---------------------- @@ -23,7 +24,7 @@ Helpful Hints and Tips - Always keep moving. This can be especially true for smaller maps and/or very crowded matches. If you stay in one place for too long, you risk becoming an easy target. - If your map contains powerups such as the ones mentioned above, make good use of them. They can be useful tools to win a match! - Keep your suicides at a minimum. Your point counter *can* enter into the negatives, so always avoid self-injury. -- Using team [binds](binds) like “Enemy seen” are useful here and can be used to alert teammates of an enemy presence. +- Using team [binds](../binds) like “Enemy seen” are useful here and can be used to alert teammates of an enemy presence. List of Demos and Videos ------------------------ diff --git a/Halogenes_Newbie_Corner.markdown b/Halogenes_Newbie_Corner.markdown index 8c56fc3..f36f1d6 100644 --- a/Halogenes_Newbie_Corner.markdown +++ b/Halogenes_Newbie_Corner.markdown @@ -11,7 +11,7 @@ Contents - [Weapons](#weapons) - [Laser](#laser) - [Shotgun](#shotgun) - - [Machinegun/Uzi](#machinegunuzi) + - [Machinegun](#machinegun) - [Mortar](#mortar) - [Electro](#electro) - [Crylink](#crylink) @@ -268,7 +268,7 @@ The shotgun is your second spawn weapon. Primary fire is very powerful in close The secondary fire mode allows you to swing the shotgun like a big trout and to slap other players, which is, apart from dealing rather lots of damage, very much fun to do. -### Machinegun/Uzi +### Machinegun [![Machinegun](http://www.xonotic.org/m/uploads/2014/04/MG2-thumb.png)](http://www.xonotic.org/m/uploads/2012/12/MG2.png) diff --git a/Home.markdown b/Home.markdown index 8aba41c..d0e2eef 100644 --- a/Home.markdown +++ b/Home.markdown @@ -18,8 +18,8 @@ Project - [Public Relations](Pr) - Plans - Check out our [Project Plan](Plan) so far - - [Website](Website) Plannning - - Notes from brainstorming [ideas for names](names) + - [Website planning](Planning/Website) + - Notes from brainstorming [ideas for names](Planning/names) - [Xonotic compatibility pack](Xonotic_compatibility_pack) a small pk3 that will rebrand a default Nexuiz install The Software @@ -43,44 +43,44 @@ Gameplay - [Weapons](Weapons) - Gamemodes - - [Arena](Arena) - - [Assault](Assault) - - [Capture the Flag](Capture_the_Flag) - - [Clan Arena](Clan_Arena) - - [Deathmatch](Deathmatch) - - [1v1 Duel](1v1_Duel) - - [Domination](Domination) - - [Freeze Tag](Freeze_Tag) - - [Keepaway](Keepaway) - - [Key Hunt](Key_Hunt) - - [Last Man Standing](Last_Man_Standing) - - [Nexball](Nexball) - - [Onslaught](Onslaught) - - [Race](Race) - - [Race CTS](Race_CTS) - - [Runematch](Rune) - - [Team Deathmatch](Team_Deathmatch) - - [Conquest](Conquest) + - [Arena](Gamemodes/Arena) + - [Assault](Gamemodes/Assault) + - [Capture the Flag](Gamemodes/Capture_the_Flag) + - [Clan Arena](Gamemodes/Clan_Arena) + - [Deathmatch](Gamemodes/Deathmatch) + - [Domination](Gamemodes/Domination) + - [Duel](Gamemodes/Duel) + - [Freeze Tag](Gamemodes/Freeze_Tag) + - [Keepaway](Gamemodes/Keepaway) + - [Key Hunt](Gamemodes/Key_Hunt) + - [Last Man Standing](Gamemodes/Last_Man_Standing) + - [Nexball](Gamemodes/Nexball) + - [Onslaught](Gamemodes/Onslaught) + - [Race](Gamemodes/Race) + - [Race CTS](Gamemodes/Race_CTS) + - [Runematch](Gamemodes/Rune) + - [Team Deathmatch](Gamemodes/Team_Deathmatch) + - [Conquest](Gamemodes/Conquest) - Mutators - - [Dodging](Dodging) - - [Midair](Midair) - - [Vampire](Vampire) - - [Blood Loss](Blood Loss) - - [Low Gravity](Low Gravity) - - [Cloak](Cloak) - - [Relics](Relics) - - [Weapon Arena](Weapon Arena) - - [Grappling Hook](Grappling_Hook) - - [Jet Pack](Jet Pack) - - [Rocket Flying](Rocket Flying) - - [Pinata](Pinata) - - [Weapons Stay](Weapons Stay) - - [MinstaGib](MinstaGib) - - [NIX](NIX) + - [Dodging](Mutators/Dodging) + - [Midair](Mutators/Midair) + - [Vampire](Mutators/Vampire) + - [Blood Loss](Mutators/Blood_Loss) + - [Low Gravity](Mutators/Low_Gravity) + - [Cloak](Mutators/Cloak) + - [Relics](Mutators/Relics) + - [Weapon Arena](Mutators/Weapon_Arena) + - [Grappling Hook](Mutators/Grappling_Hook) + - [Jet Pack](Mutators/Jet_Pack) + - [Rocket Flying](Mutators/Rocket_Flying) + - [Pinata](Mutators/Pinata) + - [Weapons Stay](Mutators/Weapons_Stay) + - [InstaGib](Mutators/InstaGib) + - [NIX](Mutators/NIX) - Misc - - [Camera for demos explained](Demo_Camera) + - [Camera for demos explained](Recording/Demo_Camera) - [Xonotic Bot Orchestra](Xonotic_Bot_Orchestra) Art & Media @@ -88,18 +88,18 @@ Art & 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) +- [Xonotic Logo](Planning/Logo/Logo) +- [Maps Makeover](Planning/Maps_Makeover) +- [Weapons Makeover](Planning/Weapons_Makeover) + - [New weapon names discussion](Planning/NamesWeapons) - [2d art](2d art) -- [Music](Music) - - [Music contributions](Music_contributions) -- [Sound FX](Sound_FX) - - [Sound FX contributions](Sound_FX_contributions) +- [Music](Audio/Music) + - [Music contributions](Audio/Music_contributions) +- [Sound FX](Audio/Sound_FX) + - [Sound FX contributions](Audio/Sound_FX_contributions) - Story Themes - - [Close to home](Close_to_home) - - [Tech Conglomerate](Tech_Conglomerate) + - [Close to home](Planning/Themes/Close_to_home) + - [Tech Conglomerate](Planning/Themes/Tech_Conglomerate) Editing @@ -108,24 +108,24 @@ 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](Introduction_to_QuakeC) - - [DarkPlaces Wiki](DarkPlaces_Wiki) - - [QuakeC Specifications v1.0](QuakeC_Wiki) + - [Introduction to QuakeC](QuakeC/Introduction_to_QuakeC) + - [DarkPlaces Wiki](Darkplaces/index) + - [QuakeC Specifications v1.0](QuakeC/QuakeC_Wiki) - [QuakeC tutorials](http://www.inside3d.com/tutorials.php) at inside3d.com - - [NewQC](NewQC) - Possible changes regarding QC (compiler, syntax, …) + - [NewQC](QuakeC/NewQC) - Possible changes regarding QC (compiler, syntax, …) -- [Modeling](Modeling) - - [Textures know-how](Textures) - - [Normal Maps know-how](Normal_Maps) +- [Modeling](Darkplaces/Modeling) + - [Textures know-how](Modeling/Textures) + - [Normal Maps know-how](Modeling/Normal_Maps) - [Polygon count](Polycounts) on Weapons and Models - - [.framegroups](framegroups) file (allow self playing animations) know-how + - [.framegroups](Modeling/framegroups) file (allow self playing animations) know-how - [.sounds](Voices_and_sounds) file (player model sounds) know-how - - [How to compile dpm models](dpmodel) - - [How to make weapons](Weaponsystem) - - How to get an animated mesh from [Blender to DPM](Blender_to_DPM) + - [How to compile dpm models](Modeling/dpmodel) + - [How to make weapons](Modeling/Weaponsystem) + - How to get an animated mesh from [Blender to DPM](Modeling/Blender_to_DPM) - [Inter-Quake Model (IQM) Format](http://lee.fov120.com/iqm/) - - [Player Model Spec](Player_Model_Spec) - - [Blender to IQM](Blender_to_IQM) + - [Player Model Spec](Modeling/Player_Model_Spec) + - [Blender to IQM](Modeling/Blender_to_IQM) - Texturing - Tutorials [1](http://www.cgtextures.com/content.php?action=tutorials) @@ -135,12 +135,12 @@ In this section you will find helpful information about editing Xonotic in gener - [Q3A Shader Manual](http://toolz.nexuizninjaz.com/shader/) - Configuration - - [Capturing video clips and using the demo camera](democapture) + - [Capturing video clips and using the demo camera](Recording/Democapture) - [Git](Git) -- [Mapping](Mapping) - - [Creating Maps](Creating_Maps) - - [Mapper resources](Mapper_resources) +- [Mapping](Mapping/Mapping) + - [Creating Maps](Mapping/Creating_Maps) + - [Mapper resources](Mapping/Mapper_resources) - [Map naming convention](http://alientrap.org/forum/viewtopic.php?f=2&t=2363&sid=4f8a9e06ada52255e98bdfa744ec6beb#p27330) References diff --git a/Introduction.md b/Introduction.md deleted file mode 100644 index c516b33..0000000 --- a/Introduction.md +++ /dev/null @@ -1,2 +0,0 @@ -Introduction -============ diff --git a/Basic_mapping_in_Radiant.md b/Mapping/Basic_mapping_in_Radiant.md similarity index 100% rename from Basic_mapping_in_Radiant.md rename to Mapping/Basic_mapping_in_Radiant.md diff --git a/Complete_list_of_command_line_parameters.md b/Mapping/Complete_list_of_command_line_parameters.md similarity index 100% rename from Complete_list_of_command_line_parameters.md rename to Mapping/Complete_list_of_command_line_parameters.md diff --git a/Complete_list_of_entity_keys.md b/Mapping/Complete_list_of_entity_keys.md similarity index 100% rename from Complete_list_of_entity_keys.md rename to Mapping/Complete_list_of_entity_keys.md diff --git a/Complete_list_of_shader_keywords.md b/Mapping/Complete_list_of_shader_keywords.md similarity index 100% rename from Complete_list_of_shader_keywords.md rename to Mapping/Complete_list_of_shader_keywords.md diff --git a/Creating_Maps.md b/Mapping/Creating_Maps.md similarity index 100% rename from Creating_Maps.md rename to Mapping/Creating_Maps.md diff --git a/Creation_de_cartes.md b/Mapping/Creation_de_cartes.md similarity index 100% rename from Creation_de_cartes.md rename to Mapping/Creation_de_cartes.md diff --git a/Hinting.md b/Mapping/Hinting.md similarity index 100% rename from Hinting.md rename to Mapping/Hinting.md diff --git a/Lighting.md b/Mapping/Lighting.md similarity index 100% rename from Lighting.md rename to Mapping/Lighting.md diff --git a/Mapper_resources.md b/Mapping/Mapper_resources.md similarity index 100% rename from Mapper_resources.md rename to Mapping/Mapper_resources.md diff --git a/Mapping-FirstRoom.md b/Mapping/Mapping-FirstRoom.md similarity index 100% rename from Mapping-FirstRoom.md rename to Mapping/Mapping-FirstRoom.md diff --git a/Mapping-Introduction.md b/Mapping/Mapping-Introduction.md similarity index 100% rename from Mapping-Introduction.md rename to Mapping/Mapping-Introduction.md diff --git a/Mapping-NetRadiant.md b/Mapping/Mapping-NetRadiant.md similarity index 100% rename from Mapping-NetRadiant.md rename to Mapping/Mapping-NetRadiant.md diff --git a/Mapping-Setup.md b/Mapping/Mapping-Setup.md similarity index 100% rename from Mapping-Setup.md rename to Mapping/Mapping-Setup.md diff --git a/Mapping-entity-func_button.md b/Mapping/Mapping-entity-func_button.md similarity index 100% rename from Mapping-entity-func_button.md rename to Mapping/Mapping-entity-func_button.md diff --git a/Mapping-textures-skybox-blender.md b/Mapping/Mapping-textures-skybox-blender.md similarity index 100% rename from Mapping-textures-skybox-blender.md rename to Mapping/Mapping-textures-skybox-blender.md diff --git a/Mapping.md b/Mapping/Mapping.md similarity index 100% rename from Mapping.md rename to Mapping/Mapping.md diff --git a/Netradiant.md b/Mapping/Netradiant.md similarity index 100% rename from Netradiant.md rename to Mapping/Netradiant.md diff --git a/Old_Creating_Maps.md b/Mapping/Old_Creating_Maps.md similarity index 100% rename from Old_Creating_Maps.md rename to Mapping/Old_Creating_Maps.md diff --git a/WarpZones.md b/Mapping/WarpZones.md similarity index 100% rename from WarpZones.md rename to Mapping/WarpZones.md diff --git a/Blender_to_IQM.md b/Modeling/Blender_to_IQM.md similarity index 100% rename from Blender_to_IQM.md rename to Modeling/Blender_to_IQM.md diff --git a/Blender_to_dpm.md b/Modeling/Blender_to_dpm.md similarity index 100% rename from Blender_to_dpm.md rename to Modeling/Blender_to_dpm.md diff --git a/Dpmodel.md b/Modeling/Dpmodel.md similarity index 100% rename from Dpmodel.md rename to Modeling/Dpmodel.md diff --git a/Framegroups.md b/Modeling/Framegroups.md similarity index 100% rename from Framegroups.md rename to Modeling/Framegroups.md diff --git a/Modelling.md b/Modeling/Modelling.md similarity index 100% rename from Modelling.md rename to Modeling/Modelling.md diff --git a/Normal_Maps.md b/Modeling/Normal_Maps.md similarity index 100% rename from Normal_Maps.md rename to Modeling/Normal_Maps.md diff --git a/Player_Model_Spec.md b/Modeling/Player_Model_Spec.md similarity index 100% rename from Player_Model_Spec.md rename to Modeling/Player_Model_Spec.md diff --git a/Textures.md b/Modeling/Textures.md similarity index 100% rename from Textures.md rename to Modeling/Textures.md diff --git a/Weaponsystem.md b/Modeling/Weaponsystem.md similarity index 100% rename from Weaponsystem.md rename to Modeling/Weaponsystem.md diff --git a/Grappling_Hook.md b/Mutators/Grappling_Hook.md similarity index 52% rename from Grappling_Hook.md rename to Mutators/Grappling_Hook.md index c770d40..62a75f3 100644 --- a/Grappling_Hook.md +++ b/Mutators/Grappling_Hook.md @@ -4,7 +4,14 @@ Grappling Hook Mutator: Overview -------- -This mutator adds an extra weapon to each players default spawn weapons: the [Grappling Hook](Weapons#grappling-hook). This weapon fires a particle beam that will travel a long distance until it hits a solid surface. Once latched onto something, the gun will immediately swing you there. It does not require external ammunition, but it has a charge that slowly regenerates over time (marked by a yellow bar above the Health and Armor meters in the HUD). The hook adds an extra challenge to fighting matches, and it also makes both surprise ambushes and miraculous escapes possible. Additionally, areas with powerups or weapons that were previously unreachable are now up for grabs, making matches involving “[Strength](Strength)” and “[Shield](Shield)” powerups much more interesting. +This mutator adds an extra weapon to each players default spawn weapons: the [Grappling Hook](Weapons#grappling-hook) +. This weapon fires a particle beam that will travel a long distance until it hits a solid surface. Once latched onto + something, the gun will immediately swing you there. It does not require external ammunition, but it has a charge + that slowly regenerates over time (marked by a yellow bar above the Health and Armor meters in the HUD). The hook + adds an extra challenge to fighting matches, and it also makes both surprise ambushes and miraculous escapes + possible. Additionally, areas with powerups or weapons that were previously unreachable are now up for grabs, making + matches involving “[Strength](../Powerups#strength)” and “[Shield](../Powerups#shield)” powerups much more + interesting. Mutator Details --------------- @@ -12,7 +19,7 @@ Mutator Details - Grappling hook information: - *Primary*: Fires the hook, latches onto a surface, pulls the player there, and then detaches. Press and hold the button to keep the hook attached for longer, but this depletes the charge quickly. - *Secondary*: Drops a gravity bomb that affects enemy players and also releases light and smoke (similar to a flashbang). - - *Ammunition*: Regenerating charge (Primary), [Cells](Weapons#cells) (Secondary). + - *Ammunition*: Regenerating charge (Primary), [Cells](../Weapons#cells) (Secondary). - Using the default keybinds, the Grappling Hook should should be in weapon **slot 0** (‘zero’). - The Grappling Hook is *not* a hitscan beam! Depending on the distance, it may take a second or two for the hook to actually reach its destination, so use careful timing if using it for an escape! - Conserve your charge. It may take a while to regenerate, so don’t consume it all at once. diff --git a/MinstaGib.md b/Mutators/InstaGib.md similarity index 51% rename from MinstaGib.md rename to Mutators/InstaGib.md index ea9d99a..f8e41a2 100644 --- a/MinstaGib.md +++ b/Mutators/InstaGib.md @@ -1,15 +1,15 @@ -MinstaGib Mutator: -================== +InstaGib Mutator: +================= Overview -------- -Typically known as “instagib” in most other arena shooters, MinstaGib replaces all weaponry with the [MinstaNex](Weapons#minstanex). It is a powerful hitscan weapon that will immediately kill the target player in one shot. MinstaGib is a popular mutator that mixes well with almost all gamemodes and may be included in many Xonotic servers. When participating in a MinstaGib match, one must have particularly good aim and conserve shots whenever possible. +InstaGib replaces all weaponry with the [Vortex](Weapons#minstanex). It is a powerful hitscan weapon that will immediately kill the target player in one shot. InstaGib is a popular mutator that mixes well with almost all gamemodes and may be included in many Xonotic servers. When participating in an InstaGib match, one must have particularly good aim and conserve shots whenever possible. Mutator Details --------------- -- MinstaNex weapon information: +- Vortex weapon information: - *Primary fire*: Instant-kill beam; has a **\~1 second** recharge time, so aim wisely. - *Secondary fire*: [Laser](Weapons#laser). Can be used for laserjumping or pushing other players off the map. - *Ammunition*: [Cells](Items#cells) diff --git a/Relics.md b/Mutators/Relics.md similarity index 100% rename from Relics.md rename to Mutators/Relics.md diff --git a/Announcement.md b/Planning/Announcement/Announcement.md similarity index 100% rename from Announcement.md rename to Planning/Announcement/Announcement.md diff --git a/Announcement_script.md b/Planning/Announcement/Announcement_script.md similarity index 100% rename from Announcement_script.md rename to Planning/Announcement/Announcement_script.md diff --git a/Announcement_vote.md b/Planning/Announcement/Announcement_vote.md similarity index 100% rename from Announcement_vote.md rename to Planning/Announcement/Announcement_vote.md diff --git a/Announcement_vote_results.md b/Planning/Announcement/Announcement_vote_results.md similarity index 100% rename from Announcement_vote_results.md rename to Planning/Announcement/Announcement_vote_results.md diff --git a/Before_Announcement.md b/Planning/Announcement/Before_Announcement.md similarity index 100% rename from Before_Announcement.md rename to Planning/Announcement/Before_Announcement.md diff --git a/Bot.md b/Planning/Bot.md similarity index 100% rename from Bot.md rename to Planning/Bot.md diff --git a/Concept_Art.md b/Planning/Concept_Art.md similarity index 100% rename from Concept_Art.md rename to Planning/Concept_Art.md diff --git a/Irclog.md b/Planning/Irclog.md similarity index 100% rename from Irclog.md rename to Planning/Irclog.md diff --git a/Logo.md b/Planning/Logo/Logo.md similarity index 100% rename from Logo.md rename to Planning/Logo/Logo.md diff --git a/Logo_vote.md b/Planning/Logo/Logo_vote.md similarity index 100% rename from Logo_vote.md rename to Planning/Logo/Logo_vote.md diff --git a/Logo_vote_results.md b/Planning/Logo/Logo_vote_results.md similarity index 100% rename from Logo_vote_results.md rename to Planning/Logo/Logo_vote_results.md diff --git a/Maps_Makeover.md b/Planning/Maps_Makeover.md similarity index 100% rename from Maps_Makeover.md rename to Planning/Maps_Makeover.md diff --git a/Names.md b/Planning/Names.md similarity index 100% rename from Names.md rename to Planning/Names.md diff --git a/NamesWeapons.md b/Planning/NamesWeapons.md similarity index 100% rename from NamesWeapons.md rename to Planning/NamesWeapons.md diff --git a/Proposal_for_Board_of_Leaders_elections_draft.md b/Planning/Proposal_for_Board_of_Leaders_elections_draft.md similarity index 100% rename from Proposal_for_Board_of_Leaders_elections_draft.md rename to Planning/Proposal_for_Board_of_Leaders_elections_draft.md diff --git a/Close_to_home.md b/Planning/Themes/Close_to_home.md similarity index 100% rename from Close_to_home.md rename to Planning/Themes/Close_to_home.md diff --git a/Tech_Conglomerate.md b/Planning/Themes/Tech_Conglomerate.md similarity index 100% rename from Tech_Conglomerate.md rename to Planning/Themes/Tech_Conglomerate.md diff --git a/Tech_Conglomerate_Script.md b/Planning/Themes/Tech_Conglomerate_Script.md similarity index 100% rename from Tech_Conglomerate_Script.md rename to Planning/Themes/Tech_Conglomerate_Script.md diff --git a/Weapons_Makeover.md b/Planning/Weapons_Makeover.md similarity index 100% rename from Weapons_Makeover.md rename to Planning/Weapons_Makeover.md diff --git a/Website.md b/Planning/Website.md similarity index 100% rename from Website.md rename to Planning/Website.md diff --git a/Powerups.md b/Powerups.md new file mode 100644 index 0000000..1bf1e85 --- /dev/null +++ b/Powerups.md @@ -0,0 +1,13 @@ +Powerups +======== + +Shield +------ + +![](http://pics.nexuizninjaz.com/images/l2ycopxlaclk58xpvek8.jpg) + +Strength +-------- + +![](http://pics.nexuizninjaz.com/images/suftloljmy2uaj2p2mrv.jpg) + diff --git a/Introduction_to_QuakeC.markdown b/QuakeC/Introduction_to_QuakeC.md similarity index 100% rename from Introduction_to_QuakeC.markdown rename to QuakeC/Introduction_to_QuakeC.md diff --git a/NewQC.md b/QuakeC/NewQC.md similarity index 100% rename from NewQC.md rename to QuakeC/NewQC.md diff --git a/QuakeC_Wiki.md b/QuakeC/QuakeC_Wiki.md similarity index 100% rename from QuakeC_Wiki.md rename to QuakeC/QuakeC_Wiki.md diff --git a/Demo_Camera.md b/Recording/Demo_Camera.md similarity index 100% rename from Demo_Camera.md rename to Recording/Demo_Camera.md diff --git a/Democapture.markdown b/Recording/Democapture.md similarity index 100% rename from Democapture.markdown rename to Recording/Democapture.md diff --git a/Shield.md b/Shield.md deleted file mode 100644 index 303ce64..0000000 --- a/Shield.md +++ /dev/null @@ -1,5 +0,0 @@ -Shield -====== - -![](http://pics.nexuizninjaz.com/images/l2ycopxlaclk58xpvek8.jpg) - diff --git a/Strength.md b/Strength.md deleted file mode 100644 index 4d42cbc..0000000 --- a/Strength.md +++ /dev/null @@ -1,5 +0,0 @@ -Strength -======== - -![](http://pics.nexuizninjaz.com/images/suftloljmy2uaj2p2mrv.jpg) - diff --git a/_Footer.md b/_Footer.md index 14c81ac..34f97db 100644 --- a/_Footer.md +++ b/_Footer.md @@ -1 +1,6 @@ -[Repository Access](Repository_Access) | [Frequently Asked Questions](Faq) | [QuakeC](Introduction_to_QuakeC) | [Git](Git) | [Art Roadmap](Art_Roadmap) | [Xonotic Logo](Logo) + [Repository Access](Repository_Access) +| [Frequently Asked Questions](Faq) +| [QuakeC](QuakeC/Introduction_to_QuakeC) +| [Git](Git) +| [Art Roadmap](Art_Roadmap) +| [Xonotic Logo](Planning/Logo/Logo) diff --git a/_Sidebar.md b/_Sidebar.md index 78c0b8d..4efa8d8 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -2,7 +2,7 @@ [Repository Access](Repository_Access) [Frequently Asked Questions](Faq) -[QuakeC](Introduction_to_QuakeC) +[QuakeC](QuakeC/Introduction_to_QuakeC) [Git](Git) [Art Roadmap](Art_Roadmap) -[Xonotic Logo](Logo) +[Xonotic Logo](Planning/Logo/Logo) -- 2.39.2