From 34939e8d178712c15989a4e832b36dbf4778f3d4 Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Wed, 8 Feb 2006 18:03:45 +0000 Subject: [PATCH] - anisotropy/gl_picmip switches, dropweapon/show_info buttons, g_minstagib_invis_alp ha cvar added to menu - readme file for score logging git-svn-id: svn://svn.icculus.org/nexuiz/trunk@982 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- Docs/FAQ.aft | 2 +- Docs/FAQ.html | 2 +- data/default.cfg | 8 +++---- data/menu/creategame/gamemodes/gamemisc.menu | 5 ++++ data/menu/data/gamemodes/gamemisc.menu | 7 ++++++ data/menu/data/key.menu | 10 ++++++++ data/menu/data/video.menu | 25 ++++++++++++++++++++ data/menu/options/key.menu | 11 +++++++++ data/menu/options/video.menu | 10 ++++++++ data/menuqc/custom/video.qm | 2 ++ data/qcsrc/server/gamec/g_world.c | 2 +- 11 files changed, 77 insertions(+), 7 deletions(-) diff --git a/Docs/FAQ.aft b/Docs/FAQ.aft index b41fdbc66..d239d4b87 100644 --- a/Docs/FAQ.aft +++ b/Docs/FAQ.aft @@ -120,7 +120,7 @@ You can list all your demo files by typing |dem| on the console. Some usefull ke There's a [detailed guide (http://www.nexuiz.com/forums/index.php?showtopic=195)] on gtkradiant setup in the forums. There are also a [Linux shell script (http://www.nexuiz.com/forums/index.php?showtopic=195&view=findpost&p=11176)] and a [Windows application (http://www.nexuiz.com/forums/index.php?showtopic=195&view=findpost&p=11838)] that will configure your gtkradiant (1.4) automagically. ** Where can i get latest development versions of the source code? -_Engine:_ instructions are available at http://icculus.org/twilight/darkplaces/download.html (you will need a [cvs client (http://www.nongnu.org/cvs/)]) +_Engine:_ instructions are available at http://icculus.org/twilight/darkplaces/download.html (you will need a [cvs client (http://www.nongnu.org/cvs/)], beta builds are available [here (http://icculus.org/twilight/darkplaces/files/)]) _Game data:_ to check out the Nexuiz svn, you'll need a [svn client (http://subversion.tigris.org/project_packages.html)]. To check out the repository with a commandline svn client, do ^<< diff --git a/Docs/FAQ.html b/Docs/FAQ.html index 8e342aa85..4209f4bd4 100644 --- a/Docs/FAQ.html +++ b/Docs/FAQ.html @@ -291,7 +291,7 @@ There's a Where can i get latest development versions of the source code?

-Engine: instructions are available at http://icculus.org/twilight/darkplaces/download.html (you will need a cvs client) +Engine: instructions are available at http://icculus.org/twilight/darkplaces/download.html (you will need a cvs client, beta builds are available here)

Game data: to check out the Nexuiz svn, you'll need a svn client. To check out the repository with a commandline svn client, do diff --git a/data/default.cfg b/data/default.cfg index 3fd5e8305..8a8e6c4cb 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -235,7 +235,7 @@ set g_balance_rune_speed_combo_jumpheight 1.0 // domination set g_domination 0 set g_domination_default_teams 2 // default number of teams for maps that aren't domination-specific -set g_domination_disable_frags 0 // players can't get frags normally; only get points from kills +set g_domination_disable_frags 0 // players can't get frags normally, only get points from kills set g_domination_point_amt 0 // override: how many points to get per ping set g_domination_point_rate 0 // override: how often to give those points set g_domination_point_capturetime 0.1 // how long it takes to capture a point (given no interference) @@ -363,11 +363,11 @@ r_shadow_gloss 0 // disable watershader. Only affects NVidia cards. // turned off to avoid fullbright water -r_watershader 0 +set r_watershader 0 // misc -host_maxfps 1000 -host_minfps 10 +set host_maxfps 1000 +set host_minfps 10 scr_conbrightness 0 scr_screenshot_jpeg 1 scr_screenshot_jpeg_quality 0.9 diff --git a/data/menu/creategame/gamemodes/gamemisc.menu b/data/menu/creategame/gamemodes/gamemisc.menu index 5998bb955..eb1fd0490 100644 --- a/data/menu/creategame/gamemodes/gamemisc.menu +++ b/data/menu/creategame/gamemodes/gamemisc.menu @@ -185,6 +185,11 @@ Item Layout Misc text "Ammo dropped or picked up" target "::Data::Game::Misc::MinstaGibAmmoDrop::Text" } + Derive Nex_Option_EditBox MinstaGibInvisAlpha + { + text "Tranparency for invisible players" + target "::Data::Game::Misc::MinstaGibInvisAlpha::Text" + } Derive Nex_Line SeperatorOthers {} Derive Nex_Option_Switch Casings diff --git a/data/menu/data/gamemodes/gamemisc.menu b/data/menu/data/gamemodes/gamemisc.menu index f9fd2a816..062827fe2 100644 --- a/data/menu/data/gamemodes/gamemisc.menu +++ b/data/menu/data/gamemodes/gamemisc.menu @@ -200,6 +200,13 @@ Item DataContainer Misc [DataLink_Setting] } + Item Data_Cvar MinstaGibInvisAlpha + { + cvarName "g_minstagib_invis_alpha" + defValue 0.1 + + [DataLink_Setting] + } Item Data_Cvar Casings { cvarName "g_casings" diff --git a/data/menu/data/key.menu b/data/menu/data/key.menu index 19a145cf3..669012e88 100644 --- a/data/menu/data/key.menu +++ b/data/menu/data/key.menu @@ -55,6 +55,11 @@ Item DataContainer Key target "weapnext" defValue "'MWHEELUP'" } + Item Data_Nex_Key DropWeapon + { + target "dropweapon" + defValue "'BACKSPACE'" + } Item Data_Nex_Key Zoom { target "+zoom" @@ -158,4 +163,9 @@ Item DataContainer Key target "sizeup" defValue "'='" } + Item Data_Nex_Key ShowInfo + { + target "+show_info" + defValue "'i'" + } } diff --git a/data/menu/data/video.menu b/data/menu/data/video.menu index 6a8b7edee..94c8e799c 100644 --- a/data/menu/data/video.menu +++ b/data/menu/data/video.menu @@ -32,4 +32,29 @@ Item DataContainer Video [DataLink_OnOffSwitch] } + Item Data_Cvar Anisotropy + { + cvarName "gl_texture_anisotropy" + defValue "1" + + Item DataLink_TextSwitch Switch + { + valueList "'1' '2' '4' '8' '16'" + descList "'off' '2x' '4x' '8x' '16x'" + link "##up" + } + } + Item Data_Cvar Picmip + { + cvarName "gl_picmip" + defValue "0" + + Item DataLink_TextSwitch Switch + { + valueList "'0' '1' '2' '3' '4'" + descList "'best' 'good' 'medium' 'low' 'lowest' 'custom'" + link "##up" + } + } + } diff --git a/data/menu/options/key.menu b/data/menu/options/key.menu index e3ce9ae72..16e9f18fe 100644 --- a/data/menu/options/key.menu +++ b/data/menu/options/key.menu @@ -203,6 +203,11 @@ Item Window KeyControl text "Zoom" target "Data::Key::Zoom" } + Derive Nex_Key_Template DropWeapon + { + text "Drop Weapon" + target "Data::Key::DropWeapon" + } Derive Nex_Void Seperator2 {} Derive Title Weapons @@ -306,6 +311,12 @@ Item Window KeyControl text "Increase Viewsize" target "Data::Key::ViewBigger" } + Derive Nex_Key_Template ShowInfo + { + text "Display Serverinfo" + target "Data::Key::ShowInfo" + } + } } Item VScrollBar Scroller diff --git a/data/menu/options/video.menu b/data/menu/options/video.menu index 43818f8ef..53a150b5d 100644 --- a/data/menu/options/video.menu +++ b/data/menu/options/video.menu @@ -36,6 +36,16 @@ Item Window Video text "Fullscreen" target "::Data::Video::Fullscreen::Switch" } + Derive Nex_Video_Option_Switch Anisotropy + { + text "Anisotropic Filtering" + target "::Data::Video::Anisotropy::Switch" + } + Derive Nex_Video_Option_Switch Picmip + { + text "Texture Quality" + target "::Data::Video::Picmip::Switch" + } Derive Nex_Void Seperator1 {} Derive PictureButton Apply diff --git a/data/menuqc/custom/video.qm b/data/menuqc/custom/video.qm index b36206b16..9f379c9c8 100644 --- a/data/menuqc/custom/video.qm +++ b/data/menuqc/custom/video.qm @@ -6,5 +6,7 @@ void() Nex_Action_Video_Apply = Raise_DataEvent( Menu_GetItem( "::Data::Video::Fullscreen" ), ITEM_DATA_SEND ); Raise_DataEvent( Menu_GetItem( "::Data::Video::Resolution" ), ITEM_DATA_SEND ); Raise_DataEvent( Menu_GetItem( "::Data::Video::BPP" ), ITEM_DATA_SEND ); + Raise_DataEvent( Menu_GetItem( "::Data::Video::Anisotropy" ), ITEM_DATA_SEND ); + Raise_DataEvent( Menu_GetItem( "::Data::Video::Picmip" ), ITEM_DATA_SEND ); cmd( "vid_restart\n" ); }; diff --git a/data/qcsrc/server/gamec/g_world.c b/data/qcsrc/server/gamec/g_world.c index e73d0d605..f8aa5f969 100644 --- a/data/qcsrc/server/gamec/g_world.c +++ b/data/qcsrc/server/gamec/g_world.c @@ -562,7 +562,7 @@ void() DumpStats = else s = ":status:"; - s = strcat(s, gametype, "_", mapname, ":", ftos(now), "\n"); + s = strcat(s, gametype, "_", mapname, ":", ftos(rint(now)), "\n"); if(cvar("sv_logscores_console")) localcmd("echo ", s); -- 2.39.2