r2757 - branches/nexuiz-2.0/data/menu/data branches/nexuiz-2.0/data/menu/options trunk/data/menu/data trunk/data/menu/options

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2007-06-07 15:27:21 -0400 (Thu, 07 Jun 2007)
New Revision: 2757

Modified:
   branches/nexuiz-2.0/data/menu/data/key.menu
   branches/nexuiz-2.0/data/menu/options/key.menu
   trunk/data/menu/data/key.menu
   trunk/data/menu/options/key.menu
Log:
sorry, made the menu even bigger :) added disconnect and team-auto/red/blue/yellow/pink to the bind menu


Modified: branches/nexuiz-2.0/data/menu/data/key.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/data/key.menu	2007-06-07 17:05:47 UTC (rev 2756)
+++ branches/nexuiz-2.0/data/menu/data/key.menu	2007-06-07 19:27:21 UTC (rev 2757)
@@ -78,7 +78,7 @@
 	Item Data_Nex_Key Hook
 	{
 		target		"+hook"
-		defValue	"'e'"
+		defValue	"'Mouse5' 'e'"
 	}
 	Item DataContainer Weapon
 	{
@@ -163,6 +163,11 @@
 		target		"quit"
 		defValue 	"'F10'"
 	}
+	Item Data_Nex_Key Disconnect
+	{
+		target		"disconnect"
+		defValue 	"'F11'"
+	}
 	Item Data_Nex_Key ViewSmaller
 	{
 		target		"sizedown"
@@ -188,6 +193,27 @@
 		target		"menu_showteamselect"
 		defValue	"'F5'"
 	}
+	Item Data_Nex_Key TeamAuto
+	{
+		target		"team_auto"
+		defValue	"'F6'"
+	}
+	Item Data_Nex_Key TeamRed
+	{
+		target		"team_red"
+	}
+	Item Data_Nex_Key TeamBlue
+	{
+		target		"team_blue"
+	}
+	Item Data_Nex_Key TeamYellow
+	{
+		target		"team_yellow"
+	}
+	Item Data_Nex_Key TeamPink
+	{
+		target		"team_pink"
+	}
 	Item Data_Nex_Key VoteYes
 	{
 		target		"vyes"

Modified: branches/nexuiz-2.0/data/menu/options/key.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/options/key.menu	2007-06-07 17:05:47 UTC (rev 2756)
+++ branches/nexuiz-2.0/data/menu/options/key.menu	2007-06-07 19:27:21 UTC (rev 2757)
@@ -311,6 +311,11 @@
 						text	"Quit Nexuiz"
 						target	"Data::Key::Quit"
 					}
+					Derive Nex_Key_Template Disconnect
+					{
+						text	"Disconnect from server"
+						target	"Data::Key::Disconnect"
+					}
 					Derive Nex_Key_Template ViewSmaller
 					{
 						text	"Decrease Viewsize"
@@ -336,6 +341,31 @@
 						text	"Show Teammenu"
 						target	"Data::Key::TeamSelect"
 					}
+					Derive Nex_Key_Template TeamAuto
+					{
+						text	"Automatically join team"
+						target	"Data::Key::TeamAuto"
+					}
+					Derive Nex_Key_Template TeamRed
+					{
+						text	"Join red team"
+						target	"Data::Key::TeamRed"
+					}
+					Derive Nex_Key_Template TeamBlue
+					{
+						text	"Join blue team"
+						target	"Data::Key::TeamBlue"
+					}
+					Derive Nex_Key_Template TeamYellow
+					{
+						text	"Join yellow team"
+						target	"Data::Key::TeamYellow"
+					}
+					Derive Nex_Key_Template TeamPink
+					{
+						text	"Join pink team"
+						target	"Data::Key::TeamPink"
+					}
 					Derive Nex_Key_Template VoteYes
 					{
 						text	"Vote Yes"

Modified: trunk/data/menu/data/key.menu
===================================================================
--- trunk/data/menu/data/key.menu	2007-06-07 17:05:47 UTC (rev 2756)
+++ trunk/data/menu/data/key.menu	2007-06-07 19:27:21 UTC (rev 2757)
@@ -78,7 +78,7 @@
 	Item Data_Nex_Key Hook
 	{
 		target		"+hook"
-		defValue	"'e'"
+		defValue	"'Mouse5' 'e'"
 	}
 	Item DataContainer Weapon
 	{
@@ -163,6 +163,11 @@
 		target		"quit"
 		defValue 	"'F10'"
 	}
+	Item Data_Nex_Key Disconnect
+	{
+		target		"disconnect"
+		defValue 	"'F11'"
+	}
 	Item Data_Nex_Key ViewSmaller
 	{
 		target		"sizedown"
@@ -188,6 +193,27 @@
 		target		"menu_showteamselect"
 		defValue	"'F5'"
 	}
+	Item Data_Nex_Key TeamAuto
+	{
+		target		"team_auto"
+		defValue	"'F6'"
+	}
+	Item Data_Nex_Key TeamRed
+	{
+		target		"team_red"
+	}
+	Item Data_Nex_Key TeamBlue
+	{
+		target		"team_blue"
+	}
+	Item Data_Nex_Key TeamYellow
+	{
+		target		"team_yellow"
+	}
+	Item Data_Nex_Key TeamPink
+	{
+		target		"team_pink"
+	}
 	Item Data_Nex_Key VoteYes
 	{
 		target		"vyes"

Modified: trunk/data/menu/options/key.menu
===================================================================
--- trunk/data/menu/options/key.menu	2007-06-07 17:05:47 UTC (rev 2756)
+++ trunk/data/menu/options/key.menu	2007-06-07 19:27:21 UTC (rev 2757)
@@ -311,6 +311,11 @@
 						text	"Quit Nexuiz"
 						target	"Data::Key::Quit"
 					}
+					Derive Nex_Key_Template Disconnect
+					{
+						text	"Disconnect from server"
+						target	"Data::Key::Disconnect"
+					}
 					Derive Nex_Key_Template ViewSmaller
 					{
 						text	"Decrease Viewsize"
@@ -336,6 +341,31 @@
 						text	"Show Teammenu"
 						target	"Data::Key::TeamSelect"
 					}
+					Derive Nex_Key_Template TeamAuto
+					{
+						text	"Automatically join team"
+						target	"Data::Key::TeamAuto"
+					}
+					Derive Nex_Key_Template TeamRed
+					{
+						text	"Join red team"
+						target	"Data::Key::TeamRed"
+					}
+					Derive Nex_Key_Template TeamBlue
+					{
+						text	"Join blue team"
+						target	"Data::Key::TeamBlue"
+					}
+					Derive Nex_Key_Template TeamYellow
+					{
+						text	"Join yellow team"
+						target	"Data::Key::TeamYellow"
+					}
+					Derive Nex_Key_Template TeamPink
+					{
+						text	"Join pink team"
+						target	"Data::Key::TeamPink"
+					}
 					Derive Nex_Key_Template VoteYes
 					{
 						text	"Vote Yes"