Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/scripting/AS-MicroTF2.sp
  • Loading branch information
safalin1 committed May 27, 2024
2 parents 7310f26 + 5c4355e commit 910f3c9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

A custom gamemode for Team Fortress 2 - Players compete against each other to get the most points by playing a series of rapid fire microgames in order to win the round!

![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/gemidyne/microtf2/total) ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/gemidyne/microtf2/ci.yml)

Interested in what's next? View our kanban board: https://github.com/orgs/gemidyne/projects/5/views/1?sliceBy%5Bvalue%5D=v6


## How to install the gamemode
We have created an install guide to help you install the gamemode - see wiki page here: https://github.com/gemidyne/microtf2/wiki/How-to-install-the-gamemode
Expand Down
4 changes: 1 addition & 3 deletions src/scripting/ConVars.sp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ void ResetConVars()
ResetConVar(FindConVar("mp_waitingforplayers_time"));
ResetConVar(FindConVar("mp_disable_respawn_times"));
ResetConVar(FindConVar("mp_respawnwavetime"));
ResetConVar(FindConVar("mp_idlemaxtime"));

// TeamFortress ConVars
ResetConVar(FindConVar("tf_avoidteammates_pushaway"));
Expand All @@ -124,7 +123,6 @@ void PrepareConVars()
SetConVarInt(FindConVar("mp_waitingforplayers_time"), g_hConVarWaitingForPlayersTime.IntValue);
SetConVarInt(FindConVar("mp_disable_respawn_times"), 0);
SetConVarInt(FindConVar("mp_respawnwavetime"), 9999);
SetConVarInt(FindConVar("mp_idlemaxtime"), 8);
SetConVarInt(FindConVar("tf_avoidteammates_pushaway"), 0);
SetConVarFloat(FindConVar("tf_max_health_boost"), 1.0);
SetConVarFloat(FindConVar("tf_airblast_cray_ground_minz"), 268.3281572999747);
Expand Down Expand Up @@ -171,4 +169,4 @@ public void OnWaitingForPlayersTimeChanged(Handle cvar, const char[] oldVal, con
public bool Config_BonusPointsEnabled()
{
return g_hConVarPluginBonusPoints.BoolValue;
}
}

0 comments on commit 910f3c9

Please sign in to comment.