0.1.2 and code cleanup

7 files changed, 421 insertions, 3 deletions

diff --git a/assets/credits.txt b/assets/credits.txt
index 126f22e..21f6a68 100644
--- a/assets/credits.txt
+++ b/assets/credits.txt
@@ -6,6 +6,17 @@ Cuboid - a Tremulous 1.2 mod focused on cuboids and fixing balance issues.
 
 Version  Release date
 ______________________________________________________________________________________________
+0.1.2    Sep 09 2013
+GAMEPLAY
+- Wall impact effects no longer appear on players or buildables (the MD passing through players bug).
+- Now it takes longer for Biores to start healing after the human is hurt.
+NON-GAMEPLAY:
+- Added a death obituary for being killed with a rantbomb.
+- Replaced Turret spinup sound.
+- Turrets now play a sound after killing their target.
+- It's now possible to change the resizing speed for cuboids (via menu or cg.cuboidResizeRate).
+- Scoretable now displays high amounts of score properly.
+
 0.1.1    Sep 07 2013
 GAMEPLAY:
 - Rebalanced Cuboids.
@@ -13,7 +24,6 @@ GAMEPLAY:
 - Decreased jump stamina take by 40% (it's now possible to perform ca. 66% more jumps without replenishing stamina).
 - Limited the amount of Defense Computers that can simultaneously heal a single buildable.
 - Non-repairable cuboids (like concrete or glass) can no longer be healed by Defense Computers.
-- All cuboids are now non-solid while being built.
 NON-GAMEPLAY:
 - Added missing Human Impregnation Mod assets.
 - Updated Helmet Mk2's texture (still not final).
@@ -134,7 +144,8 @@ 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
-ui/menudef.h                          Darklegion Development                     cc-by-s
+ui/teamscore.menu                     Darklegion Development, theinvsblman       cc-by-sa
+ui/menudef.h                          Darklegion Development                     cc-by-sa
 vm/*.qvm                              authors denoted in Programming section     GPL
 
 Terms of the Creative Commons licenses (includes the Sampling Plus license) can be found at: http://creativecommons.org/licenses/.
diff --git a/assets/models/players/human_base/h_helmet_mk2.tga b/assets/models/players/human_base/h_helmet_mk2.tga
index 9df8c1c..79c5173 100644
--- a/assets/models/players/human_base/h_helmet_mk2.tga
+++ b/assets/models/players/human_base/h_helmet_mk2.tga
diff --git a/assets/sound/buildables/mgturret/spinup_a.wav b/assets/sound/buildables/mgturret/spinup_a.wav
new file mode 100644
index 0000000..1da1ff2
--- /dev/null
+++ b/assets/sound/buildables/mgturret/spinup_a.wav
diff --git a/assets/sound/buildables/mgturret/spinup_b.wav b/assets/sound/buildables/mgturret/spinup_b.wav
new file mode 100644
index 0000000..1ba55eb
--- /dev/null
+++ b/assets/sound/buildables/mgturret/spinup_b.wav
diff --git a/assets/sound/buildables/mgturret/turretkill_a.wav b/assets/sound/buildables/mgturret/turretkill_a.wav
new file mode 100644
index 0000000..183c555
--- /dev/null
+++ b/assets/sound/buildables/mgturret/turretkill_a.wav
diff --git a/assets/ui/ingame_options.menu b/assets/ui/ingame_options.menu
index 1228b0e..e8b7d48 100644
--- a/assets/ui/ingame_options.menu
+++ b/assets/ui/ingame_options.menu
@@ -1535,7 +1535,7 @@
       }
     }
 
-//////// CHALLENGE-CUBOID
+//////// CUBOID
 
     itemDef
     {
@@ -1599,6 +1599,27 @@
       }
     }
 
+    itemDef
+    {
+      name cuboid
+      group optionsGrp
+      type ITEM_TYPE_MULTI
+      text "Resizing rate::"
+      cvar "cg_cuboidResizeRate"
+      cvarFloatList { "0.1" 0.1 "0.2" 0.2 "0.5" 0.5 "1" 1 "2" 2 "5" 5 "10" 10 }
+      rect SCONTENT_X (SCONTENT_Y+(2*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
diff --git a/assets/ui/teamscore.menu b/assets/ui/teamscore.menu
new file mode 100644
index 0000000..e100a05
--- /dev/null
+++ b/assets/ui/teamscore.menu
@@ -0,0 +1,386 @@
+#include "ui/menudef.h"
+
+{
+  \\ score_menu \\
+
+#define W         500
+#define H         338
+#define BORDER    10
+
+#define TOFF      10
+#define SPEC_W    75
+#define BAR_H     30
+
+#define LLIST_L   0
+#define LLIST_R   (W/2)
+#define RLIST_L   (W/2)
+#define RLIST_R   W
+
+  menuDef
+  {
+    name "teamscore_menu"
+    visible MENU_FALSE
+    fullscreen MENU_FALSE
+    rect (320-(W/2)) (240-(H/2)) W H
+    focusColor 1 .75 0 1
+    style WINDOW_STYLE_EMPTY
+
+    // TEAM NAME  //
+
+    itemDef
+    {
+      name teamNameWindow
+      rect 0 0 W BAR_H
+      style WINDOW_STYLE_FILLED
+      border WINDOW_BORDER_FULL
+      borderSize 1.0
+      bordercolor .5 .5 .5 1
+      forecolor 1 1 1 1
+      backcolor 0 0 0 .8
+      visible MENU_TRUE
+      decoration
+    }
+
+    itemDef
+    {
+      name alienteamname
+      textalign ALIGN_LEFT
+      textvalign VALIGN_CENTER
+      textalignx TOFF
+      textscale 0.4
+      rect 0 0 (W/3) BAR_H
+      forecolor 1 1 1 1
+      decoration
+      visible MENU_TRUE
+      ownerdraw CG_ALIENS_SCORE_LABEL
+    }
+
+    itemDef
+    {
+      name stagereport
+      textalign ALIGN_CENTER
+      textvalign VALIGN_CENTER
+      textscale 0.33
+      rect (W/3) 0 (W/3) BAR_H
+      forecolor 1 1 1 1
+      decoration
+      visible MENU_TRUE
+      ownerdraw CG_STAGE_REPORT_TEXT
+    }
+
+    itemDef
+    {
+      name humanteamname
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      textalignx -TOFF
+      textscale 0.4
+      rect ((2*W)/3) 0 (W/3) BAR_H
+      forecolor 1 1 1 1
+      decoration
+      visible MENU_TRUE
+      ownerdraw CG_HUMANS_SCORE_LABEL
+    }
+
+    //  TEAM BARS  //
+
+    itemDef
+    {
+      name leftteambar
+      rect 0 (BAR_H+BORDER) (W/2) BAR_H
+      style WINDOW_STYLE_FILLED
+      border WINDOW_BORDER_FULL
+      borderSize 1.0
+      bordercolor .5 .5 .5 1
+      forecolor 1 1 1 1
+      backcolor 0 0 0 .8
+      visible MENU_TRUE
+      decoration
+    }
+
+    itemDef
+    {
+      name rightteambar
+      rect (W/2) (BAR_H+BORDER) (W/2) BAR_H
+      style WINDOW_STYLE_FILLED
+      border WINDOW_BORDER_FULL
+      borderSize 1.0
+      bordercolor .5 .5 .5 1
+      forecolor 1 1 1 1
+      backcolor 0 0 0 .8
+      visible MENU_TRUE
+      decoration
+    }
+
+
+    //  TEAM HEADINGS  //
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      text "Status"
+      textscale .33
+      style WINDOW_STYLE_EMPTY
+      rect (LLIST_L+10) (BAR_H+BORDER) 1 BAR_H
+      textalign ALIGN_LEFT
+      textvalign VALIGN_CENTER
+      backcolor 0 0 0 0
+      forecolor 1 .75 0 1
+      decoration
+      visible MENU_TRUE
+    }
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      text "Name"
+      textscale .33
+      style WINDOW_STYLE_EMPTY
+      rect (LLIST_L+50) (BAR_H+BORDER) 1 BAR_H
+      textalign ALIGN_LEFT
+      textvalign VALIGN_CENTER
+      backcolor 0 0 0 0
+      forecolor 1 .75 0 1
+      decoration
+      visible MENU_TRUE
+    }
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      text "Score"
+      textscale .33
+      style WINDOW_STYLE_EMPTY
+      rect (LLIST_R-95) (BAR_H+BORDER) 1 BAR_H
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      backcolor 0 0 0 0
+      forecolor 1 .75 0 1
+      decoration
+      visible MENU_TRUE
+    }
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      text "Time"
+      textscale .33
+      style WINDOW_STYLE_EMPTY
+      rect (LLIST_R-55) (BAR_H+BORDER) 1 BAR_H
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      backcolor 0 0 0 0
+      forecolor 1 .75 0 1
+      decoration
+      visible MENU_TRUE
+    }
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      text "Ping"
+      textscale .33
+      style WINDOW_STYLE_EMPTY
+      rect (LLIST_R-15) (BAR_H+BORDER) 1 BAR_H
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      backcolor 0 0 0 0
+      forecolor 1 .75 0 1
+      decoration
+      visible MENU_TRUE
+    }
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      text "Status"
+      textscale .33
+      style WINDOW_STYLE_EMPTY
+      rect (RLIST_L+10) (BAR_H+BORDER) 1 BAR_H
+      textalign ALIGN_LEFT
+      textvalign VALIGN_CENTER
+      backcolor 0 0 0 0
+      forecolor 1 .75 0 1
+      decoration
+      visible MENU_TRUE
+    }
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      text "Name"
+      textscale .33
+      style WINDOW_STYLE_EMPTY
+      rect (RLIST_L+50) (BAR_H+BORDER) 1 BAR_H
+      textalign ALIGN_LEFT
+      textvalign VALIGN_CENTER
+      backcolor 0 0 0 0
+      forecolor 1 .75 0 1
+      decoration
+      visible MENU_TRUE
+    }
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      text "Score"
+      textscale .33
+      style WINDOW_STYLE_EMPTY
+      rect (RLIST_R-95) (BAR_H+BORDER) 1 BAR_H
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      backcolor 0 0 0 0
+      forecolor 1 .75 0 1
+      decoration
+      visible MENU_TRUE
+    }
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      text "Time"
+      textscale .33
+      style WINDOW_STYLE_EMPTY
+      rect (RLIST_R-55) (BAR_H+BORDER) 1 BAR_H
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      backcolor 0 0 0 0
+      forecolor 1 .75 0 1
+      decoration
+      visible MENU_TRUE
+    }
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      text "Ping"
+      textscale .33
+      style WINDOW_STYLE_EMPTY
+      rect (RLIST_R-15) (BAR_H+BORDER) 1 BAR_H
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      backcolor 0 0 0 0
+      forecolor 1 .75 0 1
+      decoration
+      visible MENU_TRUE
+    }
+
+    itemDef
+    {
+      name leftlist
+      rect 0 ((2*BAR_H)+BORDER) (W/2) (H-((3*BAR_H)+(2*BORDER)))
+      style WINDOW_STYLE_FILLED
+      backcolor 0 0 0 .6
+      border WINDOW_BORDER_FULL
+      borderSize 1.0
+      bordercolor .5 .5 .5 1
+      forecolor .75 .75 .75 1
+      visible MENU_TRUE
+      type ITEM_TYPE_LISTBOX
+      elementwidth 135
+      elementheight 16
+      textscale .25
+      elementtype LISTBOX_TEXT
+      feeder FEEDER_ALIENTEAM_LIST
+      notselectable
+      noscrollbar
+      columns 7
+        5             15            ALIGN_LEFT
+        21            15            ALIGN_LEFT
+        7             30            ALIGN_LEFT
+        45            ((W/2)-170)   ALIGN_LEFT
+        ((W/2)-140)   40            ALIGN_RIGHT
+        ((W/2)-80)    20            ALIGN_RIGHT
+        ((W/2)-40)    20            ALIGN_RIGHT
+    }
+
+    itemDef
+    {
+      name rightlist
+      rect (W/2) ((2*BAR_H)+BORDER) (W/2) (H-((3*BAR_H)+(2*BORDER)))
+      style WINDOW_STYLE_FILLED
+      backcolor 0 0 0 .6
+      border WINDOW_BORDER_FULL
+      borderSize 1.0
+      bordercolor .5 .5 .5 1
+      forecolor .75 .75 .75 1
+      visible MENU_TRUE
+      type ITEM_TYPE_LISTBOX
+      elementwidth 135
+      elementheight 16
+      textscale .25
+      elementtype LISTBOX_TEXT
+      feeder FEEDER_HUMANTEAM_LIST
+      notselectable
+      noscrollbar
+      columns 7
+        5             15            ALIGN_LEFT
+        21            15            ALIGN_LEFT
+        7             30            ALIGN_LEFT
+        45            ((W/2)-170)   ALIGN_LEFT
+        ((W/2)-140)   40            ALIGN_RIGHT
+        ((W/2)-80)    20            ALIGN_RIGHT
+        ((W/2)-40)    20            ALIGN_RIGHT
+    }
+
+    //  spectators  //
+
+    itemDef
+    {
+      name window
+      rect 0 (H-BAR_H) W BAR_H
+      style WINDOW_STYLE_FILLED
+      border WINDOW_BORDER_FULL
+      borderSize 1.0
+      bordercolor .5 .5 .5 1
+      backcolor 0 0 0 .8
+      textscale .33
+      visible MENU_TRUE
+      decoration
+    }
+
+    itemDef
+    {
+      type ITEM_TYPE_TEXT
+      name window
+      text "Spectating:"
+      rect 0 (H-BAR_H) SPEC_W BAR_H
+      style WINDOW_STYLE_FILLED
+      forecolor 1 1 1 1
+      textscale .33
+      textalign ALIGN_LEFT
+      textvalign VALIGN_CENTER
+      textalignx TOFF
+      visible MENU_TRUE
+      decoration
+    }
+
+    itemDef
+    {
+      name window
+      rect SPEC_W (H-BAR_H) (W-SPEC_W) BAR_H
+      style WINDOW_STYLE_FILLED
+      forecolor 1 1 1 1
+      textscale .33
+      textvalign VALIGN_CENTER
+      visible MENU_TRUE
+      ownerdraw CG_SPECTATORS
+      decoration
+    }
+
+    itemDef
+    {
+      name winner
+      type ITEM_TYPE_TEXT
+      rect (W/2) (H+BAR_H) 0 0
+      style WINDOW_STYLE_EMPTY
+      forecolor 1 1 1 1
+      textscale 0.5
+      textalign ALIGN_CENTER
+      textvalign VALIGN_TOP
+      visible MENU_TRUE
+      cvar "ui_winner"
+      decoration
+    }
+  }
+}