r2566 - 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
DONOTREPLY at icculus.org
Tue May 15 06:00:54 EDT 2007
Author: esteel
Date: 2007-05-15 06:00:54 -0400 (Tue, 15 May 2007)
New Revision: 2566
Modified:
branches/nexuiz-2.0/data/menu/data/effects.menu
branches/nexuiz-2.0/data/menu/data/video.menu
branches/nexuiz-2.0/data/menu/options/effects.menu
branches/nexuiz-2.0/data/menu/options/video.menu
trunk/data/menu/data/effects.menu
trunk/data/menu/data/video.menu
trunk/data/menu/options/effects.menu
trunk/data/menu/options/video.menu
Log:
moved r_glsl into video menu and also added gl_vbo there
Modified: branches/nexuiz-2.0/data/menu/data/effects.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/data/effects.menu 2007-05-15 07:26:59 UTC (rev 2565)
+++ branches/nexuiz-2.0/data/menu/data/effects.menu 2007-05-15 10:00:54 UTC (rev 2566)
@@ -91,12 +91,6 @@
[DataLink_OnOffSwitch]
}
- Item Data_Cvar GLSL
- {
- cvarName "r_glsl"
- defValue 1
- [DataLink_OnOffSwitch]
- }
Item Data_Cvar Gloss
{
cvarName "r_shadow_gloss"
@@ -104,11 +98,4 @@
[DataLink_OnOffSwitch]
}
- Item Data_Cvar ShowFPS
- {
- cvarName "showfps"
- defValue "0"
-
- [DataLink_OnOffSwitch]
- }
}
Modified: branches/nexuiz-2.0/data/menu/data/video.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/data/video.menu 2007-05-15 07:26:59 UTC (rev 2565)
+++ branches/nexuiz-2.0/data/menu/data/video.menu 2007-05-15 10:00:54 UTC (rev 2566)
@@ -74,5 +74,23 @@
link "##up"
}
}
+ Item Data_Cvar GLSL
+ {
+ cvarName "r_glsl"
+ defValue 1
+ [DataLink_OnOffSwitch]
+ }
+ Item Data_Cvar VBO
+ {
+ cvarName "gl_vbo"
+ defValue 1
+ [DataLink_OnOffSwitch]
+ }
+ Item Data_Cvar ShowFPS
+ {
+ cvarName "showfps"
+ defValue "0"
+ [DataLink_OnOffSwitch]
+ }
}
Modified: branches/nexuiz-2.0/data/menu/options/effects.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/options/effects.menu 2007-05-15 07:26:59 UTC (rev 2565)
+++ branches/nexuiz-2.0/data/menu/options/effects.menu 2007-05-15 10:00:54 UTC (rev 2566)
@@ -43,6 +43,11 @@
text "Coronas"
target "::Data::Effects::Coronas::Switch"
}
+ Derive Nex_Option_Switch Gloss
+ {
+ text "Gloss"
+ target "::Data::Effects::Gloss::Switch"
+ }
Derive Nex_Line SeperatorRTLights
{}
@@ -77,23 +82,6 @@
target "::Data::Effects::RealtimeDLightShadows::Switch"
}
- Derive Nex_Line SeperatorGFXFeatures
- {}
- Derive Nex_Option_Switch GLSL
- {
- text "OpenGL 2.0 Shaders"
- target "::Data::Effects::GLSL::Switch"
- }
- Derive Nex_Option_Switch Gloss
- {
- text "Gloss"
- target "::Data::Effects::Gloss::Switch"
- }
- Derive Nex_Option_Switch ShowFPS
- {
- text "Show FPS"
- target "::Data::Effects::ShowFPS::Switch"
- }
Derive Nex_Line SeperatorReset
{}
Derive TextButton Reset
Modified: branches/nexuiz-2.0/data/menu/options/video.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/options/video.menu 2007-05-15 07:26:59 UTC (rev 2565)
+++ branches/nexuiz-2.0/data/menu/options/video.menu 2007-05-15 10:00:54 UTC (rev 2566)
@@ -57,6 +57,23 @@
text "Texture Quality Reduction"
target "::Data::Video::PicmipWorld::Switch"
}
+ Derive Nex_Line SeperatorGFXFeatures
+ {}
+ Derive Nex_Option_Switch GLSL
+ {
+ text "OpenGL 2.0 Shaders"
+ target "::Data::Video::GLSL::Switch"
+ }
+ Derive Nex_Option_Switch VBO
+ {
+ text "Vertex Buffer Objects"
+ target "::Data::Video::VBO::Switch"
+ }
+ Derive Nex_Option_Switch ShowFPS
+ {
+ text "Show FPS"
+ target "::Data::Video::ShowFPS::Switch"
+ }
Derive Nex_Void Seperator1
{}
Derive PictureButton Apply
Modified: trunk/data/menu/data/effects.menu
===================================================================
--- trunk/data/menu/data/effects.menu 2007-05-15 07:26:59 UTC (rev 2565)
+++ trunk/data/menu/data/effects.menu 2007-05-15 10:00:54 UTC (rev 2566)
@@ -91,12 +91,6 @@
[DataLink_OnOffSwitch]
}
- Item Data_Cvar GLSL
- {
- cvarName "r_glsl"
- defValue 1
- [DataLink_OnOffSwitch]
- }
Item Data_Cvar Gloss
{
cvarName "r_shadow_gloss"
@@ -104,11 +98,4 @@
[DataLink_OnOffSwitch]
}
- Item Data_Cvar ShowFPS
- {
- cvarName "showfps"
- defValue "0"
-
- [DataLink_OnOffSwitch]
- }
}
Modified: trunk/data/menu/data/video.menu
===================================================================
--- trunk/data/menu/data/video.menu 2007-05-15 07:26:59 UTC (rev 2565)
+++ trunk/data/menu/data/video.menu 2007-05-15 10:00:54 UTC (rev 2566)
@@ -74,5 +74,23 @@
link "##up"
}
}
+ Item Data_Cvar GLSL
+ {
+ cvarName "r_glsl"
+ defValue 1
+ [DataLink_OnOffSwitch]
+ }
+ Item Data_Cvar VBO
+ {
+ cvarName "gl_vbo"
+ defValue 1
+ [DataLink_OnOffSwitch]
+ }
+ Item Data_Cvar ShowFPS
+ {
+ cvarName "showfps"
+ defValue "0"
+ [DataLink_OnOffSwitch]
+ }
}
Modified: trunk/data/menu/options/effects.menu
===================================================================
--- trunk/data/menu/options/effects.menu 2007-05-15 07:26:59 UTC (rev 2565)
+++ trunk/data/menu/options/effects.menu 2007-05-15 10:00:54 UTC (rev 2566)
@@ -43,6 +43,11 @@
text "Coronas"
target "::Data::Effects::Coronas::Switch"
}
+ Derive Nex_Option_Switch Gloss
+ {
+ text "Gloss"
+ target "::Data::Effects::Gloss::Switch"
+ }
Derive Nex_Line SeperatorRTLights
{}
@@ -77,23 +82,6 @@
target "::Data::Effects::RealtimeDLightShadows::Switch"
}
- Derive Nex_Line SeperatorGFXFeatures
- {}
- Derive Nex_Option_Switch GLSL
- {
- text "OpenGL 2.0 Shaders"
- target "::Data::Effects::GLSL::Switch"
- }
- Derive Nex_Option_Switch Gloss
- {
- text "Gloss"
- target "::Data::Effects::Gloss::Switch"
- }
- Derive Nex_Option_Switch ShowFPS
- {
- text "Show FPS"
- target "::Data::Effects::ShowFPS::Switch"
- }
Derive Nex_Line SeperatorReset
{}
Derive TextButton Reset
Modified: trunk/data/menu/options/video.menu
===================================================================
--- trunk/data/menu/options/video.menu 2007-05-15 07:26:59 UTC (rev 2565)
+++ trunk/data/menu/options/video.menu 2007-05-15 10:00:54 UTC (rev 2566)
@@ -57,6 +57,23 @@
text "Texture Quality Reduction"
target "::Data::Video::PicmipWorld::Switch"
}
+ Derive Nex_Line SeperatorGFXFeatures
+ {}
+ Derive Nex_Option_Switch GLSL
+ {
+ text "OpenGL 2.0 Shaders"
+ target "::Data::Video::GLSL::Switch"
+ }
+ Derive Nex_Option_Switch VBO
+ {
+ text "Vertex Buffer Objects"
+ target "::Data::Video::VBO::Switch"
+ }
+ Derive Nex_Option_Switch ShowFPS
+ {
+ text "Show FPS"
+ target "::Data::Video::ShowFPS::Switch"
+ }
Derive Nex_Void Seperator1
{}
Derive PictureButton Apply
More information about the nexuiz-commits
mailing list