Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

.github/workflows/dockerimage.yaml

@@ -12,8 +12,6 @@ on:
     - 'Dockerfile.i386'
     - 'Dockerfile.armhf'
     - 'Dockerfile.arm64'
-    - 'Dockerfile.osx-x64'
-    - 'Dockerfile.osx-arm64'
 
 jobs:
   build:
@@ -28,10 +26,6 @@ jobs:
           dockerfile: Dockerfile.armhf
         - tag: arm64
           dockerfile: Dockerfile.arm64
-        - tag: osx-x64
-          dockerfile: Dockerfile.osx-x64
-        - tag: osx-arm64
-          dockerfile: Dockerfile.osx-arm64
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

CONTRIBUTING.md

@@ -1,192 +1 @@
-# Contributors Guide
-
-So you've decided to become a contributor to our project. Excellent!
-
-We are always looking for new developers, so if you're new,
-please check out our [Getting Started guide](https://wiki.multitheftauto.com/wiki/Coding_info).
-
-But before we can start accepting your code, there are a couple of
-things you should know about how we work. 
-
-This document mostly contains guidelines and rules as to how your
-code should be structured and how it can be committed without
-upsetting any fellow contributors.
-
-## Where to code
-
-As a new potential contributor, you will need to fork our repository and make
-commits to your own "branch". Then you can send us a pull request.
-
-Our _`master`_ branch is the main development branch containing the
-latest, bleeding-edge code.
-
-Our _other_ branches contain groundbreaking research, radical ideas and other
-work-in-progress changes that are meant to be merged into `master` at
-a later point in time.
-
-If you're a collaborator, it's your choice whether to push branches to this
-repository or to your own fork.
-
-**Branches are "topical" and should not be "personal" to each
-user.** This means that a branch should be created for a new feature,
-not for a user specific playground.
-
-## What to code
-
-Generally, please try submit pull requests that resolve existing
-[issues](https://github.com/multitheftauto/mtasa-blue/issues).
-
-If you're looking for something to work on, take a look at the ["good first issue"]
-label, or our [milestones].
-
-["good first issue"]: https://github.com/multitheftauto/mtasa-blue/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22
-[milestones]: https://github.com/multitheftauto/mtasa-blue/milestones?direction=asc&sort=due_date
-
-Of course, if you're interested in something else, feel free to experiment
-and submit it. But discussing the feature beforehand, in an issue, will
-make your pull request more likely to be merged in a timely fashion.
-
-## Committing code
-
-**Make sure your code contributions follow the [Style Guide]**.
-
-[Style Guide]: https://github.com/multitheftauto/mtasa-blue/wiki/Style-Guide
-
-**Commits should be tested when added to master.** Commits
-that 'need to be fixed later' which directly affect the state of
-the mod will be reverted other than in exceptional circumstances.
-
-**Commit messages should**
-
-- be consistent
-- always give a clear indication of what has been changed without having to look at the code
-- include issue numbers, using [GitHub keywords](https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) where necessary
-- [follow the seven rules identified here](http://chris.beams.io/posts/git-commit/)
-
-The most important of the [seven rules](http://chris.beams.io/posts/git-commit/) has been copied below, but please read the article:
-
-1. Separate subject from body with a blank line
-2. Limit the subject line to around 60-80 characters (the [seven rules] say 50, but we think ~70 is okay)
-3. Use the imperative mood in the subject line
-4. Use the body to explain what and why vs. how
-
-**Follow up (addendum) commits should refer to the previous commit.** Do this by 
-including the previous commit-identifier SHA and, if there's space, a summarised commit message in
-the new commit message. Doing this will help identify related commits
-if they are viewed at a later date.
-
-**Try to keep pull requests small — they should be about one thing.** When you do multiple things
-in one pull request, it's hard to review. If you're fixing stuff as you go, you might want
-to make atomic commits and then cherry-pick those commits into separate branches,
-leaving the pull request clean.
-
-**Read the ["Code Review"] guide** for more guidelines about the code review process.
-
-**Examples**. Here are some examples of commit messages with a short and descriptive title in the imperative mood.
-
-1.  Here we also have a description that explains the content of the commit.
-    ```
-    Fix vehicle model memory leaks in engineReplaceModel
-    
-    Fixed 3 memory leaks:
-    - clump model leak
-    - vehicle visual data (dummies) leak
-    - engineReplaceModel added extra references to TXD, and this was not getting unloaded at times
-    ```
-
-2.  Here we have a longer description that explains how to use the feature. The body is wrapped at 72 characters.
-    ```
-    Add "beta" CVAR "_beta_qc_rightclick_command"
-    
-    This variable lets you execute a command of your choice when you right
-    click the "quick connect" button.
-    
-    By default this CVAR is set to "reconnect", but you can set it to
-    anything - "connect orange.mtasa.com" or "nick timw0w".
-    
-    In the console, type "_beta_qc_rightclick_command" and press enter. This
-    will tell you the current value of the CVAR.
-    
-    You can do "_beta_qc_rightclick_command=nick timw0w" to change the
-    value of the CVAR.
-    ```
-
-3.  Here we say `Fix #1115` so that GitHub automatically closes issue #1115. There's no description.
-    ```
-    Fix #1115: add async encode/decodeString
-    ```
-
-4.  There was no specific issue being fixed here, but GitHub's squash-merge feature automatically appended `(#1177)`,
-    telling us which pull request created this commit. There's no description.
-    ```
-    Add "remember this option" checkbox to NVidia Optimus dialog (#1177)
-    ```
-
-5.  Here we refer to a previous commit.
-    ```
-    Addendum to a80f8d6: fix Windows build error
-    ```
-
-## Reviewing code
-
-Contributors should try to review other contributor's commits and provide
-feedback as much as possible.
-
-Please read our ["Code Review"] article for information on how to review code effectively.
-
-["Code Review"]: https://github.com/multitheftauto/mtasa-blue/wiki/Code-Review
-
-<!--
-
-TODO(qaisjp): the below content should be part of a code of conduct instead
-
-Ratings and comments are open for the public to review code and provide
-feedback. Please be mature and civilised when posting comments.
-
-Make sure you make appropriate use of the GitHub Reactions feature to
-rate commits or express agreement/disagreement to a comment. This avoids
-spammy comments such as "+1", "-1", "Nice one!", etc.
-
-Since you can only react to comments, not commits, feel free to create
-the initial "+1" comment in response to a commit. However, future
-similar reactions to a commit should be to the first response comment.
-
--->
-
-## Gaining and losing merge rights
-
-Merge rights allow you to merge your own approved pull requests and 
-review other people's pull requests.
-
-We grant merge rights after you have proven yourself to be competent,
-which is generally after 3-5 pull requests. This is not fixed and depends
-on the extent of your contributions, community status and other factors.
-
-The subject matter of your pull requests do not matter — we are more interested in,
-once granted merge rights, whether you are capable of maintaining
-a high standard of code and remaining cohesive with other project collaborators.
-
-After gaining merge rights, if your contributions are of a consistently low standard,
-or you fail to stick to the rules, your permissions will be revoked.
-
-## Merging pull requests
-
-Before merging, enforced by GitHub's branch protection, pull requests **require**:
-- Linux and Windows status checks to pass
-- 1 pull request review
-
-If the pull request is large, try and only merge if there at least 2 pull request reviews.
-This isn't enforced via branch protection, but please try and stick to this convention
-(... unless nobody else is reviewing your PR).
-
-Branch protection is **not enforced** for repository administrators,
-and those people are therefore not required to send pull requests. Individual repository admins may,
-for the greater good, pledge to submit pull requests despite this lack of enforcement.
-
-For informational purposes, the current repository administrators are those marked as _The MTA Team_ on
-[this list](https://forum.mtasa.com/staff/).
-
-**Merge button**
-
-Generally use the "Squash and merge" button. If multiple commits are needed because you think
-having the separate commits are useful, use "Rebase and merge".
+This information is now available at [mtasa-docs (mtasa-blue CONTRIBUTING.md)](https://github.com/multitheftauto/mtasa-docs/blob/main/mtasa-blue/CONTRIBUTING.md).

Client/cefweb/CWebCore.cpp

@@ -71,7 +71,6 @@ bool CWebCore::Initialise()
 #else
     CefString(&settings.browser_subprocess_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\CEFLauncher_d.exe")));
 #endif
-    CefString(&settings.resources_dir_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF")));
     CefString(&settings.cache_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\cache")));
     CefString(&settings.locales_dir_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\locales")));
     CefString(&settings.log_file).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\cefdebug.txt")));

Client/core/CChat.cpp

@@ -1117,6 +1117,11 @@ void CChat::SetCharacterLimit(int charLimit)
     m_iCharacterLimit = charLimit;
 }
 
+float CChat::GetChatBottomPosition() const noexcept
+{
+    return m_vecBackgroundSize.fY;
+}
+
 CChatLine::CChatLine()
 {
     m_bActive = false;

Client/core/CChat.h

@@ -207,6 +207,8 @@ class CChat
     constexpr int GetDefaultCharacterLimit() const { return m_iDefaultCharacterLimit; }
     constexpr int GetMaxCharacterLimit() const { return m_iMaxCharacterLimit; }
 
+    float GetChatBottomPosition() const noexcept;
+
 private:
     void LoadCVars();
 

Client/core/CCommands.cpp

@@ -125,6 +125,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 
     // Grab the command
     tagCOMMANDENTRY* pEntry = Get(szCommand);
+    bool             wasHandled = false;
     if (pEntry)
     {
         // If its a core command, or if its enabled
@@ -133,14 +134,16 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
             // Execute it
             if (!bIsScriptedBind || pEntry->bAllowScriptedBind)
                 ExecuteHandler(pEntry->pfnCmdFunc, szParameters);
-            return true;
+
+            wasHandled = true;
         }
     }
 
     // Recompose the original command text
     std::string val = std::string(szCommand) + " " + std::string(szParameters ? szParameters : "");
 
     // Is it a cvar? (syntax: cvar[ = value])
+    if (!wasHandled)
     {
         // Check to see if '=' exists
         unsigned int nOpIndex = val.find('=');
@@ -188,7 +191,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 
     // HACK: if its a 'nick' command, save it here
     bool bIsNickCommand = !stricmp(szCommand, "nick");
-    if (bIsNickCommand && szParameters && !bIsScriptedBind)
+    if (!wasHandled && bIsNickCommand && szParameters && !bIsScriptedBind)
     {
         if (CCore::GetSingleton().IsValidNick(szParameters))
         {
@@ -208,10 +211,14 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
     // Try to execute the handler
     if (m_pfnExecuteHandler)
     {
-        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, (pEntry != NULL), bIsScriptedBind))
+        bool bAllowScriptedBind = (!pEntry || pEntry->bAllowScriptedBind);
+        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, wasHandled, bIsScriptedBind, bAllowScriptedBind))
             return true;
     }
 
+    if (wasHandled)
+        return true;
+
     // Unknown command
     val = _("Unknown command or cvar: ") + szCommand;
     if (!bIsScriptedBind && !bIsNickCommand && pEntry == nullptr)

Client/core/CCore.cpp

@@ -1787,6 +1787,19 @@ void CCore::UpdateRecentlyPlayed()
     CCore::GetSingleton().SaveConfig();
 }
 
+void CCore::OnPostColorFilterRender()
+{
+    if (!CGraphics::GetSingleton().HasLine3DPostFXQueueItems() && !CGraphics::GetSingleton().HasPrimitive3DPostFXQueueItems())
+        return;
+
+    CGraphics::GetSingleton().EnteringMTARenderZone();      
+
+    CGraphics::GetSingleton().DrawPrimitive3DPostFXQueue();
+    CGraphics::GetSingleton().DrawLine3DPostFXQueue();
+
+    CGraphics::GetSingleton().LeavingMTARenderZone();
+}
+
 void CCore::ApplyCoreInitSettings()
 {
 #if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN) // Windows Vista
@@ -1856,6 +1869,13 @@ void CCore::RecalculateFrameRateLimit(uint uiServerFrameRateLimit, bool bLogToCo
     if ((m_uiFrameRateLimit == 0 || uiClientScriptRate < m_uiFrameRateLimit) && uiClientScriptRate > 0)
         m_uiFrameRateLimit = uiClientScriptRate;
 
+    // Removes Limiter from Frame Graph if limit is zero and skips frame limit
+    if (m_uiFrameRateLimit == 0)
+    {
+        m_bQueuedFrameRateValid = false;
+        GetGraphStats()->RemoveTimingPoint("Limiter");
+    }
+
     // Print new limits to the console
     if (bLogToConsole)
     {
@@ -2010,22 +2030,6 @@ void CCore::OnPreFxRender()
 //
 void CCore::OnPreHUDRender()
 {
-    IDirect3DDevice9* pDevice = CGraphics::GetSingleton().GetDevice();
-
-    if (CGraphics::GetSingleton().HasLine3DPostFXQueueItems() || CGraphics::GetSingleton().HasPrimitive3DPostFXQueueItems())
-    {
-        /*
-            Although MTA render zones are expensive, we should use them twice in the bounds of the function
-            because some of render states from PostFX drain to the 2D part of the frame.
-        */
-        CGraphics::GetSingleton().EnteringMTARenderZone();
-
-        CGraphics::GetSingleton().DrawPrimitive3DPostFXQueue();
-        CGraphics::GetSingleton().DrawLine3DPostFXQueue();
-
-        CGraphics::GetSingleton().LeavingMTARenderZone();
-    }
-
     CGraphics::GetSingleton().EnteringMTARenderZone();    
 
     // Maybe capture screen and other stuff
@@ -2184,11 +2188,6 @@ CModelCacheManager* CCore::GetModelCacheManager()
     return m_pModelCacheManager;
 }
 
-void CCore::AddModelToPersistentCache(ushort usModelId)
-{
-    return GetModelCacheManager()->AddModelToPersistentCache(usModelId);
-}
-
 void CCore::StaticIdleHandler()
 {
     g_pCore->IdleHandler();

Client/core/CCore.h

@@ -253,7 +253,6 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     EDiagnosticDebugType GetDiagnosticDebug();
     void                 SetDiagnosticDebug(EDiagnosticDebugType value);
     CModelCacheManager*  GetModelCacheManager();
-    void                 AddModelToPersistentCache(ushort usModelId);
 
     static void StaticIdleHandler();
     void        IdleHandler();
@@ -289,6 +288,8 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     const SString& GetLastConnectedServerName() const { return m_strLastConnectedServerName; }
     void           SetLastConnectedServerName(const SString& strServerName) { m_strLastConnectedServerName = strServerName; }
 
+    void OnPostColorFilterRender() override;
+
 private:
     void ApplyCoreInitSettings();
 

Client/core/CGUI.cpp

@@ -449,6 +449,11 @@ CChat* CLocalGUI::GetChat()
     return m_pChat;
 }
 
+float CLocalGUI::GetChatBottomPosition() const noexcept
+{
+    return m_pChat->GetChatBottomPosition();
+}
+
 CDebugView* CLocalGUI::GetDebugView()
 {
     return m_pDebugView;

Client/core/CGUI.h

@@ -68,6 +68,7 @@ class CLocalGUI : public CSingleton<CLocalGUI>
     bool       IsMainMenuVisible();
 
     CChat* GetChat();
+    float  GetChatBottomPosition() const noexcept;
     void   SetChatBoxVisible(bool bVisible, bool bInputBlocked = true);
     bool   IsChatBoxVisible();
     bool   IsChatBoxInputBlocked();