]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into pending-release
authordrjaska <drjaska83@gmail.com>
Fri, 25 Oct 2024 22:50:19 +0000 (01:50 +0300)
committerdrjaska <drjaska83@gmail.com>
Fri, 25 Oct 2024 22:50:19 +0000 (01:50 +0300)
1  2 
notifications.cfg
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
qcsrc/common/notifications/all.inc
qcsrc/common/notifications/all.qc
qcsrc/common/notifications/all.qh
qcsrc/server/client.qc

Simple merge
Simple merge
Simple merge
Simple merge
index 7216b406113586b27375487e7e9636f0af4f7ad2,a0f3c7eaf1121e127e4add07b7a47e5669cc2536..90c40399a1ee9e80299b4ee9981e02d9e6a6cfa7
@@@ -1326,10 -1348,10 +1348,10 @@@ void ChatBubbleThink(entity this
  
        this.mdl = "";
  
-       if ( !IS_DEAD(this.owner) && IS_PLAYER(this.owner) )
+       if ( !IS_DEAD(this.owner) && IS_PLAYER(this.owner) && !MUTATOR_CALLHOOK(ShowChatBubble, this.owner, this) )
        {
                if ( CS(this.owner).active_minigame && PHYS_INPUT_BUTTON_MINIGAME(this.owner) )
 -                      this.mdl = "models/sprites/minigame_busy.iqm";
 +                      this.mdl = "models/misc/minigame_busy.spr";
                else if (PHYS_INPUT_BUTTON_CHAT(this.owner))
                        this.mdl = "models/misc/chatbubble.spr";
        }