Compare commits
18 Commits
movement
...
bc62e99e62
| Author | SHA1 | Date | |
|---|---|---|---|
| bc62e99e62 | |||
| 80f130a34c | |||
| 3d6ef7d47a | |||
| 6a07992e34 | |||
| 9917083884 | |||
| 6406952e7e | |||
| 671e1b6e0a | |||
| 3ada3a07f0 | |||
| 689cce8da4 | |||
| a2faa57760 | |||
| b11cb714d6 | |||
| 22b3d26c0b | |||
| cb00ff4ff5 | |||
| e11373acbb | |||
| 380112a25f | |||
| 443c2483b0 | |||
| e4352e849f | |||
| 94b17cc130 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -74,7 +74,6 @@ sp/game/mod_hl2/voice_ban.dt
|
||||
*.vpc_crc
|
||||
*.sentinel
|
||||
*.filters
|
||||
*.lib
|
||||
|
||||
#game directories
|
||||
sp/game/*
|
||||
|
||||
@@ -35,9 +35,9 @@
|
||||
// memdbgon must be the last include file in a .cpp file!!!
|
||||
#include "tier0/memdbgon.h"
|
||||
|
||||
#ifdef CSTRIKE_DLL
|
||||
//#ifdef CSTRIKE_DLL
|
||||
ConVar cl_righthand("cl_righthand", "1", FCVAR_ARCHIVE, "Use right-handed view models.");
|
||||
#endif
|
||||
//#endif
|
||||
|
||||
#ifdef TF_CLIENT_DLL
|
||||
ConVar cl_flipviewmodels("cl_flipviewmodels", "0", FCVAR_USERINFO | FCVAR_ARCHIVE | FCVAR_NOT_CONNECTED, "Flip view models.");
|
||||
@@ -197,7 +197,7 @@ bool C_BaseViewModel::Interpolate( float currentTime )
|
||||
|
||||
bool C_BaseViewModel::ShouldFlipViewModel()
|
||||
{
|
||||
#ifdef CSTRIKE_DLL
|
||||
//#ifdef CSTRIKE_DLL
|
||||
// If cl_righthand is set, then we want them all right-handed.
|
||||
CBaseCombatWeapon* pWeapon = m_hWeapon.Get();
|
||||
if (pWeapon)
|
||||
@@ -205,7 +205,7 @@ bool C_BaseViewModel::ShouldFlipViewModel()
|
||||
const FileWeaponInfo_t* pInfo = &pWeapon->GetWpnData();
|
||||
return pInfo->m_bAllowFlipping && pInfo->m_bBuiltRightHanded != cl_righthand.GetBool();
|
||||
}
|
||||
#endif
|
||||
//#endif
|
||||
|
||||
#ifdef TF_CLIENT_DLL
|
||||
CBaseCombatWeapon* pWeapon = m_hWeapon.Get();
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
extern bool g_bRollingCredits;
|
||||
|
||||
ConVar fov_desired( "fov_desired", "75", FCVAR_ARCHIVE | FCVAR_USERINFO, "Sets the base field-of-view.", true, 75.0, true, 90.0 );
|
||||
ConVar fov_desired( "fov_desired", "75", FCVAR_ARCHIVE | FCVAR_USERINFO, "Sets the base field-of-view.", true, 75.0, true, 140.0 );
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Globals
|
||||
|
||||
@@ -112,7 +112,7 @@ static ConVar v_centerspeed( "v_centerspeed","500" );
|
||||
// and motions look the most natural.
|
||||
ConVar v_viewmodel_fov( "viewmodel_fov", "54", FCVAR_ARCHIVE, "Sets the field-of-view for the viewmodel.", true, 0.1, true, 179.9 );
|
||||
#else
|
||||
ConVar v_viewmodel_fov( "viewmodel_fov", "54", FCVAR_CHEAT, "Sets the field-of-view for the viewmodel.", true, 0.1, true, 179.9 );
|
||||
ConVar v_viewmodel_fov( "viewmodel_fov", "68", FCVAR_ARCHIVE, "Sets the field-of-view for the viewmodel.", true, 0.1, true, 179.9 );
|
||||
#endif
|
||||
ConVar mat_viewportscale( "mat_viewportscale", "1.0", FCVAR_ARCHIVE, "Scale down the main viewport (to reduce GPU impact on CPU profiling)", true, (1.0f / 640.0f), true, 1.0f );
|
||||
ConVar mat_viewportupscale( "mat_viewportupscale", "1", FCVAR_ARCHIVE, "Scale the viewport back up" );
|
||||
@@ -1125,11 +1125,13 @@ void CViewRender::Render( vrect_t *rect )
|
||||
|
||||
static ConVarRef sv_restrict_aspect_ratio_fov( "sv_restrict_aspect_ratio_fov" );
|
||||
float aspectRatio = engine->GetScreenAspectRatio() * 0.75f; // / (4/3)
|
||||
|
||||
|
||||
float limitedAspectRatio = aspectRatio;
|
||||
if ( ( sv_restrict_aspect_ratio_fov.GetInt() > 0 && engine->IsWindowedMode() && gpGlobals->maxClients > 1 ) ||
|
||||
sv_restrict_aspect_ratio_fov.GetInt() == 2 )
|
||||
{
|
||||
limitedAspectRatio = MIN( aspectRatio, 1.85f * 0.75f ); // cap out the FOV advantage at a 1.85:1 ratio (about the widest any legit user should be)
|
||||
limitedAspectRatio = MIN( aspectRatio, 1.85f * 1.75f ); // cap out the FOV advantage at a 1.85:1 ratio (about the widest any legit user should be)
|
||||
}
|
||||
|
||||
view.fov = ScaleFOVByWidthRatio( view.fov, limitedAspectRatio );
|
||||
|
||||
@@ -900,10 +900,11 @@ CON_COMMAND( give, "Give item to player.\n\tArguments: <item_name>" )
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
//------------------------------------------------------------------------------
|
||||
CON_COMMAND( fov, "Change players FOV" )
|
||||
CON_COMMAND( fov, "Change players FOV" ) //this is the "Fov" command
|
||||
{
|
||||
CBasePlayer *pPlayer = ToBasePlayer( UTIL_GetCommandClient() );
|
||||
if ( pPlayer && sv_cheats->GetBool() )
|
||||
//if ( pPlayer && sv_cheats->GetBool() )
|
||||
if ( pPlayer )
|
||||
{
|
||||
if ( args.ArgC() > 1 )
|
||||
{
|
||||
|
||||
@@ -39,8 +39,8 @@ extern IFileSystem *filesystem;
|
||||
#ifndef SA_MOVEMENT
|
||||
#define SA_MOVEMENT
|
||||
#endif
|
||||
ConVar sa_sv_pogostick("sv_pogostick", "0", FCVAR_REPLICATED, "queue jumps", 1, 0, 1, 1);
|
||||
ConVar sa_sv_queuejump("sv_queuejump", "1", FCVAR_REPLICATED, "auto bunny hopping", 1, 0, 1, 1);
|
||||
ConVar sa_sv_pogostick("sv_pogostick", "1", FCVAR_REPLICATED, "queue jumps", 1, 0, 1, 1);
|
||||
ConVar sa_sv_queuejump("sv_queuejump", "0", FCVAR_REPLICATED, "auto bunny hopping", 1, 0, 1, 1);
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@ public:
|
||||
virtual CBaseCombatWeapon *GetNextBestWeapon( CBaseCombatCharacter *pPlayer, CBaseCombatWeapon *pCurrentWeapon ); // I can't use this weapon anymore, get me the next best one.
|
||||
virtual bool ShouldCollide( int collisionGroup0, int collisionGroup1 );
|
||||
|
||||
virtual int DefaultFOV( void ) { return 90; }
|
||||
virtual int DefaultFOV( void ) { return 100; }
|
||||
|
||||
// This function is here for our CNetworkVars.
|
||||
inline void NetworkStateChanged()
|
||||
|
||||
@@ -1,3 +1,20 @@
|
||||
//========= Copyright © 1996-2010, Valve Corporation, All rights reserved. ============//
|
||||
//
|
||||
// Purpose:
|
||||
//
|
||||
//=============================================================================//
|
||||
#include "cbase.h"
|
||||
#include "gamemovement.h"
|
||||
|
||||
|
||||
|
||||
// Expose our interface.
|
||||
static CGameMovement g_GameMovement;
|
||||
IGameMovement *g_pGameMovement = (IGameMovement *)&g_GameMovement;
|
||||
|
||||
EXPOSE_SINGLE_INTERFACE_GLOBALVAR(CGameMovement, IGameMovement, INTERFACENAME_GAMEMOVEMENT, g_GameMovement);
|
||||
|
||||
/*
|
||||
//========= Copyright Valve Corporation, All rights reserved. ============//
|
||||
//
|
||||
// Purpose: Special handling for hl2 usable ladders
|
||||
@@ -142,6 +159,7 @@ LINK_ENTITY_TO_CLASS( reserved_spot, CReservePlayerSpot );
|
||||
// goalpos -
|
||||
// *ladder -
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void CHL2GameMovement::StartForcedMove( bool mounting, float transit_speed, const Vector& goalpos, CFuncLadder *ladder )
|
||||
{
|
||||
LadderMove_t* lm = GetLadderMove();
|
||||
@@ -522,7 +540,7 @@ bool CHL2GameMovement::ExitLadderViaDismountNode( CFuncLadder *ladder, bool stri
|
||||
//-----------------------------------------------------------------------------
|
||||
void CHL2GameMovement::FullLadderMove()
|
||||
{
|
||||
#if !defined( CLIENT_DLL )
|
||||
//#if !defined( CLIENT_DLL )
|
||||
CFuncLadder *ladder = GetLadder();
|
||||
Assert( ladder );
|
||||
if ( !ladder )
|
||||
@@ -701,7 +719,7 @@ void CHL2GameMovement::FullLadderMove()
|
||||
mv->SetAbsOrigin( oldOrigin );
|
||||
}
|
||||
}
|
||||
#endif
|
||||
//#endif
|
||||
}
|
||||
|
||||
bool CHL2GameMovement::CheckLadderAutoMountEndPoint( CFuncLadder *ladder, const Vector& bestOrigin )
|
||||
@@ -1150,3 +1168,4 @@ bool CHL2GameMovement::CanAccelerate()
|
||||
|
||||
EXPOSE_SINGLE_INTERFACE_GLOBALVAR(CGameMovement, IGameMovement,INTERFACENAME_GAMEMOVEMENT, g_GameMovement );
|
||||
#endif
|
||||
*/
|
||||
@@ -1,3 +1,4 @@
|
||||
/*
|
||||
//========= Copyright Valve Corporation, All rights reserved. ============//
|
||||
//
|
||||
// Purpose: Special handling for hl2 usable ladders
|
||||
@@ -127,3 +128,4 @@ inline CFuncLadder *CHL2GameMovement::GetLadder()
|
||||
{
|
||||
return static_cast<CFuncLadder*>( static_cast<CBaseEntity *>( GetHL2Player()->m_HL2Local.m_hLadder.Get() ) );
|
||||
}
|
||||
*/
|
||||
@@ -67,7 +67,7 @@ ConVar sv_maxspeed ( "sv_maxspeed", "320", FCVAR_NOTIFY | FCVAR_REPLICATED | FC
|
||||
#endif//_XBOX
|
||||
|
||||
#if defined( CSTRIKE_DLL ) || defined( HL1MP_DLL ) || defined( SArena_DLL ) //we need these to not be hidden
|
||||
ConVar sv_airaccelerate( "sv_airaccelerate", "10", FCVAR_NOTIFY | FCVAR_REPLICATED);
|
||||
ConVar sv_airaccelerate( "sv_airaccelerate", "100", FCVAR_NOTIFY | FCVAR_REPLICATED);
|
||||
ConVar sv_wateraccelerate( "sv_wateraccelerate", "10", FCVAR_NOTIFY | FCVAR_REPLICATED);
|
||||
ConVar sv_waterfriction( "sv_waterfriction", "1", FCVAR_NOTIFY | FCVAR_REPLICATED);
|
||||
ConVar sv_footsteps ( "sv_footsteps", "1", FCVAR_NOTIFY | FCVAR_REPLICATED, "Play footstep sound for players" );
|
||||
|
||||
@@ -628,7 +628,8 @@ ConVarRef suitcharger( "sk_suitcharger" );
|
||||
break;
|
||||
default:
|
||||
case 0:// fixed
|
||||
return 10;
|
||||
//return 10;
|
||||
return 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -234,7 +234,7 @@ enum CastVote
|
||||
|
||||
#define MAX_PLACE_NAME_LENGTH 18
|
||||
|
||||
#define MAX_FOV 90
|
||||
#define MAX_FOV 140 //Max fov
|
||||
|
||||
//===================================================================================================================
|
||||
// Team Defines
|
||||
|
||||
64
mp/src/games.sln
Normal file
64
mp/src/games.sln
Normal file
@@ -0,0 +1,64 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.29201.188
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Client (HL2MP)", "game\client\client_hl2mp.vcxproj", "{17BCE59A-9037-EC8D-433E-F81339E2F1BA}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{BAB92FF0-D72A-D7E5-1988-74628D39B94F} = {BAB92FF0-D72A-D7E5-1988-74628D39B94F}
|
||||
{EC1C516D-E1D9-BC0A-F79D-E91E954ED8EC} = {EC1C516D-E1D9-BC0A-F79D-E91E954ED8EC}
|
||||
{F69B3672-C5E8-CD1A-257F-253A25B5B939} = {F69B3672-C5E8-CD1A-257F-253A25B5B939}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathlib", "mathlib\mathlib.vcxproj", "{BAB92FF0-D72A-D7E5-1988-74628D39B94F}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Raytrace", "raytrace\raytrace.vcxproj", "{95D67225-8415-236F-9128-DCB171B7DEC6}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Server (HL2MP)", "game\server\server_hl2mp.vcxproj", "{33B7DFDC-BECB-3678-1190-6C951E393EB3}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{BAB92FF0-D72A-D7E5-1988-74628D39B94F} = {BAB92FF0-D72A-D7E5-1988-74628D39B94F}
|
||||
{EC1C516D-E1D9-BC0A-F79D-E91E954ED8EC} = {EC1C516D-E1D9-BC0A-F79D-E91E954ED8EC}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tier1", "tier1\tier1.vcxproj", "{EC1C516D-E1D9-BC0A-F79D-E91E954ED8EC}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vgui_controls", "vgui2\vgui_controls\vgui_controls.vcxproj", "{F69B3672-C5E8-CD1A-257F-253A25B5B939}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x86 = Debug|x86
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{17BCE59A-9037-EC8D-433E-F81339E2F1BA}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{17BCE59A-9037-EC8D-433E-F81339E2F1BA}.Debug|x86.Build.0 = Debug|Win32
|
||||
{17BCE59A-9037-EC8D-433E-F81339E2F1BA}.Release|x86.ActiveCfg = Release|Win32
|
||||
{17BCE59A-9037-EC8D-433E-F81339E2F1BA}.Release|x86.Build.0 = Release|Win32
|
||||
{BAB92FF0-D72A-D7E5-1988-74628D39B94F}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{BAB92FF0-D72A-D7E5-1988-74628D39B94F}.Debug|x86.Build.0 = Debug|Win32
|
||||
{BAB92FF0-D72A-D7E5-1988-74628D39B94F}.Release|x86.ActiveCfg = Release|Win32
|
||||
{BAB92FF0-D72A-D7E5-1988-74628D39B94F}.Release|x86.Build.0 = Release|Win32
|
||||
{95D67225-8415-236F-9128-DCB171B7DEC6}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{95D67225-8415-236F-9128-DCB171B7DEC6}.Debug|x86.Build.0 = Debug|Win32
|
||||
{95D67225-8415-236F-9128-DCB171B7DEC6}.Release|x86.ActiveCfg = Release|Win32
|
||||
{95D67225-8415-236F-9128-DCB171B7DEC6}.Release|x86.Build.0 = Release|Win32
|
||||
{33B7DFDC-BECB-3678-1190-6C951E393EB3}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{33B7DFDC-BECB-3678-1190-6C951E393EB3}.Debug|x86.Build.0 = Debug|Win32
|
||||
{33B7DFDC-BECB-3678-1190-6C951E393EB3}.Release|x86.ActiveCfg = Release|Win32
|
||||
{33B7DFDC-BECB-3678-1190-6C951E393EB3}.Release|x86.Build.0 = Release|Win32
|
||||
{EC1C516D-E1D9-BC0A-F79D-E91E954ED8EC}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{EC1C516D-E1D9-BC0A-F79D-E91E954ED8EC}.Debug|x86.Build.0 = Debug|Win32
|
||||
{EC1C516D-E1D9-BC0A-F79D-E91E954ED8EC}.Release|x86.ActiveCfg = Release|Win32
|
||||
{EC1C516D-E1D9-BC0A-F79D-E91E954ED8EC}.Release|x86.Build.0 = Release|Win32
|
||||
{F69B3672-C5E8-CD1A-257F-253A25B5B939}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{F69B3672-C5E8-CD1A-257F-253A25B5B939}.Debug|x86.Build.0 = Debug|Win32
|
||||
{F69B3672-C5E8-CD1A-257F-253A25B5B939}.Release|x86.ActiveCfg = Release|Win32
|
||||
{F69B3672-C5E8-CD1A-257F-253A25B5B939}.Release|x86.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {1D78039F-6074-40C4-8237-C7B4C2D01F18}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
Reference in New Issue
Block a user