Prechádzať zdrojové kódy

Merge branch 'develop' into feature/sbotserver

Daniel Gibbs 7 rokov pred
rodič
commit
ca5c8b5cdf

+ 73 - 0
CODE_OF_CONDUCT.md

@@ -0,0 +1,73 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+*  Using welcoming and inclusive language
+*  Being respectful of differing viewpoints and experiences
+*  Gracefully accepting constructive criticism
+*  Focusing on what is best for the community
+*  Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at me@danielgibbs.co.uk. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

+ 9 - 8
lgsm/config-default/config-lgsm/csgoserver/_default.cfg

@@ -10,14 +10,15 @@
 
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
 # https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server
-# [Game Modes]			gametype	gamemode	mapgroup (you can mix these across Game Modes, but use only one)
-# Arms Race				1			0			mg_armsrace
-# Classic Casual		0			0			mg_casualsigma, mg_casualdelta
-# Classic Competitive	0			1			mg_active, mg_reserves, mg_hostage, mg_de_dust2
-# Custom				3			0
-# Deathmatch			1			2			mg_deathmatch
-# Demolition			1			1			mg_demolition
-# Wingman				0			2			
+# [Game Modes]					gametype	gamemode	mapgroup (you can mix these across Game Modes, but use only one)
+# Arms Race						1			0			mg_armsrace
+# Classic Casual				0			0			mg_casualsigma, mg_casualdelta
+# Classic Competitive			0			1			mg_active, mg_reserves, mg_hostage, mg_de_dust2
+# Custom						3			0
+# Deathmatch					1			2			mg_deathmatch
+# Demolition					1			1			mg_demolition
+# Wingman						0			2			
+# Danger Zone (FreeForAll)		6			0			mg_dz_blacksite
 gametype="0"
 gamemode="0"
 mapgroup="mg_active"