Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

diff --git a/commands.cfg b/commands.cfg
index 0e8bb7712d94c87bb5d19d397d8fac6f84705b28..33e8e42cfc0781b866263350767f22d83cc6814a 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -82,6 +82,7 @@ alias addvote "qc_cmd_svmenu addtolist sv_vote_commands ${* ?}"
 alias bsp "ls maps/*.bsp"
 alias chmap "changelevel ${* ?}"
 alias clearmap "disconnect"
+alias devmap "set _developer_save $developer; set developer 1; changelevel ${* ?}; set developer $_developer_save"
 alias ply "playdemo $1"
 alias rec "record demos/${1 !}"
 alias search "apropos ${* ?}"

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 0227c0ee1f6e770f771592aa01b5dc63ff31db88..e20969c788b8a18f6a3903613aaa5e7013c10d41 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1016,6 +1016,7 @@ set con_completion_ply            *.dem
 set con_completion_tdem                *.dem
 set con_completion_exec                *.cfg
 set con_completion_chmap       map
+set con_completion_devmap      map
 set con_completion_gotomap     map
 set con_completion_vmap                map
 set con_completion_vnextmap    map

diff --git a/models/weapons/h_kleinbottle.iqm b/models/weapons/h_kleinbottle.iqm
new file mode 100644 (file)
index 0000000..523ef99
Binary files /dev/null and b/models/weapons/h_kleinbottle.iqm differ

diff --git a/models/weapons/h_kleinbottle.iqm.framegroups b/models/weapons/h_kleinbottle.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_kleinbottle.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/v_kleinbottle.md3 b/models/weapons/v_kleinbottle.md3
new file mode 100644 (file)
index 0000000..b42affb
Binary files /dev/null and b/models/weapons/v_kleinbottle.md3 differ

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index 0f990c69410d2646ccb0f8dca6a2281d6f46e3be..c1d67af6c38224daf3e5fd9965367ed5970b83a8 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -908,7 +908,7 @@ float HUD_Panel_Check_Mouse_Pos(float allow_move)
                border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize
 
                // move
-               if(allow_move && mousepos_x >= panel_pos_x && mousepos_y >= panel_pos_y && mousepos_x <= panel_pos_x + panel_size_x && mousepos_y <= panel_pos_y + panel_size_y)
+               if(allow_move && mousepos_x > panel_pos_x && mousepos_y > panel_pos_y && mousepos_x < panel_pos_x + panel_size_x && mousepos_y < panel_pos_y + panel_size_y)
                {
                        return 1;
                }
@@ -988,7 +988,7 @@ void HUD_Panel_Highlight(float allow_move)
                border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize
 
                // move
-               if(allow_move && mousepos_x >= panel_pos_x && mousepos_y >= panel_pos_y && mousepos_x <= panel_pos_x + panel_size_x && mousepos_y <= panel_pos_y + panel_size_y)
+               if(allow_move && mousepos_x > panel_pos_x && mousepos_y > panel_pos_y && mousepos_x < panel_pos_x + panel_size_x && mousepos_y < panel_pos_y + panel_size_y)
                {
                        highlightedPanel = i;
                        HUD_Panel_FirstInDrawQ(i);

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 2fea077c5d0c928c6629289de9273886b3e98fd9..a22347fe3ca3f53ebea4acbd59eb01aa05bc684f 100644 (file)
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,6 +1,6 @@
 #define TUBA_MIN -18
 #define TUBA_MAX  27
-#define TUBA_INSTRUMENTS 2
+#define TUBA_INSTRUMENTS 3
 
 #define TUBA_STARTNOTE(i,n) strcat("weapons/tuba", (i ? ftos(i) : ""), "_loopnote", ftos(n), ".wav")
 .float note; // note

diff --git a/qcsrc/server/bot/scripting.qc b/qcsrc/server/bot/scripting.qc
index a1c00d0409183fb32e5cea864b7ff3764a5d9c94..ace11c6d696a52a046fee386f4a44fca4563091f 100644 (file)
--- a/qcsrc/server/bot/scripting.qc
+++ b/qcsrc/server/bot/scripting.qc
@@ -31,17 +31,23 @@ void bot_queuecommand(entity bot, string cmdstring)
                string parm;
                string cmdstr;
 
-               sp = strstrofs(cmdstr, " ", 0);
-               if(sp < 0)
+               sp = strstrofs(cmdstring, " ", 0);
+               if(sp >= 0)
                {
-                       parm = "";
-               }
-               else
-               {
-                       parm = substring(cmdstr, sp + 1, -1);
-                       cmdstr = substring(cmdstr, 0, sp);
+                       parm = substring(cmdstring, sp + 1, -1);
+                       cmdstr = substring(cmdstring, 0, sp);
                        if(cmdstr == "sound")
-                               precache_sound(cmdstr);
+                       {
+                               // find the LAST word
+                               for(;;)
+                               {
+                                       sp = strstrofs(parm, " ", 0);
+                                       if(sp < 0)
+                                               break;
+                                       parm = substring(parm, sp + 1, -1);
+                               }
+                               precache_sound(parm);
+                       }
                }
        }
 
@@ -1091,8 +1097,24 @@ float bot_cmd_sound()
        string f;
        f = bot_cmd.bot_cmd_parm_string;
 
+       float n = tokenizebyseparator(f, " ");
+
+       string sample = f;
+       float chan = CH_WEAPON_B;
+       float vol = VOL_BASE;
+       float atten = ATTN_MIN;
+
+       if(n >= 1)
+               sample = argv(n - 1);
+       if(n >= 2)
+               chan = stof(argv(0));
+       if(n >= 3)
+               vol = stof(argv(1));
+       if(n >= 4)
+               atten = stof(argv(2));
+
        precache_sound(f);
-       sound(self, CH_WEAPON_B, f, VOL_BASE, ATTN_MIN);
+       sound(self, chan, sample, vol, atten);
 
        return CMD_STATUS_FINISHED;
 }

diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index cd3c8d10607b54642413455633077681f03e17f2..8c2766295e7ca3cad676c15247e82c9581404a11 100644 (file)
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -2006,7 +2006,7 @@ void func_vectormamamam_findtarget()
        if(!self.wp00 && !self.wp01 && !self.wp02 && !self.wp03)
                objerror("No reference entity found, so there is nothing to move. Aborting.");
 
-       self.destvec = self.origin - func_vectormamamam_origin(self.owner, 0);
+       self.destvec = self.origin - func_vectormamamam_origin(self, 0);
 
        entity controller;
        controller = spawn();

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index bf6a98eaece2a85c75857fcbdd8dc7371bc021b7..9993dd4eeb4bc115318f3fcdaaaa8e0b776a5083 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -130,6 +130,9 @@ void W_Tuba_NoteOff()
                                case 1:
                                        bprint(strcat("\{1}\{13}* ^3", self.owner.netname, "^3 played on the @!#%'n Accordeon: ^7", s, "\n"));
                                        break;
+                               case 2:
+                                       bprint(strcat("\{1}\{13}* ^3", self.owner.netname, "^3 played on the @!#%'n Klein Bottle: ^7", s, "\n"));
+                                       break;
                        }
                }
        }
@@ -374,9 +377,10 @@ float w_tuba(float req)
                precache_model ("models/weapons/g_tuba.md3");
                precache_model ("models/weapons/v_tuba.md3");
                precache_model ("models/weapons/h_tuba.iqm");
-               precache_model ("models/weapons/g_akordeon.md3");
                precache_model ("models/weapons/v_akordeon.md3");
                precache_model ("models/weapons/h_akordeon.iqm");
+               precache_model ("models/weapons/v_kleinbottle.md3");
+               precache_model ("models/weapons/h_kleinbottle.iqm");
 
                //float i;
                //for(i = -18; i <= +27; ++i)
@@ -400,6 +404,10 @@ float w_tuba(float req)
                                        self.weaponname = "akordeon";
                                        break;
                                case 1:
+                                       self.tuba_instrument = 2;
+                                       self.weaponname = "kleinbottle";
+                                       break;
+                               case 2:
                                        self.tuba_instrument = 0;
                                        self.weaponname = "tuba";
                                        break;
@@ -447,6 +455,9 @@ float w_tuba(float req)
                        case 1: // Accordeon
                                w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Accordeon");
                                break;
+                       case 2: // Klein Bottle
+                               w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Klein Bottle");
+                               break;
                }
        }
        else if (req == WR_KILLMESSAGE)
@@ -468,6 +479,9 @@ float w_tuba(float req)
                        case 1: // Accordeon
                                w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Accordeon");
                                break;
+                       case 2: // Klein Bottle
+                               w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Klein Bottle");
+                               break;
                }
        }
        return TRUE;

diff --git a/sound/weapons/tuba2_loopnote-12.ogg b/sound/weapons/tuba2_loopnote-12.ogg
new file mode 100644 (file)
index 0000000..f01bd08
Binary files /dev/null and b/sound/weapons/tuba2_loopnote-12.ogg differ

diff --git a/sound/weapons/tuba2_loopnote-18.ogg b/sound/weapons/tuba2_loopnote-18.ogg
new file mode 100644 (file)
index 0000000..e1ca02b
Binary files /dev/null and b/sound/weapons/tuba2_loopnote-18.ogg differ

diff --git a/sound/weapons/tuba2_loopnote-6.ogg b/sound/weapons/tuba2_loopnote-6.ogg
new file mode 100644 (file)
index 0000000..411cec7
Binary files /dev/null and b/sound/weapons/tuba2_loopnote-6.ogg differ

diff --git a/sound/weapons/tuba2_loopnote0.ogg b/sound/weapons/tuba2_loopnote0.ogg
new file mode 100644 (file)
index 0000000..4924d59
Binary files /dev/null and b/sound/weapons/tuba2_loopnote0.ogg differ

diff --git a/sound/weapons/tuba2_loopnote12.ogg b/sound/weapons/tuba2_loopnote12.ogg
new file mode 100644 (file)
index 0000000..13b7c7f
Binary files /dev/null and b/sound/weapons/tuba2_loopnote12.ogg differ

diff --git a/sound/weapons/tuba2_loopnote18.ogg b/sound/weapons/tuba2_loopnote18.ogg
new file mode 100644 (file)
index 0000000..20a29c2
Binary files /dev/null and b/sound/weapons/tuba2_loopnote18.ogg differ

diff --git a/sound/weapons/tuba2_loopnote24.ogg b/sound/weapons/tuba2_loopnote24.ogg
new file mode 100644 (file)
index 0000000..0e497b5
Binary files /dev/null and b/sound/weapons/tuba2_loopnote24.ogg differ

diff --git a/sound/weapons/tuba2_loopnote6.ogg b/sound/weapons/tuba2_loopnote6.ogg
new file mode 100644 (file)
index 0000000..652d512
Binary files /dev/null and b/sound/weapons/tuba2_loopnote6.ogg differ

diff --git a/sound/weapons/tuba_loopnote-1.ogg b/sound/weapons/tuba_loopnote-1.ogg
deleted file mode 100644 (file)
index e296fe4..0000000
Binary files a/sound/weapons/tuba_loopnote-1.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-10.ogg b/sound/weapons/tuba_loopnote-10.ogg
deleted file mode 100644 (file)
index e14fca6..0000000
Binary files a/sound/weapons/tuba_loopnote-10.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-11.ogg b/sound/weapons/tuba_loopnote-11.ogg
deleted file mode 100644 (file)
index e220a8a..0000000
Binary files a/sound/weapons/tuba_loopnote-11.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-13.ogg b/sound/weapons/tuba_loopnote-13.ogg
deleted file mode 100644 (file)
index 4545f50..0000000
Binary files a/sound/weapons/tuba_loopnote-13.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-14.ogg b/sound/weapons/tuba_loopnote-14.ogg
deleted file mode 100644 (file)
index ec0e27a..0000000
Binary files a/sound/weapons/tuba_loopnote-14.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-15.ogg b/sound/weapons/tuba_loopnote-15.ogg
deleted file mode 100644 (file)
index 2a540b0..0000000
Binary files a/sound/weapons/tuba_loopnote-15.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-16.ogg b/sound/weapons/tuba_loopnote-16.ogg
deleted file mode 100644 (file)
index 9f0b1c8..0000000
Binary files a/sound/weapons/tuba_loopnote-16.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-17.ogg b/sound/weapons/tuba_loopnote-17.ogg
deleted file mode 100644 (file)
index 6fbb1fc..0000000
Binary files a/sound/weapons/tuba_loopnote-17.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-2.ogg b/sound/weapons/tuba_loopnote-2.ogg
deleted file mode 100644 (file)
index 6089e4e..0000000
Binary files a/sound/weapons/tuba_loopnote-2.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-3.ogg b/sound/weapons/tuba_loopnote-3.ogg
deleted file mode 100644 (file)
index 8299e6a..0000000
Binary files a/sound/weapons/tuba_loopnote-3.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-4.ogg b/sound/weapons/tuba_loopnote-4.ogg
deleted file mode 100644 (file)
index fe452d1..0000000
Binary files a/sound/weapons/tuba_loopnote-4.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-5.ogg b/sound/weapons/tuba_loopnote-5.ogg
deleted file mode 100644 (file)
index 48f412b..0000000
Binary files a/sound/weapons/tuba_loopnote-5.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-7.ogg b/sound/weapons/tuba_loopnote-7.ogg
deleted file mode 100644 (file)
index a71c9d9..0000000
Binary files a/sound/weapons/tuba_loopnote-7.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-8.ogg b/sound/weapons/tuba_loopnote-8.ogg
deleted file mode 100644 (file)
index 45c7aad..0000000
Binary files a/sound/weapons/tuba_loopnote-8.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote-9.ogg b/sound/weapons/tuba_loopnote-9.ogg
deleted file mode 100644 (file)
index 6bad199..0000000
Binary files a/sound/weapons/tuba_loopnote-9.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote1.ogg b/sound/weapons/tuba_loopnote1.ogg
deleted file mode 100644 (file)
index 43c7f66..0000000
Binary files a/sound/weapons/tuba_loopnote1.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote10.ogg b/sound/weapons/tuba_loopnote10.ogg
deleted file mode 100644 (file)
index a2e99df..0000000
Binary files a/sound/weapons/tuba_loopnote10.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote11.ogg b/sound/weapons/tuba_loopnote11.ogg
deleted file mode 100644 (file)
index f9af7b0..0000000
Binary files a/sound/weapons/tuba_loopnote11.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote13.ogg b/sound/weapons/tuba_loopnote13.ogg
deleted file mode 100644 (file)
index ab865ac..0000000
Binary files a/sound/weapons/tuba_loopnote13.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote14.ogg b/sound/weapons/tuba_loopnote14.ogg
deleted file mode 100644 (file)
index 42b649a..0000000
Binary files a/sound/weapons/tuba_loopnote14.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote15.ogg b/sound/weapons/tuba_loopnote15.ogg
deleted file mode 100644 (file)
index 4d8ba65..0000000
Binary files a/sound/weapons/tuba_loopnote15.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote16.ogg b/sound/weapons/tuba_loopnote16.ogg
deleted file mode 100644 (file)
index fe5ea3a..0000000
Binary files a/sound/weapons/tuba_loopnote16.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote17.ogg b/sound/weapons/tuba_loopnote17.ogg
deleted file mode 100644 (file)
index 6351e36..0000000
Binary files a/sound/weapons/tuba_loopnote17.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote19.ogg b/sound/weapons/tuba_loopnote19.ogg
deleted file mode 100644 (file)
index 56052bb..0000000
Binary files a/sound/weapons/tuba_loopnote19.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote2.ogg b/sound/weapons/tuba_loopnote2.ogg
deleted file mode 100644 (file)
index 3945ca1..0000000
Binary files a/sound/weapons/tuba_loopnote2.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote20.ogg b/sound/weapons/tuba_loopnote20.ogg
deleted file mode 100644 (file)
index 0eabe02..0000000
Binary files a/sound/weapons/tuba_loopnote20.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote21.ogg b/sound/weapons/tuba_loopnote21.ogg
deleted file mode 100644 (file)
index aa28b41..0000000
Binary files a/sound/weapons/tuba_loopnote21.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote22.ogg b/sound/weapons/tuba_loopnote22.ogg
deleted file mode 100644 (file)
index 621e82f..0000000
Binary files a/sound/weapons/tuba_loopnote22.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote23.ogg b/sound/weapons/tuba_loopnote23.ogg
deleted file mode 100644 (file)
index 6edc262..0000000
Binary files a/sound/weapons/tuba_loopnote23.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote25.ogg b/sound/weapons/tuba_loopnote25.ogg
deleted file mode 100644 (file)
index d6b3044..0000000
Binary files a/sound/weapons/tuba_loopnote25.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote26.ogg b/sound/weapons/tuba_loopnote26.ogg
deleted file mode 100644 (file)
index 648f217..0000000
Binary files a/sound/weapons/tuba_loopnote26.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote27.ogg b/sound/weapons/tuba_loopnote27.ogg
deleted file mode 100644 (file)
index c5ddb4f..0000000
Binary files a/sound/weapons/tuba_loopnote27.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote3.ogg b/sound/weapons/tuba_loopnote3.ogg
deleted file mode 100644 (file)
index 5ef1ce8..0000000
Binary files a/sound/weapons/tuba_loopnote3.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote4.ogg b/sound/weapons/tuba_loopnote4.ogg
deleted file mode 100644 (file)
index 90ca19c..0000000
Binary files a/sound/weapons/tuba_loopnote4.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote5.ogg b/sound/weapons/tuba_loopnote5.ogg
deleted file mode 100644 (file)
index 11512d1..0000000
Binary files a/sound/weapons/tuba_loopnote5.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote7.ogg b/sound/weapons/tuba_loopnote7.ogg
deleted file mode 100644 (file)
index 3138f29..0000000
Binary files a/sound/weapons/tuba_loopnote7.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote8.ogg b/sound/weapons/tuba_loopnote8.ogg
deleted file mode 100644 (file)
index d2a4e48..0000000
Binary files a/sound/weapons/tuba_loopnote8.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_loopnote9.ogg b/sound/weapons/tuba_loopnote9.ogg
deleted file mode 100644 (file)
index 9dd8c86..0000000
Binary files a/sound/weapons/tuba_loopnote9.ogg and /dev/null differ