* Mass driver reverted to upstream (function and effect)

* Squad marking removed
* Marauder walljump reverted to upstream
* Minijump removed
Enjoy!

4 files changed, 2 insertions, 49 deletions

diff --git a/ui/help.txt b/ui/help.txt
index 15a496a1..76b11c53 100644
--- a/ui/help.txt
+++ b/ui/help.txt
@@ -9,11 +9,9 @@
     "We can also be reached on Freenode IRC:\n"
     "#mercenariesguild"
   }
-  "^3Release Notes r144^7"
+  "^3Release Notes r147^7"
   {
-    "* New view-directed Marauder walljump\n"
-    "* Dodge key is mini-jump for Aliens\n"
-    "\nSee svn.mercenariesguild.net for details."
+    "See svn.mercenariesguild.net for details."
   }
   "Alien Healing"
   {
@@ -25,13 +23,6 @@
     "creep. If you are near a booster or basilisk, you will see two "
     "(2X healing) or four (3X healing) barbs around the health cross."
   }
-  "Alien Mini-Jump"
-  {
-    "The sprint / dodge key can be used by Aliens as a jump key that "
-    "produces a weaker, half-height jump. This is especially useful for "
-    "Alien classes that have high jumps, such as the Marauder. The mini-jump "
-    "is also useful for cornering and building speed in tight hallways."
-  }
   "Anti-Camping"
   {
     "Aliens will no longer be as frustrated by camping Human players because "
@@ -106,14 +97,6 @@
     "press the dodge key to start a sprint. The sprint will last until you let "
     "go of the forward key."
   }
-  "Squad Marking"
-  {
-    "Want to keep track of certain teammates? Mark them as members of your "
-    "squad. Bind a key to 'Toggle Squad Mark' (Options -> Misc), walk up to "
-    "the target player and press that key. A triangle will appear above them "
-    "marking them as a squad member. The triangle will stay on screen as long "
-    "as the player is around you."
-  }
   "Tyrant"
   {
     "The Tyrant is now a weaker class as its health has been lowered and "
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 8675def6..1a8e1f18 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -1320,26 +1320,6 @@
       }
     }
 
-    itemDef
-    {
-      name misc
-      group optionsGrp
-      type ITEM_TYPE_BIND
-      text "Toggle Squad Mark:"
-      cvar "squadmark"
-      rect SCONTENT_X (SCONTENT_Y+(12*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/ui/menudef.h b/ui/menudef.h
index d5db721e..6b9705e1 100644
--- a/ui/menudef.h
+++ b/ui/menudef.h
@@ -177,6 +177,5 @@
 
 #define CG_PLAYER_CHARGE_BAR_BG           76
 #define CG_PLAYER_CHARGE_BAR              77
-#define CG_SQUAD_MARKERS                  78
 
 #endif
diff --git a/ui/tremulous_common_hud.h b/ui/tremulous_common_hud.h
index 485cc572..19647ff9 100644
--- a/ui/tremulous_common_hud.h
+++ b/ui/tremulous_common_hud.h
@@ -161,12 +161,3 @@ itemDef
   textstyle ITEM_TEXTSTYLE_SHADOWED
 }
 
-//SQUAD MARKERS
-itemDef
-{
-  name "squad-markers"
-  visible MENU_TRUE
-  forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
-  ownerdraw CG_SQUAD_MARKERS
-}
-