r1981 - in branches/nexuiz-2.0/data: gfx menu/options

[DONOTREPLY at icculus.org]

Author: m0rfar
Date: 2006-12-03 08:53:13 -0500 (Sun, 03 Dec 2006)
New Revision: 1981

Modified:
   branches/nexuiz-2.0/data/gfx/0.tga
   branches/nexuiz-2.0/data/gfx/1.tga
   branches/nexuiz-2.0/data/gfx/10.tga
   branches/nexuiz-2.0/data/gfx/11.tga
   branches/nexuiz-2.0/data/gfx/12.tga
   branches/nexuiz-2.0/data/gfx/13.tga
   branches/nexuiz-2.0/data/gfx/14.tga
   branches/nexuiz-2.0/data/gfx/2.tga
   branches/nexuiz-2.0/data/gfx/3.tga
   branches/nexuiz-2.0/data/gfx/4.tga
   branches/nexuiz-2.0/data/gfx/5.tga
   branches/nexuiz-2.0/data/gfx/6.tga
   branches/nexuiz-2.0/data/gfx/7.tga
   branches/nexuiz-2.0/data/gfx/8.tga
   branches/nexuiz-2.0/data/gfx/9.tga
   branches/nexuiz-2.0/data/menu/options/player.menu
Log:
Shirt color is above pants color in options now. As it should, because the scoreboard has it that way also.
New color pics in options, should match the in game colors now.

Modified: branches/nexuiz-2.0/data/gfx/0.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/1.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/10.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/11.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/12.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/13.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/14.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/2.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/3.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/4.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/5.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/6.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/7.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/8.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/gfx/9.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/menu/options/player.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/options/player.menu	2006-12-03 13:12:13 UTC (rev 1980)
+++ branches/nexuiz-2.0/data/menu/options/player.menu	2006-12-03 13:53:13 UTC (rev 1981)
@@ -93,10 +93,10 @@
 				target	"Data::Player::Name::Text"
 			}
 		}
-		Derive Nex_Composition TeamColor
+		Derive Nex_Composition ShirtColor
 		{
-			text	"Pants color"
-			target	"::Data::Player::Color::TeamColor::TextSwitch"
+			text	"Shirt color"
+			target	"::Data::Player::Color::ShirtColor::TextSwitch"
 
 			Derive Nex_Automation_Option_Slider Automation
 			{}
@@ -115,10 +115,10 @@
 				colorSelected	"1.0 1.0 1.0"
 			}
 		}
-		Derive Nex_Composition ShirtColor
+		Derive Nex_Composition TeamColor
 		{
-			text	"Shirt color"
-			target	"::Data::Player::Color::ShirtColor::TextSwitch"
+			text	"Pants color"
+			target	"::Data::Player::Color::TeamColor::TextSwitch"
 
 			Derive Nex_Automation_Option_Slider Automation
 			{}