mirror of
https://github.com/ENSL/NS.git
synced 2024-11-09 23:01:34 +00:00
config updates
This commit is contained in:
parent
71e5051752
commit
09c48fa653
10 changed files with 112 additions and 28 deletions
|
@ -59,7 +59,6 @@ bind "MWHEELUP" "invprev"
|
|||
bind "MOUSE1" "+attack"
|
||||
bind "MOUSE2" "+movement"
|
||||
bind "MOUSE3" "+popupmenu"
|
||||
bind "MOUSE4" "+popupmenu"
|
||||
bind "PAUSE" "pause"
|
||||
_snd_mixahead "0.1"
|
||||
ati_npatch "0"
|
||||
|
@ -139,7 +138,7 @@ m_side "0.8"
|
|||
m_yaw "0.022"
|
||||
model "barney"
|
||||
MP3FadeTime "2.0"
|
||||
MP3Volume "0.45"
|
||||
MP3Volume "0.4"
|
||||
mp_decals "300"
|
||||
name "NSPlayer"
|
||||
net_graph "0"
|
||||
|
|
|
@ -74,7 +74,8 @@ sv_clienttrace 3.5
|
|||
///////////////////////////////
|
||||
// Dedicated server specific //
|
||||
///////////////////////////////
|
||||
sv_lan 0
|
||||
// Let GUI determine lan for listen servers.
|
||||
//sv_lan 0
|
||||
|
||||
// Forces a limit on structures on the server
|
||||
sv_structurelimit 300
|
||||
|
|
|
@ -32,7 +32,7 @@ cl_hudmapzoom "2"
|
|||
crosshair "0"
|
||||
cl_cross "1"
|
||||
cl_cross_scaling "0"
|
||||
cl_weaponcfgs "1"
|
||||
cl_weaponcfgs "2"
|
||||
|
||||
echo " "
|
||||
echo "----------------------------------------------------------------------"
|
||||
|
|
Binary file not shown.
|
@ -63,7 +63,7 @@ mp_botsenabled 0
|
|||
mp_botminplayers 0
|
||||
mp_botusemapdefaults 1
|
||||
mp_botskill 1
|
||||
mp_botautomode 0
|
||||
mp_botautomode 1
|
||||
mp_botcommandermode 0
|
||||
|
||||
// disable autoaim and mad gibs
|
||||
|
|
|
@ -342,7 +342,7 @@ void CHud :: VidInit( void )
|
|||
}
|
||||
}
|
||||
|
||||
if (CVAR_GET_FLOAT("hud_style") == 2.0f)
|
||||
if (CVAR_GET_FLOAT("hud_style") >= 2.0f)
|
||||
{
|
||||
mFont.Load("sprites/nl/font_arial");
|
||||
mSmallFont.Load("sprites/nl/font_arialsmall");
|
||||
|
@ -370,10 +370,10 @@ void CHud :: VidInit( void )
|
|||
if ( !m_pSpriteList || gHUD.GetReInitHUD())
|
||||
{
|
||||
// we need to load the hud.txt, and all sprites within
|
||||
if (CVAR_GET_FLOAT("hud_style") == 2.0f)
|
||||
m_pSpriteList = SPR_GetList("sprites/hudnl.txt", &m_iSpriteCountAllRes);
|
||||
if (CVAR_GET_FLOAT("hud_style") == 3.0f)
|
||||
m_pSpriteList = SPR_GetList("sprites/hudnl.txt", &m_iSpriteCountAllRes);
|
||||
else
|
||||
m_pSpriteList = SPR_GetList("sprites/hud.txt", &m_iSpriteCountAllRes);
|
||||
m_pSpriteList = SPR_GetList("sprites/hud.txt", &m_iSpriteCountAllRes);
|
||||
|
||||
if (m_pSpriteList)
|
||||
{
|
||||
|
|
|
@ -145,6 +145,7 @@ cvar_t *cl_chatbeep;
|
|||
cvar_t *cl_mutemenu;
|
||||
cvar_t *cl_weaponcfgs;
|
||||
cvar_t *cl_pistoltrigger;
|
||||
cvar_t *cl_cmcancellast;
|
||||
|
||||
/*
|
||||
===============================================================================
|
||||
|
@ -564,13 +565,13 @@ int CL_DLLEXPORT HUD_Key_Event( int down, int keynum, const char *pszCurrentBind
|
|||
{
|
||||
// RecClKeyEvent(down, keynum, pszCurrentBinding);
|
||||
|
||||
// Check to see if the event has any outlawed commands in it.
|
||||
float theBlockScripts = gHUD.GetServerVariableFloat(kvBlockScripts);
|
||||
|
||||
// Check to see if the event has any outlawed commands in it.
|
||||
float theBlockScripts = gHUD.GetServerVariableFloat(kvBlockScripts);
|
||||
|
||||
if (theBlockScripts && AvHContainsBlockedCommands(pszCurrentBinding))
|
||||
{
|
||||
if(down)//: only show when going down.
|
||||
gEngfuncs.pfnCenterPrint("Scripting is not allowed on this server.\n");
|
||||
gEngfuncs.pfnCenterPrint("Scripting is not allowed on this server.\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -584,15 +585,15 @@ int CL_DLLEXPORT HUD_Key_Event( int down, int keynum, const char *pszCurrentBind
|
|||
|
||||
int theProcessKeyBinding = 1;
|
||||
|
||||
// char theKeyBinding[256] = "none";
|
||||
// if(pszCurrentBinding)
|
||||
// {
|
||||
// sprintf(theKeyBinding, pszCurrentBinding);
|
||||
// }
|
||||
//
|
||||
// char theMessage[512];
|
||||
// sprintf(theMessage, "%s (down: %d, keynum %d)", theKeyBinding, down, keynum);
|
||||
// CenterPrint(theMessage);
|
||||
// char theKeyBinding[256] = "none";
|
||||
// if(pszCurrentBinding)
|
||||
// {
|
||||
// sprintf(theKeyBinding, pszCurrentBinding);
|
||||
// }
|
||||
//
|
||||
// char theMessage[512];
|
||||
// sprintf(theMessage, "%s (down: %d, keynum %d)", theKeyBinding, down, keynum);
|
||||
// CenterPrint(theMessage);
|
||||
|
||||
if(gViewPort /*&& gViewPort->IsOptionsMenuVisible()*/)
|
||||
{
|
||||
|
@ -1727,6 +1728,8 @@ void InitInput (void)
|
|||
cl_mutemenu = gEngfuncs.pfnRegisterVariable ("cl_mutemenu", "3", FCVAR_ARCHIVE);
|
||||
cl_weaponcfgs = gEngfuncs.pfnRegisterVariable ("cl_weaponcfgs", "1", FCVAR_ARCHIVE);
|
||||
cl_pistoltrigger = gEngfuncs.pfnRegisterVariable ("cl_pistoltrigger", "1", FCVAR_ARCHIVE | FCVAR_USERINFO);
|
||||
cl_cmcancellast = gEngfuncs.pfnRegisterVariable("cl_cmcancellast", "0", FCVAR_ARCHIVE);
|
||||
|
||||
|
||||
// Initialize third person camera controls.
|
||||
CAM_Init();
|
||||
|
|
73
main/source/includes/glew/LICENSE.txt
Normal file
73
main/source/includes/glew/LICENSE.txt
Normal file
|
@ -0,0 +1,73 @@
|
|||
The OpenGL Extension Wrangler Library
|
||||
Copyright (C) 2002-2007, Milan Ikits <milan ikits[]ieee org>
|
||||
Copyright (C) 2002-2007, Marcelo E. Magallon <mmagallo[]debian org>
|
||||
Copyright (C) 2002, Lev Povalahev
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
* The name of the author may be used to endorse or promote products
|
||||
derived from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
|
||||
Mesa 3-D graphics library
|
||||
Version: 7.0
|
||||
|
||||
Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without limitation
|
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
||||
Copyright (c) 2007 The Khronos Group Inc.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and/or associated documentation files (the
|
||||
"Materials"), to deal in the Materials without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Materials, and to
|
||||
permit persons to whom the Materials are furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Materials.
|
||||
|
||||
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
|
|
@ -2242,7 +2242,7 @@ AVHHSPRITE AvHHud::GetTechTreeSprite(AvHMessageID inMessageID)
|
|||
sprintf(theMessageNumberString, "%d", (int)theMessageNumber);
|
||||
//string theSpriteName = kTechTreeSpriteDirectory + string("/") + kTechTreeSpritePrefix + string(theMessageIDString) + string(".spr");
|
||||
string theSpriteName;
|
||||
if (CVAR_GET_FLOAT("hud_style") == 2.0f)
|
||||
if (CVAR_GET_FLOAT("hud_style") >= 2.0f)
|
||||
theSpriteName = kTechTreeSpriteDirectoryNL + string("/") + kTechTreeSpritePrefix + string(theMessageNumberString) + string("s.spr");
|
||||
else
|
||||
theSpriteName = kTechTreeSpriteDirectory + string("/") + kTechTreeSpritePrefix + string(theMessageNumberString) + string("s.spr");
|
||||
|
@ -4493,7 +4493,7 @@ void AvHHud::VidInit(void)
|
|||
// this->mAlienUILifeforms[i] = SPR_Load(theSpriteName.c_str());
|
||||
// }
|
||||
|
||||
if (hudStyle == 2.0f)
|
||||
if (hudStyle >= 2.0f)
|
||||
{
|
||||
this->mAlienUIUpgrades = SPR_Load(kAlienUpgradeSpriteNL);
|
||||
this->mAlienUIEnergySprite = SPR_Load(kAlienEnergySpriteNL);
|
||||
|
|
|
@ -57,14 +57,14 @@ DESCRIPTION INFO_OPTIONS
|
|||
|
||||
"cl_musicenabled"
|
||||
{
|
||||
"Music enabled"
|
||||
"In-game music enabled"
|
||||
{ BOOL }
|
||||
{ "1" }
|
||||
}
|
||||
|
||||
"cl_musicvolume"
|
||||
{
|
||||
"Music volume"
|
||||
"In-game music volume"
|
||||
{ NUMBER 0.000000 2.000000 }
|
||||
{ "0.600000" }
|
||||
}
|
||||
|
@ -104,9 +104,9 @@ DESCRIPTION INFO_OPTIONS
|
|||
|
||||
"cl_bob"
|
||||
{
|
||||
"Weapon bobbing (0.006 default)"
|
||||
"Weapon bobbing (0.005 default)"
|
||||
{ NUMBER 0.000000 0.010000 }
|
||||
{ "0.006000" }
|
||||
{ "0.005000" }
|
||||
}
|
||||
|
||||
"cl_bobview"
|
||||
|
@ -162,6 +162,13 @@ DESCRIPTION INFO_OPTIONS
|
|||
{ STRING }
|
||||
{ "qwerasdfzxcv" }
|
||||
}
|
||||
|
||||
"cl_cmcancellast"
|
||||
{
|
||||
"Commander cancel button is the last button (same as recycle)"
|
||||
{ BOOL }
|
||||
{ "0" }
|
||||
}
|
||||
|
||||
"cl_placebo"
|
||||
{
|
||||
|
@ -185,6 +192,7 @@ DESCRIPTION INFO_OPTIONS
|
|||
"Original" "0"
|
||||
"Minimal" "1"
|
||||
"Competitive - Nine Legends" "2"
|
||||
"Competitive - Nine Legends (small health/ammo)" "3"
|
||||
}
|
||||
{ "1.000000" }
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue