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

diff --combined commands.cfg
index 0e8bb7712d94c87bb5d19d397d8fac6f84705b28,ab737d33e39bcd6d119a989154fd39d7854b011b..33e8e42cfc0781b866263350767f22d83cc6814a
--- 1/commands.cfg
--- 2/commands.cfg
+++ b/commands.cfg
@@@ -52,11 -52,10 +52,11 @@@ alias who                  "qc_cmd_svcm
  
  // generic commands (across all programs)
  alias addtolist            "qc_cmd_svmenu addtolist            ${* ?}" // Add a string to a cvar
 -alias qc_curl              "qc_cmd_svmenu curl                 ${* ?}" // curl requests
  alias dumpcommands         "qc_cmd_svmenu dumpcommands         ${* ?}" // Dump all commands on the program to *_cmd_dump.txt
 +alias dumpnotifs           "qc_cmd_svmenu dumpnotifs           ${* ?}" // Dump all notifications into notifications_dump.txt
  alias maplist              "qc_cmd_svmenu maplist              ${* ?}" // Automatic control of maplist
 -alias nextframe            "qc_cmd_svmenu nextframe            ${* ?}" // do something next frame
 +alias nextframe            "qc_cmd_svmenu nextframe            ${* ?}" // Execute the given command next frame of this VM
 +alias qc_curl              "qc_cmd_svmenu qc_curl              ${* ?}" // Queries a URL
  alias removefromlist       "qc_cmd_svmenu removefromlist       ${* ?}" // Remove a string from a cvar
  alias rpn                  "qc_cmd_svmenu rpn                  ${* ?}" // RPN calculator
  //alias settemp            "qc_cmd_svmenu settemp              ${* ?}" // Temporarily set a value to a cvar which is restored later
@@@ -82,6 -81,7 +82,7 @@@ alias addvote "qc_cmd_svmenu addtolist 
  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 --combined defaultXonotic.cfg
index 0227c0ee1f6e770f771592aa01b5dc63ff31db88,88a0d0ca5df447875e4206714e491d21226a25f2..e20969c788b8a18f6a3903613aaa5e7013c10d41
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -813,7 -813,6 +813,7 @@@ set g_chat_flood_lmax_tell 2       "private c
  set g_chat_flood_burst_tell 2 "private chat: allow bursts of so many chat lines"
  set g_chat_flood_notify_flooder 1     "when 0, the flooder still can see his own message"
  set g_chat_teamcolors 0       "colorize nicknames in team color for chat"
 +set g_chat_tellprivacy 1 "when disabled, tell messages are also sent to the server console log... otherwise they're kept private between players."
  set g_nick_flood_timeout 120 "time after which nick flood protection resets (set to 0 to disable nick flood checking)"
  set g_nick_flood_penalty 0.5 "duration of the nick flood penalty"
  set g_nick_flood_penalty_yellow 3 "number of changes to allow before warning and movement blocking"
@@@ -1016,6 -1015,7 +1016,7 @@@ set con_completion_ply          *.de
  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 --combined qcsrc/server/w_tuba.qc
index bf6a98eaece2a85c75857fcbdd8dc7371bc021b7,999749b3e01d16783fc46c59ccec45fe59461d9e..9993dd4eeb4bc115318f3fcdaaaa8e0b776a5083
--- 1/qcsrc/server/w_tuba.qc
--- 2/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@@ -130,6 -130,9 +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;
                        }
                }
        }
@@@ -180,7 -183,7 +183,7 @@@ float Tuba_GetNote(entity pl, float hit
        // that way, holes in the range of notes are "plugged"
        if(teamplay)
        {
 -              if(pl.team == COLOR_TEAM2 || pl.team == COLOR_TEAM4)
 +              if(pl.team == FL_TEAM_2 || pl.team == FL_TEAM_4)
                        note += 3;
        }
        else
@@@ -374,9 -377,10 +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 +404,10 @@@
                                        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 +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 +479,9 @@@
                        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;