Merge branch 'master' into issue-9608

Author: patrikjuvonen

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**MTA Client (please complete the following information):**
+ - Version [e.g. 1.1, 1.5.4]
+ - Running in Wine? [e.g, No, Yes - Linux, Yes - macOS]
+
+**MTA Server (please complete the following information):**
+ - OS: [e.g. Windows 7, Debian Stretch]
+ - Version [e.g. 1.1, 1.5.4]
+
+**Additional context**
+Add any other context about the problem here

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/security-report.md

@@ -0,0 +1,9 @@
+---
+name: Security report
+about: Submit cheat or security vulnerability
+
+---
+
+Please submit your cheats or security vulnerabilities to @ccw on forum.mtasa.com. Please do not submit them here.
+
+@ccw can be found here: https://forum.mtasa.com/profile/7264-ccw/

PULL_REQUEST_TEMPLATE.md renamed to .github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,3 @@
-# Only use pull requests to submit patches! Use [the bug tracker](https://bugs.multitheftauto.com) to report bugs, or [the forum](https://forum.mtasa.com) to ask for help!
-
 Before you go ahead and create a pull request, please make sure:
 
 * [ ] [your code follows the coding guidelines](https://wiki.multitheftauto.com/index.php?title=Coding_guidelines)

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 Our project's code repository can be found on the [multitheftauto/mtasa-blue](https://github.com/multitheftauto/mtasa-blue/) Git repository at [GitHub](https://github.com/). We are always looking for new developers, so if you're interested, here are some useful links:
 
 * [Nightly Builds](https://nightly.mtasa.com/)
-* [Bugtracker Roadmap](https://bugs.mtasa.com/roadmap_page.php)
+* [Issue Tracker](https://github.com/multitheftauto/mtasa-blue)
 * [Wiki Roadmap](https://wiki.mtasa.com/wiki/Roadmap)
 
 Before committing, please review the [coding guidelines](https://wiki.mtasa.com/index.php?title=Coding_guidelines).

Client/core/CClientVariables.cpp

@@ -252,6 +252,7 @@ void CClientVariables::ValidateValues(void)
     ClampValue("chat_position_vertical", Chat::Position::Vertical::TOP, Chat::Position::Vertical::BOTTOM);
     ClampValue("chat_text_alignment", Chat::Text::Align::LEFT, Chat::Text::Align::RIGHT);
     ClampValue("text_scale", 0.8f, 3.0f);
+    ClampValue("mastervolume", 0.0f, 1.0f);
     ClampValue("mtavolume", 0.0f, 1.0f);
     ClampValue("voicevolume", 0.0f, 1.0f);
     ClampValue("mapalpha", 0, 255);
@@ -309,6 +310,7 @@ void CClientVariables::LoadDefaults(void)
     DEFAULT("fly_with_mouse", false);                                                 // flying with mouse controls
     DEFAULT("steer_with_mouse", false);                                               // steering with mouse controls
     DEFAULT("classic_controls", false);                                               // classic/standard controls
+    DEFAULT("mastervolume", 1.0f);                                                    // master volume
     DEFAULT("mtavolume", 1.0f);                                                       // custom sound's volume
     DEFAULT("voicevolume", 1.0f);                                                     // voice chat output volume
     DEFAULT("mapalpha", 155);                                                         // map alpha
@@ -334,6 +336,7 @@ void CClientVariables::LoadDefaults(void)
     DEFAULT("multimon_fullscreen_minimize", 1);                                       // 0-off 1-on
     DEFAULT("vertical_aim_sensitivity", 0.0015f);                                     // 0.0015f is GTA default setting
     DEFAULT("process_priority", 0);                                                   // 0-normal 1-above normal 2-high
+    DEFAULT("mute_master_when_minimized", 0);                                         // 0-off 1-on
     DEFAULT("mute_sfx_when_minimized", 0);                                            // 0-off 1-on
     DEFAULT("mute_radio_when_minimized", 0);                                          // 0-off 1-on
     DEFAULT("mute_mta_when_minimized", 0);                                            // 0-off 1-on

Client/core/CCore.cpp

@@ -185,6 +185,10 @@ CCore::~CCore(void)
     // Destroy tray icon
     delete m_pTrayIcon;
 
+    // This will set the GTA volume to the GTA volume value in the settings,
+    // and is not affected by the master volume setting.
+    m_pLocalGUI->GetMainMenu()->GetSettingsWindow()->ResetGTAVolume();
+
     // Delete the mod manager
     delete m_pModManager;
     SAFE_DELETE(m_pMessageBox);