105 files changed, 624 insertions, 169 deletions
diff --git a/assets/armour/helmet_mk1.armour b/assets/armour/helmet_mk1.armour
new file mode 100644
index 0000000..4064149
--- /dev/null
+++ b/assets/armour/helmet_mk1.armour
@@ -0,0 +1,19 @@
+
+{
+  name "helmet"
+  minHeight 0.8
+  maxHeight 1.0
+  minAngle  0
+  maxAngle  360
+  modifier  0.7
+}
+
+{
+  name "helmet crouch"
+  minHeight 0.72
+  maxHeight 1.0
+  minAngle  0
+  maxAngle  360
+  modifier  0.4
+  crouch
+}
diff --git a/assets/armour/helmet_mk2.armour b/assets/armour/helmet_mk2.armour
new file mode 100644
index 0000000..8de84b0
--- /dev/null
+++ b/assets/armour/helmet_mk2.armour
@@ -0,0 +1,19 @@
+
+{
+  name "helmet"
+  minHeight 0.8
+  maxHeight 1.0
+  minAngle  0
+  maxAngle  360
+  modifier  0.4
+}
+
+{
+  name "helmet crouch"
+  minHeight 0.72
+  maxHeight 1.0
+  minAngle  0
+  maxAngle  360
+  modifier  0.4
+  crouch
+}
diff --git a/assets/configs/cuboids/concrete.cfg b/assets/configs/cuboids/concrete.cfg
new file mode 100644
index 0000000..61d4952
--- /dev/null
+++ b/assets/configs/cuboids/concrete.cfg
@@ -0,0 +1,7 @@
+texture 0.00 "models/cuboid/concrete/concrete"
+useCracks
+fragment "models/cuboid/concrete/fragment"
+painSound "sound/cuboid/concrete/pain0.wav"
+painSound "sound/cuboid/concrete/pain1.wav"
+painSound "sound/cuboid/concrete/pain2.wav"
+destroySound 0.00 "sound/cuboid/concrete/dstr0.wav"
+\ No newline at end of file
diff --git a/assets/configs/cuboids/glass.cfg b/assets/configs/cuboids/glass.cfg
new file mode 100644
index 0000000..5e8b8b7
--- /dev/null
+++ b/assets/configs/cuboids/glass.cfg
@@ -0,0 +1,9 @@
+texture 0.00 "models/cuboid/glass/glass"
+useCracks
+fragment "models/cuboid/glass/fragment"
+painSound "sound/cuboid/glass/pain0.wav"
+painSound "sound/cuboid/glass/pain1.wav"
+painSound "sound/cuboid/glass/pain2.wav"
+destroySound 6.00 "sound/cuboid/glass/dstr2.wav"
+destroySound 0.50 "sound/cuboid/glass/dstr1.wav"
+destroySound 0.00 "sound/cuboid/glass/dstr0.wav"
+\ No newline at end of file
diff --git a/assets/configs/cuboids/ladder.cfg b/assets/configs/cuboids/ladder.cfg
new file mode 100644
index 0000000..87fa144
--- /dev/null
+++ b/assets/configs/cuboids/ladder.cfg
@@ -0,0 +1,6 @@
+texture 0.00 "models/cuboid/ladder/ladder"
+useCracks
+fragment "models/cuboid/ladder/fragment"
+painSound "sound/cuboid/ladder/pain0.wav"
+painSound "sound/cuboid/ladder/pain1.wav"
+destroySound 0.00 "sound/cuboid/ladder/dstr0.wav"
+\ No newline at end of file
diff --git a/assets/configs/cuboids/organic.cfg b/assets/configs/cuboids/organic.cfg
new file mode 100644
index 0000000..7b22fd8
--- /dev/null
+++ b/assets/configs/cuboids/organic.cfg
@@ -0,0 +1,11 @@
+texture 0.40 "models/cuboid/organic/organic"
+texture 0.20 "models/cuboid/organic/organic_1"
+texture 0.10 "models/cuboid/organic/organic_2"
+texture 0.00 "models/cuboid/organic/organic_3"
+fragment "models/cuboid/organic/fragment"
+painSound "sound/cuboid/organic/pain0.wav"
+painSound "sound/cuboid/organic/pain1.wav"
+painSound "sound/cuboid/organic/pain2.wav"
+destroySound 4.50 "sound/cuboid/organic/dstr2.wav"
+destroySound 2.00 "sound/cuboid/organic/dstr1.wav"
+destroySound 0.00 "sound/cuboid/organic/dstr0.wav"
+\ No newline at end of file
diff --git a/assets/configs/cuboids/slime.cfg b/assets/configs/cuboids/slime.cfg
new file mode 100644
index 0000000..8fb1c54
--- /dev/null
+++ b/assets/configs/cuboids/slime.cfg
@@ -0,0 +1,7 @@
+texture 0.00 "models/cuboid/slime/slime"
+useCracks
+fragment "models/cuboid/slime/fragment"
+painSound "sound/cuboid/slime/pain0.wav"
+painSound "sound/cuboid/slime/pain1.wav"
+destroySound 2.00 "sound/cuboid/slime/dstr1.wav"
+destroySound 0.00 "sound/cuboid/slime/dstr0.wav"
+\ No newline at end of file
diff --git a/assets/credits.txt b/assets/credits.txt
new file mode 100644
index 0000000..52f1d4f
--- /dev/null
+++ b/assets/credits.txt
@@ -0,0 +1,145 @@
+    NAME
+
+Cuboid - a Tremulous 1.2 mod focused on cuboids and fixing balance issues.
+
+    TODO
+
+       - impregnation sounds
+       - a proper Helmet Mk2 texture
+
+    CHANGELOG
+
+Version  Release date
+______________________________________________________________________________________________
+0.1.0    Sep 06 2013
+GAMEPLAY:
+- Based upon Cuboid 0.2.2 (note: the versioning in the original cuboid was different).
+- Added Human Impregnation Mod.
+- Jetpacks now need fuel to operate (buy ammo to refuel).
+- Added a Jetpack fuel indicator (cg_fuelInfo* cvars to customize).
+- Jumping uses fuel instead of stamina when possible (jetpack jumps).
+- Implemented CPMA physics for everyone (both teams, all classes).
+- Lucifer Cannon behaviour reverted to 1.1 (slow missiles, high firerate).
+- Knockback values of Tesla Generators, Flame Throwers and Hives were decrased greatly 
+- Aliens now build faster than Humans (all buildables).
+- It is now possible to evolve near an enemy as long as he's not in the sight.
+- Adv. Marauder now works like Quake 3's Lightning Gun (greatly increased fire rate, damage per second remains unchanged).
+- Medkit now gives humans 15s long immunity to poison.
+- Dodging was removed.
+- Dragoon pounce damage lowered by 25%.
+- Trample damage lowered by 33%.
+- Added Biores (heals the user and grants a partial immunity to poison).
+- Server operator can choose to limit the amount of buildings that can be built in an area
+- Tyrants can drop bombs (regenerate at a Booster)
+- Updated the tutorial system - now it turns itself on every update but displays help only about things that weren't in the last version
+- A splash screen (with Cuboid logo and version) is now displayed every map load/restart. 
+NON-GAMEPLAY:
+- Jetpack now has new, less annoying sounds.
+- Flamer sounds better.
+- New Marauder zapping sounds.
+
+    CREDITS
+
+  Programming:
+theinvsblman (lead programmer)
+ViruS (a.k.a. ZdrytchX) (implementing CPMA physics)
+
+Source code and assets are available at https://github.com/enneract/cuboid under the terms of the GNU GPL.
+This mod is based on Tremulous (Darklegion Development), which is based on Quake III: Arena (id Software).
+  
+   Art
+Pikachu, http//spiney.me/ (sounds)
+theinvsblman (Cuboid-related stuff)
+
+Below is the full list of all resources used by the mod.
+
+File                                  Author                                     Licence
+______________________________________________________________________________________________
+configs/*                             theinvsblman                               cc-by
+credits.txt                           theinvsblman                               cc-by
+cuboid/logo_1.tga - logo_15.tga       theinvsblman                               cc-by
+cuboid/logo_left.tga, logo_right.tga  Bitstream                                  Bistream Vera Fonts Copyright
+emoticons/*                           theinvsblman                               cc-by
+icons/iconu_biokit.tga                Purga                                      cc0
+icons/iconu_helmet_mk2.tga            Darklegion Development, theinvsblman       cc-by-sa
+models/cuboid/concrete/concrete.jpg   Randy Reddig @ shaderlab.com               shaderlab*
+models/cuboid/concrete/fragment.tga   Randy Reddig @ shaderlab.com, theinvsblman shaderlab*
+models/cuboid/cracks*                 theinvsblman                               cc-by
+models/cuboid/cuboid.md3              theinvsblman                               cc-by
+models/cuboid/glass/fragment.tga      theinvsblman                               cc-by
+models/cuboid/glass/glass.jpg         theinvsblman                               cc-by
+models/cuboid/ladder/fragment.tga     Randy Reddig @ shaderlab.com, theinvsblman shaderlab*
+models/cuboid/ladder/ladder.jpg       Randy Reddig @ shaderlab.com               shaderlab*
+models/cuboid/organic/fragment.tga    Darklegion Development, theinvsblman       cc-by-sa
+models/cuboid/organic/organic.jpg     Darklegion Development, theinvsblman       cc-by-sa
+models/cuboid/organic/organic_fx.jpg  Darklegion Development, theinvsblman       cc-by-sa
+models/cuboid/slime/fragment.tga      theinvsblman                               cc-by
+models/cuboid/slime/slime.jpg         theinvsblman                               cc-by
+models/players/human_base/h_helmet... theinvsblman                               cc0
+models/players/human_base/head_lig... Darklegion Development, theinvsblman       cc-by-sa
+models/weapons/flamer/fireloop_qui... Darklegion Development, theinvsblman       cc-by-sa
+models/weapons/flamer/weapon.cfg      Darklegion Development, theinvsblman       cc-by-sa
+models/weapons/level2upg/zap1.wav     Halleck @ freesound.org                    cc-by
+models/weapons/level2upg/zap_conti... DJ Chronos @ freesound.org                 cc-by
+models/weapons/level2upg/weapon.cfg   Darklegion Development, theinvsblman       cc-by-sa
+models/weapons/level4/weapon.cfg      Darklegion Development, theinvsblman       cc-by-sa
+scripts/*                             theinvsblman                               cc-by
+sound/cuboid/axischange.wav           Ongitak @ freesound.org                    cc-by
+sound/cuboid/concrete/dstr0.wav       Michael Manzke @ freesound.org             cc-by-nc
+sound/cuboid/concrete/pain0.wav       Benboncan @ freesound.org                  cc-by
+sound/cuboid/concrete/pain1.wav       Benboncan @ freesound.org                  cc-by
+sound/cuboid/error.wav                Ludovic Kierasinski @ freesound.org        cc-by
+sound/cuboid/glass/dstr0.wav          Tomlija @ freesound.org                    cc-by
+sound/cuboid/glass/dstr1.wav          Richard Frohlich @ freesound.org           cc-by
+sound/cuboid/glass/dstr2.wav          Rock Savage @ freesound.org                sampling+
+sound/cuboid/glass/pain0.wav          RHumphries @ freesound.org                 cc-by
+sound/cuboid/glass/pain1.wav          RHumphries @ freesound.org                 cc-b
+sound/cuboid/glass/pain2.wav          RHumphries @ freesound.org                 cc-by
+sound/cuboid/ladder/dstr0.wav         sagetyrtle @ freesound.org                 cc0
+sound/cuboid/ladder/pain0.wav         sagetyrtle @ freesound.org                 cc0
+sound/cuboid/ladder/pain1.wav         sagetyrtle @ freesound.org                 cc0
+sound/cuboid/organic/dstr0.wav        Michael Manzke @ freesound.org             cc-by-nc
+sound/cuboid/organic/dstr1.wav        aust_paul @ freesound.org                  sampling+
+sound/cuboid/organic/dstr2.wav        Michael Manzke @ freesound.org, Redman     cc-by-nc
+sound/cuboid/organic/pain0.wav        Michael Manzke @ freesound.org             cc-by
+sound/cuboid/organic/pain1.wav        Michael Manzke @ freesound.org             cc-by
+sound/cuboid/organic/pain2.wav        Michael Manzke @ freesound.org             cc-by
+sound/cuboid/resizea.wav              djgriffin @ freesound.org                  cc-by-nc
+sound/cuboid/resizeb.wav              djgriffin @ freesound.org                  cc-by-nc
+sound/cuboid/rotate.wav               djgriffin @ freesound.org                  cc-by-nc
+sound/cuboid/slime/dstr0.wav          Michael Manzke @ freesound.org             cc-by
+sound/cuboid/slime/dstr1.wav          Audionautics @ freesound.org               cc-by
+sound/cuboid/slime/pain0.wav          anechoix @ freesound.org                   cc-by-nc
+sound/cuboid/slime/pain1.wav          anechoix @ freesound.org                   cc-by-nc
+sound/upgrades/jetpack/hi.wav         Pikachu                                    cc0
+sound/upgrades/jetpack/idle.wav       Pikachu                                    cc0
+sound/upgrades/jetpack/low.wav        Pikachu                                    cc0
+sound/upgrades/jetpack/jump.wav       alexmol @ freesound.org, Q009,
+                                      Pikachu                                    cc-by-sa 3
+sound/upgrades/jetpack/lowfuel.wav    Pikachu                                    cc0
+sound/upgrades/jetpack/nojumpfuel.wav Pikachu                                    cc0 
+sound/upgrades/jetpack/refuel.wav     joeseshon @ freesound.org, 
+                                      alexmol @ freesound.org, Pikachu           cc-by
+ui/help.txt                           theinvsblman                               cc-by
+ui/ingame_options.menu                Darklegion Development, theinvsblman       cc-by-sa
+vm/*.qvm                              authors denoted in Programming section     GPL
+
+
+
+Following files come from the original Tremulous GPP release and are not part of the Cuboid mod. All of them were made by Darklegion Development and are licensed under the terms of CC-BY-SA.
+
+scripts/weapons.shader, scripts/crosshairs.shader, scripts/mdriver.trail, scripts/misc.particle, scripts/weapons.particle, scripts/ui.shader, sound/buildables/barricade, sound/buildables/barricade/sound.cfg, ui/tremulous_teamselect.menu, ui/main.menu, ui/ingame_help.menu, ui/tremulous_alienclass.menu, ui/tremulous_dialogs.menu, ui/password.menu, ui/tremulous.txt, ui/tremulous_alien_common_hud.h, ui/tremulous_alienupgrade.menu, ui/tremulous_common_hud.h, ui/say.menu, ui/menus.txt, ui/createserver.menu, ui/menudef.h, ui/download.menu, ui/ingame.txt, ui/news.menu, ui/mod.menu, ui/tremulous_aliendialogs.menu, ui/tremulous_human_hud.menu, ui/ingame.menu, ui/demo.menu, ui/serverinfo.menu, ui/connect.menu, ui/tremulous_humanbuild.menu, ui/quit.menu, ui/findplayer.menu, ui/error.menu, ui/hud.txt, ui/joinserver.menu, ui/ingame_game.menu, ui/tremulous_default_hud.menu, ui/tremulous_alien_builder_hud.menu, ui/quitcredit.menu, ui/drop.menu, ui/teamscore.menu, ui/tremulous_alienbuild.menu, ui/tremulous_humanarmoury.menu, ui/ingame_leave.menu, ui/loading.menu, ui/tremulous_humandialogs.menu, ui/tremulous_alien_general_hud.menu, ui/tremulous_humanitem.menu, ui/createfavorite.menu, ui/assets/human/buildstat.cfg, ui/assets/alien/buildstat.cfg, ui/options.menu, models/players/level1/animation.cfg, models/players/human_bsuit/locdamage.cfg, models/players/human_base/locdamage.cfg, models/weapons/level3upg/weapon.cfg, models/weapons/level2, models/weapons/level2/weapon.cfg, models/weapons/level1upg/weapon.cfg, models/weapons/level1/weapon.cfg, models/weapons/abuildupg/weapon.cfg, models/weapons/abuild/weapon.cfg, level0/weapon.cfg,models/weapons/psaw/weapon.cfg, models/weapons/prifle/weapon.cfg, models/weapons/level3/weapon.cfg, models/weapons/mdriver/weapon.cfg, models/weapons/lcannon/weapon.cfg, models/buildables/mgturret, models/buildables/mgturret/animation.cfg, models/buildables/barricade/animation.cfg, models/buildables/acid_tube/animation.cfg, models/buildables/tesla/animation.cfg, models/buildables/repeater/animation.cfg, models/buildables/medistat/animation.cfg, configs/classes/level2upg.cfg, configs/classes/builder.cfg, configs/classes/builderupg.cfg, configs/classes/level4.cfg, configs/classes/spectator.cfg, configs/classes/level1upg.cfg, configs/classes/level3upg.cfg, configs/classes/level0.cfg, configs/classes/level3.cfg, configs/classes/level2.cfg, configs/classes/level1.cfg, configs/classes/human_bsuit.cfg, configs/classes/human_base.cfg, configs/buildables/eggpod.cfg, configs/buildables/hive.cfg, configs/buildables/hovel.cfg, configs/buildables/dcc.cfg, configs/buildables/telenode.cfg, configs/buildables/trapper.cfg, configs/buildables/tesla.cfg, configs/buildables/barricade.cfg, configs/buildables/repeater.cfg, configs/buildables/reactor.cfg, configs/buildables/medistat.cfg, configs/buildables/overmind.cfg, configs/buildables/arm.cfg, configs/buildables/booster.cfg, configs/buildables/acid_tube.cfg, configs/buildables/mgturret.cfg, armour/larmour.armour, armour/helmet.armour, armour/bsuit.armour
+
+Terms of the Creative Commons licenses (includes the Sampling Plus license) can be found at: http://creativecommons.org/licenses/.
+
+Terms of the Bitstream Vera Fonts Copyright can be found at: http://dejavu-fonts.org/wiki/License.
+
+shaderlab's copyright notice (http://shaderlab.com):
+______________________________________________________________________________
+Usage and redistribution policy: Textures may be freely downloaded, modified,
+and used in free maps, mods or total conversions provided this copyright notice
+is left intact and a link to Shaderlab is provided in the credits or read-me file.
+ther non-commercial applications are considered on a case-by-case basis via e-mail.
+All other usage requires written permission.  Bulk redistribution or archival of
+the textures in any medium, digital or otherwise (except mapping packages for mods)
+is prohibited.
diff --git a/assets/cuboid/logo_0.tga b/assets/cuboid/logo_0.tga
new file mode 100644
index 0000000..122bfd8
--- /dev/null
+++ b/assets/cuboid/logo_0.tga
diff --git a/assets/cuboid/logo_1.tga b/assets/cuboid/logo_1.tga
new file mode 100644
index 0000000..baef4a5
--- /dev/null
+++ b/assets/cuboid/logo_1.tga
diff --git a/assets/cuboid/logo_10.tga b/assets/cuboid/logo_10.tga
new file mode 100644
index 0000000..df61792
--- /dev/null
+++ b/assets/cuboid/logo_10.tga
diff --git a/assets/cuboid/logo_11.tga b/assets/cuboid/logo_11.tga
new file mode 100644
index 0000000..30c4a42
--- /dev/null
+++ b/assets/cuboid/logo_11.tga
diff --git a/assets/cuboid/logo_12.tga b/assets/cuboid/logo_12.tga
new file mode 100644
index 0000000..9028f30
--- /dev/null
+++ b/assets/cuboid/logo_12.tga
diff --git a/assets/cuboid/logo_13.tga b/assets/cuboid/logo_13.tga
new file mode 100644
index 0000000..0ac08f7
--- /dev/null
+++ b/assets/cuboid/logo_13.tga
diff --git a/assets/cuboid/logo_14.tga b/assets/cuboid/logo_14.tga
new file mode 100644
index 0000000..0acf716
--- /dev/null
+++ b/assets/cuboid/logo_14.tga
diff --git a/assets/cuboid/logo_2.tga b/assets/cuboid/logo_2.tga
new file mode 100644
index 0000000..aeacd82
--- /dev/null
+++ b/assets/cuboid/logo_2.tga
diff --git a/assets/cuboid/logo_3.tga b/assets/cuboid/logo_3.tga
new file mode 100644
index 0000000..25217f1
--- /dev/null
+++ b/assets/cuboid/logo_3.tga
diff --git a/assets/cuboid/logo_4.tga b/assets/cuboid/logo_4.tga
new file mode 100644
index 0000000..3fd17e2
--- /dev/null
+++ b/assets/cuboid/logo_4.tga
diff --git a/assets/cuboid/logo_5.tga b/assets/cuboid/logo_5.tga
new file mode 100644
index 0000000..03f3502
--- /dev/null
+++ b/assets/cuboid/logo_5.tga
diff --git a/assets/cuboid/logo_6.tga b/assets/cuboid/logo_6.tga
new file mode 100644
index 0000000..b49369b
--- /dev/null
+++ b/assets/cuboid/logo_6.tga
diff --git a/assets/cuboid/logo_7.tga b/assets/cuboid/logo_7.tga
new file mode 100644
index 0000000..28fd0b7
--- /dev/null
+++ b/assets/cuboid/logo_7.tga
diff --git a/assets/cuboid/logo_8.tga b/assets/cuboid/logo_8.tga
new file mode 100644
index 0000000..f80b23f
--- /dev/null
+++ b/assets/cuboid/logo_8.tga
diff --git a/assets/cuboid/logo_9.tga b/assets/cuboid/logo_9.tga
new file mode 100644
index 0000000..8cee3f9
--- /dev/null
+++ b/assets/cuboid/logo_9.tga
diff --git a/assets/cuboid/logo_left.tga b/assets/cuboid/logo_left.tga
new file mode 100644
index 0000000..a0a3ad1
--- /dev/null
+++ b/assets/cuboid/logo_left.tga
diff --git a/assets/cuboid/logo_right.tga b/assets/cuboid/logo_right.tga
new file mode 100644
index 0000000..840c638
--- /dev/null
+++ b/assets/cuboid/logo_right.tga
diff --git a/assets/emoticons/concrete_1x1.tga b/assets/emoticons/concrete_1x1.tga
new file mode 100644
index 0000000..aad8d48
--- /dev/null
+++ b/assets/emoticons/concrete_1x1.tga
diff --git a/assets/emoticons/cuboid_2x1.tga b/assets/emoticons/cuboid_2x1.tga
new file mode 100644
index 0000000..79253ad
--- /dev/null
+++ b/assets/emoticons/cuboid_2x1.tga
diff --git a/assets/emoticons/glass_1x1.tga b/assets/emoticons/glass_1x1.tga
new file mode 100644
index 0000000..0290bbd
--- /dev/null
+++ b/assets/emoticons/glass_1x1.tga
diff --git a/assets/emoticons/ladder_1x1.tga b/assets/emoticons/ladder_1x1.tga
new file mode 100644
index 0000000..24817a2
--- /dev/null
+++ b/assets/emoticons/ladder_1x1.tga
diff --git a/assets/emoticons/organic_1x1.tga b/assets/emoticons/organic_1x1.tga
new file mode 100644
index 0000000..bb316aa
--- /dev/null
+++ b/assets/emoticons/organic_1x1.tga
diff --git a/assets/emoticons/slime_1x1.tga b/assets/emoticons/slime_1x1.tga
new file mode 100644
index 0000000..c24d6c5
--- /dev/null
+++ b/assets/emoticons/slime_1x1.tga
diff --git a/assets/gfx/cuboid/build_axis.tga b/assets/gfx/cuboid/build_axis.tga
new file mode 100644
index 0000000..8af034c
--- /dev/null
+++ b/assets/gfx/cuboid/build_axis.tga
diff --git a/assets/gfx/cuboid/build_green.tga b/assets/gfx/cuboid/build_green.tga
new file mode 100644
index 0000000..c617732
--- /dev/null
+++ b/assets/gfx/cuboid/build_green.tga
diff --git a/assets/gfx/cuboid/build_green_fx.jpg b/assets/gfx/cuboid/build_green_fx.jpg
new file mode 100644
index 0000000..4374687
--- /dev/null
+++ b/assets/gfx/cuboid/build_green_fx.jpg
diff --git a/assets/gfx/cuboid/build_red.tga b/assets/gfx/cuboid/build_red.tga
new file mode 100644
index 0000000..0aa0744
--- /dev/null
+++ b/assets/gfx/cuboid/build_red.tga
diff --git a/assets/gfx/cuboid/build_red_fx.jpg b/assets/gfx/cuboid/build_red_fx.jpg
new file mode 100644
index 0000000..47d5676
--- /dev/null
+++ b/assets/gfx/cuboid/build_red_fx.jpg
diff --git a/assets/gfx/cuboid/build_yellow.tga b/assets/gfx/cuboid/build_yellow.tga
new file mode 100644
index 0000000..b6065e8
--- /dev/null
+++ b/assets/gfx/cuboid/build_yellow.tga
diff --git a/assets/gfx/cuboid/build_yellow_fx.jpg b/assets/gfx/cuboid/build_yellow_fx.jpg
new file mode 100644
index 0000000..2e3bf56
--- /dev/null
+++ b/assets/gfx/cuboid/build_yellow_fx.jpg
diff --git a/assets/gfx/cuboid/prebuild_alien.tga b/assets/gfx/cuboid/prebuild_alien.tga
new file mode 100644
index 0000000..d26c178
--- /dev/null
+++ b/assets/gfx/cuboid/prebuild_alien.tga
diff --git a/assets/icons/iconu_biokit.tga b/assets/icons/iconu_biokit.tga
new file mode 100644
index 0000000..46dbc10
--- /dev/null
+++ b/assets/icons/iconu_biokit.tga
diff --git a/assets/icons/iconu_helmet_mk2.tga b/assets/icons/iconu_helmet_mk2.tga
new file mode 100644
index 0000000..5139e90
--- /dev/null
+++ b/assets/icons/iconu_helmet_mk2.tga
diff --git a/assets/models/cuboid/concrete/concrete.jpg b/assets/models/cuboid/concrete/concrete.jpg
new file mode 100644
index 0000000..2d1fac2
--- /dev/null
+++ b/assets/models/cuboid/concrete/concrete.jpg
diff --git a/assets/models/cuboid/concrete/fragment.tga b/assets/models/cuboid/concrete/fragment.tga
new file mode 100644
index 0000000..57be801
--- /dev/null
+++ b/assets/models/cuboid/concrete/fragment.tga
diff --git a/assets/models/cuboid/cracks_0.jpg b/assets/models/cuboid/cracks_0.jpg
new file mode 100644
index 0000000..86b8e7b
--- /dev/null
+++ b/assets/models/cuboid/cracks_0.jpg
diff --git a/assets/models/cuboid/cracks_1.jpg b/assets/models/cuboid/cracks_1.jpg
new file mode 100644
index 0000000..11d6cc9
--- /dev/null
+++ b/assets/models/cuboid/cracks_1.jpg
diff --git a/assets/models/cuboid/cracks_2.jpg b/assets/models/cuboid/cracks_2.jpg
new file mode 100644
index 0000000..5f4665e
--- /dev/null
+++ b/assets/models/cuboid/cracks_2.jpg
diff --git a/assets/models/cuboid/cuboid.md3 b/assets/models/cuboid/cuboid.md3
new file mode 100644
index 0000000..d6c093c
--- /dev/null
+++ b/assets/models/cuboid/cuboid.md3
diff --git a/assets/models/cuboid/glass/fragment.jpg b/assets/models/cuboid/glass/fragment.jpg
new file mode 100644
index 0000000..cf5854a
--- /dev/null
+++ b/assets/models/cuboid/glass/fragment.jpg
diff --git a/assets/models/cuboid/glass/glass.jpg b/assets/models/cuboid/glass/glass.jpg
new file mode 100644
index 0000000..75275e7
--- /dev/null
+++ b/assets/models/cuboid/glass/glass.jpg
diff --git a/assets/models/cuboid/ladder/fragment.tga b/assets/models/cuboid/ladder/fragment.tga
new file mode 100644
index 0000000..10f7b29
--- /dev/null
+++ b/assets/models/cuboid/ladder/fragment.tga
diff --git a/assets/models/cuboid/ladder/ladder.jpg b/assets/models/cuboid/ladder/ladder.jpg
new file mode 100644
index 0000000..5ea3991
--- /dev/null
+++ b/assets/models/cuboid/ladder/ladder.jpg
diff --git a/assets/models/cuboid/organic/fragment.tga b/assets/models/cuboid/organic/fragment.tga
new file mode 100644
index 0000000..28f12c0
--- /dev/null
+++ b/assets/models/cuboid/organic/fragment.tga
diff --git a/assets/models/cuboid/organic/organic.jpg b/assets/models/cuboid/organic/organic.jpg
new file mode 100644
index 0000000..3aad4c0
--- /dev/null
+++ b/assets/models/cuboid/organic/organic.jpg
diff --git a/assets/models/cuboid/organic/organic_fx.jpg b/assets/models/cuboid/organic/organic_fx.jpg
new file mode 100644
index 0000000..b2ca34e
--- /dev/null
+++ b/assets/models/cuboid/organic/organic_fx.jpg
diff --git a/assets/models/cuboid/slime/fragment.tga b/assets/models/cuboid/slime/fragment.tga
new file mode 100644
index 0000000..f16641c
--- /dev/null
+++ b/assets/models/cuboid/slime/fragment.tga
diff --git a/assets/models/cuboid/slime/slime.jpg b/assets/models/cuboid/slime/slime.jpg
new file mode 100644
index 0000000..090fcaa
--- /dev/null
+++ b/assets/models/cuboid/slime/slime.jpg
diff --git a/assets/models/players/human_base/h_helmet_mk2.tga b/assets/models/players/human_base/h_helmet_mk2.tga
new file mode 100644
index 0000000..3ed95bd
--- /dev/null
+++ b/assets/models/players/human_base/h_helmet_mk2.tga
diff --git a/assets/models/players/human_base/head_light_mk2.skin b/assets/models/players/human_base/head_light_mk2.skin
new file mode 100644
index 0000000..3d18999
--- /dev/null
+++ b/assets/models/players/human_base/head_light_mk2.skin
@@ -0,0 +1,3 @@
+tag_head,
+h_head_base,models/players/human_base/h_base
+h_head_helmet,models/players/human_base/h_helmet_mk2
diff --git a/assets/models/weapons/flamer/fireloop_quieter.wav b/assets/models/weapons/flamer/fireloop_quieter.wav
new file mode 100644
index 0000000..3bff2c8
--- /dev/null
+++ b/assets/models/weapons/flamer/fireloop_quieter.wav
diff --git a/assets/models/weapons/flamer/weapon.cfg b/assets/models/weapons/flamer/weapon.cfg
new file mode 100644
index 0000000..8b2704c
--- /dev/null
+++ b/assets/models/weapons/flamer/weapon.cfg
@@ -0,0 +1,20 @@
+weaponModel         models/weapons/flamer/flamer.md3
+icon                icons/iconw_flamer
+crosshair           64 gfx/2d/crosshair-flamer_s
+
+primary
+{
+  missileSound          models/weapons/flamer/fireloop_quieter.wav
+  firingSound           models/weapons/flamer/fireloop.wav
+
+  flashDlightColor      0.25 0.1 0.0
+  continuousFlash
+
+  missileDlightColor    0.25 0.1 0.0
+  missileDlight         200
+
+  impactMark            32 gfx/marks/burn_mrk
+  impactSound           0 models/weapons/flamer/fireimpc.wav
+
+  muzzleParticleSystem  models/weapons/flamer/muzzlePS
+}
diff --git a/assets/models/weapons/level2upg/weapon.cfg b/assets/models/weapons/level2upg/weapon.cfg
index 7a1f26c..5a7d6d4 100755..100644
--- a/assets/models/weapons/level2upg/weapon.cfg
+++ b/assets/models/weapons/level2upg/weapon.cfg
@@ -12,7 +12,8 @@ primary
 
 secondary
 {
-  flashSound        0 models/weapons/level2upg/electric.wav
+  flashSound        0 models/weapons/level2upg/zap1.wav
+  firingSound       models/weapons/level2upg/zap_continuous.wav
 
   impactMark        24 gfx/marks/plasma_mrk
 }
diff --git a/assets/models/weapons/level2upg/zap1.wav b/assets/models/weapons/level2upg/zap1.wav
new file mode 100644
index 0000000..0284f1d
--- /dev/null
+++ b/assets/models/weapons/level2upg/zap1.wav
diff --git a/assets/models/weapons/level2upg/zap_continuous.wav b/assets/models/weapons/level2upg/zap_continuous.wav
new file mode 100644
index 0000000..ab08b8c
--- /dev/null
+++ b/assets/models/weapons/level2upg/zap_continuous.wav
diff --git a/assets/models/weapons/level4/weapon.cfg b/assets/models/weapons/level4/weapon.cfg
index b890af1..1a44de0 100755..100644
--- a/assets/models/weapons/level4/weapon.cfg
+++ b/assets/models/weapons/level4/weapon.cfg
@@ -9,3 +9,15 @@ primary
   impactFleshSound  0 models/weapons/level4/impactflesh0.wav
   alwaysImpact
 }
+
+tertiary
+{
+  flashSound        0 models/weapons/level3upg/flash0.wav
+
+  missileModel      models/weapons/level3upg/missile.md3
+  missileSound      models/weapons/level3upg/missile.wav
+
+  impactMark        30 gfx/marks/bullet_mrk
+  impactSound       0 models/weapons/rifle/ricochet0.wav
+  impactParticleSystem          models/weapons/level3upg/impactPS
+}
diff --git a/assets/scripts/cuboid.shader b/assets/scripts/cuboid.shader
new file mode 100644
index 0000000..e75ef7d
--- /dev/null
+++ b/assets/scripts/cuboid.shader
@@ -0,0 +1,256 @@
+/* This is a shader file for Cuboid Tremulous 1.2 mod.
+ *
+ * Textures:  cuboids/tex/<name>
+ *            cuboids/tex/<name>_<frame>  : for cuboids with their own animation
+ *
+ * G. anim.:  cuboids/fx/ga_<frame>
+ *
+ * Particles: cuboids/fx/ps_<name>
+ */
+
+/*  CUBOID PARTICLE SHADER
+ * These shaders are used for particle systems
+ * that are displayed when a cuboid dies.
+ */
+models/cuboid/concrete/fragment
+{
+ {
+  map models/cuboid/concrete/fragment.tga
+  alphaFunc GE128
+ }
+}
+
+models/cuboid/glass/fragment
+{
+ {
+  map models/cuboid/glass/fragment.jpg
+  blendFunc filter
+ }
+}
+
+models/cuboid/ladder/fragment
+{
+ {
+  map models/cuboid/ladder/fragment.tga
+  alphaFunc GE128
+ }
+}
+
+models/cuboid/organic/fragment
+{
+ {
+  map models/cuboid/organic/fragment.tga
+  alphaFunc GE128
+ }
+}
+
+models/cuboid/slime/fragment
+{
+ {
+  map models/cuboid/slime/fragment.tga
+  alphaFunc GE128
+ }
+}
+
+/*  CUBOID BUILDING SHADERS
+ * These shaders appear on ghost model while
+ * placing a cuboid. Red and green colours work
+ * the same as regular building shaders. Yellow
+ * colour is used after resizing to indicate, that
+ * server hasn't responded to our cuboid resizing
+ * command yet. 
+ *
+ * cuboids/build_axis shader shows rotation/scaling
+ * axis on ghost model.
+ */
+gfx/cuboid/build_red
+{
+ nopicmip
+ nomipmaps
+ cull none
+ {
+  map gfx/cuboid/build_red.tga
+  alphaFunc GE128
+ }
+ {
+  map gfx/cuboid/build_red_fx.jpg
+  blendFunc add
+ }
+}
+
+gfx/cuboid/build_yellow
+{
+ nopicmip
+ nomipmaps
+ cull none
+ {
+  map gfx/cuboid/build_yellow.tga
+  alphaFunc GE128
+ }
+ {
+  map gfx/cuboid/build_yellow_fx.jpg
+  blendFunc add
+ }
+}
+
+gfx/cuboid/build_green
+{
+ nopicmip
+ nomipmaps
+ cull none
+ {
+  map gfx/cuboid/build_green.tga
+  alphaFunc GE128
+ }
+ {
+  map gfx/cuboid/build_green_fx.jpg
+  blendFunc add
+ }
+}
+
+gfx/cuboid/build_axis
+{
+ nopicmip
+ nomipmaps
+ cull none
+ {
+  map gfx/cuboid/build_axis.tga
+  alphaFunc GE128
+ }
+}
+
+/*  GENERIC DESTRUCTION ANIMATION SHADERS
+ * These shaders are applied on model if the
+ * cuboid is damaged.
+ */
+models/cuboid/cracks_0
+{
+ {
+  map models/cuboid/cracks_0.jpg
+  blendFunc filter
+ }
+}
+
+models/cuboid/cracks_1
+{
+ {
+  map models/cuboid/cracks_1.jpg
+  blendFunc filter
+ }
+}
+
+models/cuboid/cracks_2
+{
+ {
+  map models/cuboid/cracks_2.jpg
+  blendFunc filter
+ }
+}
+
+/*  CUBOID-SPECIFIC TEXTURES
+ * These shaders are applied to cuboid's model.
+ */
+
+models/cuboid/glass/glass
+{
+ {
+  map models/cuboid/glass/glass
+  blendFunc filter
+  rgbGen lightingDiffuse
+ }
+}
+
+models/cuboid/concrete/concrete
+{
+ {
+  map models/cuboid/concrete/concrete.jpg
+  rgbGen lightingDiffuse
+ }
+}
+
+models/cuboid/ladder/ladder
+{
+ {
+  map models/cuboid/ladder/ladder.jpg
+  rgbGen lightingDiffuse
+ }
+}
+
+models/cuboid/organic/organic
+{
+ {
+  map models/cuboid/organic/organic.jpg
+  rgbGen lightingDiffuse
+ }
+}
+models/cuboid/organic/organic_1
+{
+ {
+  map models/cuboid/organic/organic.jpg
+  rgbGen lightingDiffuse
+ }
+ {
+  map models/cuboid/organic/organic_fx.jpg
+  blendFunc add
+  rgbGen wave sin 0.2 0.1 0 0.1
+ }
+}
+
+models/cuboid/organic/organic_2
+{
+ {
+  map models/cuboid/organic/organic.jpg
+  rgbGen lightingDiffuse
+ }
+ {
+  map models/cuboid/organic/organic_fx.jpg
+  blendFunc add
+  rgbGen wave sin 0.4 0.15 0 0.14
+ }
+}
+
+models/cuboid/organic/organic_3
+{
+ {
+  map models/cuboid/organic/organic.jpg
+  rgbGen lightingDiffuse
+ }
+ {
+  map models/cuboid/organic/organic_fx.jpg
+  blendFunc add
+  rgbGen wave sin 0.8 0.2 0 0.19
+ }
+}
+
+models/cuboid/slime/slime
+{
+ {
+  map models/cuboid/slime/slime.jpg
+  rgbGen lightingDiffuse
+  tcMod turb 0.75 0.25 0 0.07
+  tcGen environment
+ }
+}
+
+/*  MISCELLANEOUS SHADERS
+ * Various shaders used for various purposes.
+ */
+gfx/cuboid/prebuild_alien
+{
+ cull none
+ {
+  map gfx/cuboid/prebuild_alien.tga
+  alphaFunc GE128
+  tcMod turb 0.9 0.1 0 0.1
+  tcMod scroll 0.05 -0.08
+  tcMod rotate 7
+ }
+ {
+  map gfx/cuboid/prebuild_alien.tga
+  alphaFunc GE128
+  tcMod turb 0.9 0.1 0.5 0.1
+  tcMod scroll -0.03 0.07
+  tcMod rotate -3
+ }
+}
+
diff --git a/assets/sound/cuboid/axischange.wav b/assets/sound/cuboid/axischange.wav
new file mode 100644
index 0000000..27bcea1
--- /dev/null
+++ b/assets/sound/cuboid/axischange.wav
diff --git a/assets/sound/cuboid/concrete/dstr0.wav b/assets/sound/cuboid/concrete/dstr0.wav
new file mode 100644
index 0000000..71e4b53
--- /dev/null
+++ b/assets/sound/cuboid/concrete/dstr0.wav
diff --git a/assets/sound/cuboid/concrete/pain0.wav b/assets/sound/cuboid/concrete/pain0.wav
new file mode 100644
index 0000000..a20f760
--- /dev/null
+++ b/assets/sound/cuboid/concrete/pain0.wav
diff --git a/assets/sound/cuboid/concrete/pain1.wav b/assets/sound/cuboid/concrete/pain1.wav
new file mode 100644
index 0000000..e6b8cb7
--- /dev/null
+++ b/assets/sound/cuboid/concrete/pain1.wav
diff --git a/assets/sound/cuboid/concrete/pain2.wav b/assets/sound/cuboid/concrete/pain2.wav
new file mode 100644
index 0000000..d4d5383
--- /dev/null
+++ b/assets/sound/cuboid/concrete/pain2.wav
diff --git a/assets/sound/cuboid/error.wav b/assets/sound/cuboid/error.wav
new file mode 100644
index 0000000..505ab10
--- /dev/null
+++ b/assets/sound/cuboid/error.wav
diff --git a/assets/sound/cuboid/glass/dstr0.wav b/assets/sound/cuboid/glass/dstr0.wav
new file mode 100644
index 0000000..6423949
--- /dev/null
+++ b/assets/sound/cuboid/glass/dstr0.wav
diff --git a/assets/sound/cuboid/glass/dstr1.wav b/assets/sound/cuboid/glass/dstr1.wav
new file mode 100644
index 0000000..2919f74
--- /dev/null
+++ b/assets/sound/cuboid/glass/dstr1.wav
diff --git a/assets/sound/cuboid/glass/dstr2.wav b/assets/sound/cuboid/glass/dstr2.wav
new file mode 100644
index 0000000..9a67c26
--- /dev/null
+++ b/assets/sound/cuboid/glass/dstr2.wav
diff --git a/assets/sound/cuboid/glass/pain0.wav b/assets/sound/cuboid/glass/pain0.wav
new file mode 100644
index 0000000..4ff4667
--- /dev/null
+++ b/assets/sound/cuboid/glass/pain0.wav
diff --git a/assets/sound/cuboid/glass/pain1.wav b/assets/sound/cuboid/glass/pain1.wav
new file mode 100644
index 0000000..f8bd4af
--- /dev/null
+++ b/assets/sound/cuboid/glass/pain1.wav
diff --git a/assets/sound/cuboid/glass/pain2.wav b/assets/sound/cuboid/glass/pain2.wav
new file mode 100644
index 0000000..2672adc
--- /dev/null
+++ b/assets/sound/cuboid/glass/pain2.wav
diff --git a/assets/sound/cuboid/ladder/dstr0.wav b/assets/sound/cuboid/ladder/dstr0.wav
new file mode 100644
index 0000000..82efbdb
--- /dev/null
+++ b/assets/sound/cuboid/ladder/dstr0.wav
diff --git a/assets/sound/cuboid/ladder/pain0.wav b/assets/sound/cuboid/ladder/pain0.wav
new file mode 100644
index 0000000..67274a3
--- /dev/null
+++ b/assets/sound/cuboid/ladder/pain0.wav
diff --git a/assets/sound/cuboid/ladder/pain1.wav b/assets/sound/cuboid/ladder/pain1.wav
new file mode 100644
index 0000000..8a136ff
--- /dev/null
+++ b/assets/sound/cuboid/ladder/pain1.wav
diff --git a/assets/sound/cuboid/organic/dstr0.wav b/assets/sound/cuboid/organic/dstr0.wav
new file mode 100644
index 0000000..5e3af78
--- /dev/null
+++ b/assets/sound/cuboid/organic/dstr0.wav
diff --git a/assets/sound/cuboid/organic/dstr1.wav b/assets/sound/cuboid/organic/dstr1.wav
new file mode 100644
index 0000000..13c3feb
--- /dev/null
+++ b/assets/sound/cuboid/organic/dstr1.wav
diff --git a/assets/sound/cuboid/organic/dstr2.wav b/assets/sound/cuboid/organic/dstr2.wav
new file mode 100644
index 0000000..f63a602
--- /dev/null
+++ b/assets/sound/cuboid/organic/dstr2.wav
diff --git a/assets/sound/cuboid/organic/pain0.wav b/assets/sound/cuboid/organic/pain0.wav
new file mode 100644
index 0000000..be8eacd
--- /dev/null
+++ b/assets/sound/cuboid/organic/pain0.wav
diff --git a/assets/sound/cuboid/organic/pain1.wav b/assets/sound/cuboid/organic/pain1.wav
new file mode 100644
index 0000000..2d9effa
--- /dev/null
+++ b/assets/sound/cuboid/organic/pain1.wav
diff --git a/assets/sound/cuboid/organic/pain2.wav b/assets/sound/cuboid/organic/pain2.wav
new file mode 100644
index 0000000..4e31e0e
--- /dev/null
+++ b/assets/sound/cuboid/organic/pain2.wav
diff --git a/assets/sound/cuboid/resizea.wav b/assets/sound/cuboid/resizea.wav
new file mode 100644
index 0000000..91cd157
--- /dev/null
+++ b/assets/sound/cuboid/resizea.wav
diff --git a/assets/sound/cuboid/resizeb.wav b/assets/sound/cuboid/resizeb.wav
new file mode 100644
index 0000000..373bdfd
--- /dev/null
+++ b/assets/sound/cuboid/resizeb.wav
diff --git a/assets/sound/cuboid/rotate.wav b/assets/sound/cuboid/rotate.wav
new file mode 100644
index 0000000..82efa63
--- /dev/null
+++ b/assets/sound/cuboid/rotate.wav
diff --git a/assets/sound/cuboid/slime/dstr0.wav b/assets/sound/cuboid/slime/dstr0.wav
new file mode 100644
index 0000000..23ac05a
--- /dev/null
+++ b/assets/sound/cuboid/slime/dstr0.wav
diff --git a/assets/sound/cuboid/slime/dstr1.wav b/assets/sound/cuboid/slime/dstr1.wav
new file mode 100644
index 0000000..b1d77d6
--- /dev/null
+++ b/assets/sound/cuboid/slime/dstr1.wav
diff --git a/assets/sound/cuboid/slime/pain0.wav b/assets/sound/cuboid/slime/pain0.wav
new file mode 100644
index 0000000..139ca41
--- /dev/null
+++ b/assets/sound/cuboid/slime/pain0.wav
diff --git a/assets/sound/cuboid/slime/pain1.wav b/assets/sound/cuboid/slime/pain1.wav
new file mode 100644
index 0000000..fc17839
--- /dev/null
+++ b/assets/sound/cuboid/slime/pain1.wav
diff --git a/assets/sound/upgrades/jetpack/hi.wav b/assets/sound/upgrades/jetpack/hi.wav
new file mode 100644
index 0000000..cddab08
--- /dev/null
+++ b/assets/sound/upgrades/jetpack/hi.wav
diff --git a/assets/sound/upgrades/jetpack/hi_off.wav b/assets/sound/upgrades/jetpack/hi_off.wav
new file mode 100644
index 0000000..52231b6
--- /dev/null
+++ b/assets/sound/upgrades/jetpack/hi_off.wav
diff --git a/assets/sound/upgrades/jetpack/idle.wav b/assets/sound/upgrades/jetpack/idle.wav
new file mode 100644
index 0000000..20185bd
--- /dev/null
+++ b/assets/sound/upgrades/jetpack/idle.wav
diff --git a/assets/sound/upgrades/jetpack/idle_off.wav b/assets/sound/upgrades/jetpack/idle_off.wav
new file mode 100644
index 0000000..2b0cfbb
--- /dev/null
+++ b/assets/sound/upgrades/jetpack/idle_off.wav
diff --git a/assets/sound/upgrades/jetpack/jump.wav b/assets/sound/upgrades/jetpack/jump.wav
new file mode 100644
index 0000000..ee2e0b7
--- /dev/null
+++ b/assets/sound/upgrades/jetpack/jump.wav
diff --git a/assets/sound/upgrades/jetpack/low.wav b/assets/sound/upgrades/jetpack/low.wav
new file mode 100644
index 0000000..8894227
--- /dev/null
+++ b/assets/sound/upgrades/jetpack/low.wav
diff --git a/assets/sound/upgrades/jetpack/low_off.wav b/assets/sound/upgrades/jetpack/low_off.wav
new file mode 100644
index 0000000..59bc7ad
--- /dev/null
+++ b/assets/sound/upgrades/jetpack/low_off.wav
diff --git a/assets/sound/upgrades/jetpack/lowfuel.wav b/assets/sound/upgrades/jetpack/lowfuel.wav
new file mode 100644
index 0000000..b6080d7
--- /dev/null
+++ b/assets/sound/upgrades/jetpack/lowfuel.wav
diff --git a/assets/sound/upgrades/jetpack/nojumpfuel.wav b/assets/sound/upgrades/jetpack/nojumpfuel.wav
new file mode 100644
index 0000000..84ca669
--- /dev/null
+++ b/assets/sound/upgrades/jetpack/nojumpfuel.wav
diff --git a/assets/sound/upgrades/jetpack/refuel.wav b/assets/sound/upgrades/jetpack/refuel.wav
new file mode 100644
index 0000000..dc01c1e
--- /dev/null
+++ b/assets/sound/upgrades/jetpack/refuel.wav
diff --git a/assets/ui/help.txt b/assets/ui/help.txt
index bd4c6a3..cda9432 100755..100644
--- a/assets/ui/help.txt
+++ b/assets/ui/help.txt
@@ -1,135 +1,11 @@
 {
-  "^3Welcome^7"
-  {
-    "In this section you will find a summary of major changes since 1.1. It is "
-    "not a complete list. In general, all things have been tweaked for balance in "
-    "some way.\n\n"
-    "We hope you enjoy playing. Your support gives us valuable data and "
-    "feedback as we work to bring you Tremulous 1.2. Please report all bugs. Thank "
-    "you."
-  }
-  "Alien Healing"
-  {
-    "The most important change for Alien players to know is that their healing "
-    "rate is slower away from creep. To counter this, healing near Boosters "
-    "and Basilisks is greatly accelerated.\n\n"
-    "Watch the health cross icon on your "
-    "HUD to see what your healing rate is. If the icon glows, you are on "
-    "creep. If you are near a booster or basilisk, you will see two "
-    "(2X healing) or four (3X healing) barbs around the health cross."
-  }
-  "Build-point Changes"
-  {
-    "Structures destroyed by enemy players will not immediately become available "
-    "for reuse, but instead enter a queue. Build points will gradually leave the "
-    "queue to become available again, at a rate proportional to the amount of "
-    "points in the queue.\n\n Repeaters can be built at any stage and come with 20 "
-    "BP that can only be used nearby to facilitate making small outposts. Aliens "
-    "do not have a structure that provides additional buildpoints, but they have 150 "
-    "overall BP to compensate."
-  }
-  "Marked Deconstruction"
-  {
-    "The deconstruction method has changed. Buildables are no longer instantly "
-    "deconstructed. Instead, a deconstruct mark appears on the health bar. "
-    "Go ahead and build a new buildable somewhere else and the old one will "
-    "be removed automatically. Buildables that are about to be removed by "
-    "constructing the selected buildable glow red."
-  }
-  "Alien Buildables"
-  {
-    "Nearly useless in 1.1, Barricades now have more health, are cheaper to "
-    "build, and will shrink to allow Aliens to pass over them. Acid tubes "
-    "will fire from behind barricades, providing a formidable defense. "
-    "Experiment with blocking off hallways and building staged defenses, but "
-    "keep in mind that low ceilings will prevent Tyrants from returning inside "
-    "the base. Hives are also much improved to become worth building in stage 3."
-  }
-  "Human Buildables"
-  {
-    "Turrets now have a small spin up delay before firing, but they have "
-    "increased range and damage output.\n\n"
-    "To protect against small Aliens getting inside "
-    "the base, build Tesla Generators at Stage 3. Tesla Generators no longer "
-    "require the Defense Computer to function. Instead, the Defense Computer "
-    "will automatically repair Human buildables. Tesla Generators can fire "
-    "over turrets. "
-  }
-  "Human Weapons"
-  {
-    "Most of the human projeciles have a small volume now, making them more "
-    "effective against smaller targets.\n"
-    "The Lucifer Cannon projectile can be fired faster but now takes longer "
-    "to charge. You will be able to hear your teammates overcharge "
-    "their Lucifer Cannon.\n"
-    "The Flamer projectile now gains more of the velocity of its wielder, "
-    "making it easier to chase down aliens without burning yourself to a "
-    "crisp. Other weapons also have smaller changes."
-  }
-  "Lag Correction"
-  {
-    "While the Tremulous implementation of Neil Toronto's unlagged is "
-    "becoming widely accepted, we also implement client-side improvements "
-    "not possible in 1.1 servers. For those who insist on leading their "
-    "attacks, setting cg_unlagged to 0 will disable backward reconcilliation "
-    "on your hitscan weapons."
-  }
-  "Sprint"
-  {
-    "The sprint bind has changed from \"boost\" to \"+button8\"; you can bind it "
-    "in the options menu or in the console (\\bind shift +button8). Now, instead "
-    "of tapping the button while moving to start sprinting, just hold it down "
-    "and let go to stop. Alternately, you can change this to a toggle behavior "
-    "with cg_sprintToggle. \n\n"
-  }
-  "Dodge"
-  {
-    "Humans also have a new movement ability: dodge. You can bind it in the "
-    "options menu or the console (\\bind shift +button6). When strafing or "
-    "walking backwards, press the dodge key to make a quick, low jump. You "
-    "can bind this to the same key as sprint in the console with \\bind shift "
-    "\"+button8; +button6\""
-  }
-  "Headshots"
-  {
-    "Headshots on unarmored humans only cause 150% damage. Battlesuit and "
-    "helmet protection have been reduced so headshot damage remains the same."
-  }
-  "Dretch"
-  {
-    "Dretches are slightly faster and can now damage any human structure while it "
-    "is still building, but can no longer damage turrets and teslas that "
-    "have been completed."
-  }
-  "Basilisk"
-  {
-    "Basilisks provide regeneration boosting auras to nearby teammates: 2x "
-    "from regular and 3x from advanced basilisks. Their footsteps are also "
-    "silent for greater stealth."
-  }
-  "Marauder"
-  {
-    "The Adv. Marauder's electric shock damage is no longer split between its "
-    "targets, making it more effective against large groups of humans and "
-    "buildables. Targets are now chosen slightly differently: instead of "
-    "each new chain section originating from the previous target, it will "
-    "originate from the first target."
-  }
-  "Dragoon"
-  {
-    "Advanced dragoons are now available at stage 2. Both dragoons have the "
-    "range of their chomp attacks lowered, but their pounce attacks are much "
-    "more useful. Try to use pounce to pin a human to the wall before chomping."
-  }
-  "Tyrant"
-  {
-    "The Tyrant is now a weaker class as its health has been lowered and "
-    "turret damage is greater. To counter this, Tyrants can charge for longer "
-    "periods of time, hit targets multiple times in a single charge, "
-    "and crush any Humans they land on top of. Trample charge does not "
-    "instantly release when full but can be held for two seconds. Trample "
-    "attacks on a human pinned against a wall are VERY powerful. Use this to "
-    "your advantage. The Tyrant's healing aura has been removed; find a "
-    "booster or a basilisk to heal faster."
+  "Cuboid 0.1.0"
+  {
+    "The help menu is not yet available."
+    "If you need help, refer to the tutorial on the left side of the screen, or ask an administrator.\n"
+    "The list of all changes and credits is in the mod's .pk3 in a file named credits.txt.\n"
+    "Forum: http://spiney.me/tremulous/index.php\n"
+    "IRC: #cuboid-trem @ irc.freenode.net\n"
+    "GitHub: https://github.com/enneract/cuboid\n"
   }
 }
diff --git a/assets/ui/ingame_options.menu b/assets/ui/ingame_options.menu
index f9f1478..1228b0e 100755..100644
--- a/assets/ui/ingame_options.menu
+++ b/assets/ui/ingame_options.menu
@@ -293,10 +293,11 @@
     {
       name player
       group optionsGrp
-      type ITEM_TYPE_YESNO
-      text "Static Death Cam:"
-      cvar "cg_staticDeathCam"
-      rect CONTENT_X (CONTENT_Y+(6*ELEM_H)) CONTENT_W ELEM_H
+      type ITEM_TYPE_MULTI
+      text "Mod Tutorial:"
+      cvar "cg_modTutorial"
+      cvarFloatList { "Enabled" 1 "Disabled" 0 }
+      rect CONTENT_X (CONTENT_Y+(7*ELEM_H)) CONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
       textalignx CONTENT_OFF
@@ -418,10 +419,9 @@
     {
       name hud
       group optionsGrp
-      type ITEM_TYPE_MULTI
+      type ITEM_TYPE_YESNO
       text "Show Team Overlay:"
       cvar "cg_drawTeamOverlay"
-      cvarFloatList { "Off" 0 "All Teammates" 1 "Support Teammates" 2 "Nearby Teammates" 3 }
       rect CONTENT_X (CONTENT_Y+(5*ELEM_H)) CONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
@@ -439,31 +439,10 @@
     {
       name hud
       group optionsGrp
-      type ITEM_TYPE_MULTI
-      text "Sort Team Overlay:"
-      cvar "cg_teamOverlaySortMode"
-      cvarFloatList { "None" 0 "Score" 1 "Weapon/Class" 2 }
-      rect CONTENT_X (CONTENT_Y+(6*ELEM_H)) CONTENT_W ELEM_H
-      textalign ALIGN_RIGHT
-      textvalign VALIGN_CENTER
-      textalignx CONTENT_OFF
-      textscale .25
-      forecolor 1 1 1 1
-      visible MENU_FALSE
-      action
-      {
-        play "sound/misc/menu1.wav";
-      }
-    }
-
-    itemDef
-    {
-      name hud
-      group optionsGrp
       type ITEM_TYPE_YESNO
       text "Show Gun:"
       cvar "cg_drawGun"
-      rect CONTENT_X (CONTENT_Y+(7*ELEM_H)) CONTENT_W ELEM_H
+      rect CONTENT_X (CONTENT_Y+(6*ELEM_H)) CONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
       textalignx CONTENT_OFF
@@ -484,7 +463,7 @@
       text "Show Speed:"
       cvar "cg_drawspeed"
       cvarFloatList { "No" 0 "Text" 1 "Graph" 2 "Text + Graph" 3 "Text No-Z" 5 "Graph No-Z" 6 "Text + Graph No-Z" 7 }
-      rect CONTENT_X (CONTENT_Y+(8*ELEM_H)) CONTENT_W ELEM_H
+      rect CONTENT_X (CONTENT_Y+(7*ELEM_H)) CONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
       textalignx CONTENT_OFF
@@ -504,7 +483,7 @@
       type ITEM_TYPE_YESNO
       text "Show FPS:"
       cvar "cg_drawFPS"
-      rect CONTENT_X (CONTENT_Y+(9*ELEM_H)) CONTENT_W ELEM_H
+      rect CONTENT_X (CONTENT_Y+(8*ELEM_H)) CONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
       textalignx CONTENT_OFF
@@ -524,7 +503,7 @@
       type ITEM_TYPE_YESNO
       text "Show Timer:"
       cvar "cg_drawTimer"
-      rect CONTENT_X (CONTENT_Y+(10*ELEM_H)) CONTENT_W ELEM_H
+      rect CONTENT_X (CONTENT_Y+(9*ELEM_H)) CONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
       textalignx CONTENT_OFF
@@ -544,7 +523,7 @@
       type ITEM_TYPE_YESNO
       text "Show Demo State:"
       cvar "cg_drawDemoState"
-      rect CONTENT_X (CONTENT_Y+(11*ELEM_H)) CONTENT_W ELEM_H
+      rect CONTENT_X (CONTENT_Y+(10*ELEM_H)) CONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
       textalignx CONTENT_OFF
@@ -1555,6 +1534,71 @@
         play "sound/misc/menu1.wav";
       }
     }
+
+//////// CHALLENGE-CUBOID
+
+    itemDef
+    {
+      name controls
+      text "Cuboid"
+      group optionsGrp
+      style WINDOW_STYLE_EMPTY
+      rect 0 ((2*BORDER)+TOPBUTT_H+(4*SIDEBUTT_H)) SIDEBUTT_W SIDEBUTT_H
+      type ITEM_TYPE_BUTTON
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      textscale .25
+      forecolor 1 1 1 1
+      visible MENU_FALSE
+      action
+      {
+        play "sound/misc/menu1.wav";
+        hide optionsGrp;
+        show controls;
+        show cuboid
+      }
+    }
+
+    itemDef
+    {
+      name cuboid
+      group optionsGrp
+      type ITEM_TYPE_BIND
+      text "Switch to another axis:"
+      cvar "cuboidAxis next"
+      rect SCONTENT_X (SCONTENT_Y+(0*ELEM_H)) SCONTENT_W ELEM_H
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      textalignx SCONTENT_OFF
+      textscale .25
+      forecolor 1 1 1 1
+      visible MENU_FALSE
+      action
+      {
+        play "sound/misc/menu1.wav";
+      }
+    }
+
+    itemDef
+    {
+      name cuboid
+      group optionsGrp
+      type ITEM_TYPE_BIND
+      text "Rotate cuboid around axis:"
+      cvar "cuboidRotate"
+      rect SCONTENT_X (SCONTENT_Y+(1*ELEM_H)) SCONTENT_W ELEM_H
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      textalignx SCONTENT_OFF
+      textscale .25
+      forecolor 1 1 1 1
+      visible MENU_FALSE
+      action
+      {
+        play "sound/misc/menu1.wav";
+      }
+    }
+
 //////// SYSTEM
 
     //System menu
@@ -2041,9 +2085,29 @@
       name gsoftware
       group optionsGrp
       type ITEM_TYPE_YESNO
+      text "Show Time:"
+      cvar "cg_drawTimer"
+      rect SCONTENT_X (SCONTENT_Y+(7*ELEM_H)) SCONTENT_W ELEM_H
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      textalignx SCONTENT_OFF
+      textscale .25
+      forecolor 1 1 1 1
+      visible MENU_TRUE
+      action
+      {
+        play "sound/misc/menu1.wav";
+      }
+    }
+
+    itemDef
+    {
+      name gsoftware
+      group optionsGrp
+      type ITEM_TYPE_YESNO
       text "In Game Videos:"
       cvar "r_inGameVideo"
-      rect SCONTENT_X (SCONTENT_Y+(7*ELEM_H)) SCONTENT_W ELEM_H
+      rect SCONTENT_X (SCONTENT_Y+(8*ELEM_H)) SCONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
       textalignx SCONTENT_OFF
@@ -2063,7 +2127,7 @@
       type ITEM_TYPE_YESNO
       text "Depth Sort Particles:"
       cvar "cg_depthSortParticles"
-      rect SCONTENT_X (SCONTENT_Y+(8*ELEM_H)) SCONTENT_W ELEM_H
+      rect SCONTENT_X (SCONTENT_Y+(9*ELEM_H)) SCONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
       textalignx SCONTENT_OFF
@@ -2084,7 +2148,7 @@
       text "Particle Physics:"
       cvar "cg_bounceParticles"
       cvarFloatList { "Low Quality" 0 "High Quality" 1 }
-      rect SCONTENT_X (SCONTENT_Y+(9*ELEM_H)) SCONTENT_W ELEM_H
+      rect SCONTENT_X (SCONTENT_Y+(10*ELEM_H)) SCONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
       textalignx SCONTENT_OFF
@@ -2105,7 +2169,7 @@
       text "Light Flares:"
       cvar "cg_lightFlare"
       cvarFloatList { "Off" 0 "No Fade" 1 "Timed Fade" 2 "Real Fade" 3 }
-      rect SCONTENT_X (SCONTENT_Y+(10*ELEM_H)) SCONTENT_W ELEM_H
+      rect SCONTENT_X (SCONTENT_Y+(11*ELEM_H)) SCONTENT_W ELEM_H
       textalign ALIGN_RIGHT
       textvalign VALIGN_CENTER
       textalignx SCONTENT_OFF