Merge master

diff --combined data/qcsrc/client/hud.qc
index e81da42c0fbfc2d715b456a0cdbc11ab97e517bb,be1cc1e7204dfac692a3734e36eca97c3e4cbbfe..16251aad7c5b253c6e7a98db74d23ddf0513e0cf
--- 1/data/qcsrc/client/hud.qc
--- 2/data/qcsrc/client/hud.qc
+++ b/data/qcsrc/client/hud.qc
@@@ -72,44 -72,15 +72,44 @@@ vector Sbar_AccuracyColor(float accurac
        return rgb;\r
  }\r
  \r
 -void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, float lettersize, vector rgb, float alpha, float dflags)\r
 +void Sbar_DrawPic(string pic, vector position, vector dimensions, float background)\r
 +{\r
 +      vector pos, sz;\r
 +      sz_x = vid_conwidth * dimensions_x;\r
 +      sz_y = vid_conheight * dimensions_y;\r
 +      pos_x = (vid_conwidth / 2) * bound(0, 1 + position_x, 2);\r
 +      pos_x -= sz_x / 2;\r
 +      pos_y = (vid_conheight / 2) * bound(0, 1 - position_y, 2);\r
 +      pos_y -= sz_y / 2;\r
 +\r
 +      if(background)\r
 +      {\r
 +              if(teamplay)\r
 +                      drawpic(pos, pic, sz, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color\r
 +              else\r
 +                      drawpic(pos, pic, sz, stov(cvar_string("sbar_color_bg")), sbar_alpha_bg, DRAWFLAG_NORMAL);\r
 +      }\r
 +      else\r
 +              drawpic(pos, pic, sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +}\r
 +\r
 +void Sbar_DrawString(string text, vector position, float lettersize)\r
 +{\r
 +      vector pos, sz;\r
 +      sz_x = sz_y = lettersize;\r
 +      pos_x = (vid_conwidth / 2) * bound(0, 1 + position_x, 2);\r
 +      pos_x -= stringwidth(text, FALSE, sz) * 0.5;\r
 +      pos_y = (vid_conheight / 2) * bound(0, 1 - position_y, 2);\r
 +      pos_y -= sz_y / 2;\r
 +\r
 +      drawstring(pos, text, sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +}\r
 +\r
 +void Sbar_DrawXNum (vector position, float num, float digits, float showminusplus, float lettersize, vector rgb, float alpha, float dflags)\r
  {\r
        float l;\r
        string str, tmp, l_length, final_num;\r
        float minus, plus;\r
 -      vector vsize;\r
 -\r
 -      vsize_x = vsize_y = lettersize;\r
 -      vsize_z = 0;\r
  \r
        // showminusplus 1: always prefix with minus sign (useful in race distribution display)\r
        // showminusplus 2: always prefix with plus sign (useful in race distribution display)\r
@@@ -149,16 -120,9 +149,16 @@@
                final_num = "-";\r
        else if(plus)\r
                final_num = "+";\r
 -\r
        final_num = strcat(final_num, str);\r
 -      drawstring(pos, final_num, vsize, rgb, alpha, dflags);\r
 +\r
 +      vector pos, sz;\r
 +      sz_x = sz_y = lettersize;\r
 +      pos_x = (vid_conwidth / 2) * bound(0, 1 + position_x, 2);\r
 +      pos_x -= stringwidth(final_num, FALSE, sz) * 0.5;\r
 +      pos_y = (vid_conheight / 2) * bound(0, 1 - position_y, 2);\r
 +      pos_y -= sz_y / 2;\r
 +\r
 +      drawstring(pos, final_num, sz, rgb, alpha, dflags);\r
  }\r
  \r
  vector Sbar_NumColor (float x)\r
@@@ -950,7 -914,7 +950,7 @@@ void Sbar_PrintScoreboardItem(vector po
  }\r
  \r
  float fieldcounter;\r
 -void Sbar_PrintStomachboardItem(vector pos, entity pl)\r
 +void Sbar_PrintStomachboardItem(entity pl, vector position, vector dimensions)\r
  {\r
        // lists all players in the stomach\r
  \r
@@@ -961,16 -925,12 +961,16 @@@
  \r
        for(fieldcounter = 1; fieldcounter <= field_number; ++fieldcounter)\r
        {\r
 +              vector pos, sz;\r
                field = -fieldcounter;\r
                str = Sbar_GetStomachField(pl, field);\r
  \r
                // row highlighting\r
                if(field == ST_HIGHLIGHT)\r
                {\r
 +                      pos = position;\r
 +                      sz = dimensions;\r
 +\r
                        if(getstati(STAT_VORE_EATEN))\r
                        {\r
                                if(teamplay && (GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(spectatee_status - 1))) // same team\r
@@@ -980,43 -940,36 +980,43 @@@
                        }\r
                        else\r
                                hl_color = stov(cvar_string("sbar_stomachboard_color1"));\r
 -                      drawfill(pos - '0 0 0', '193 11 0', hl_color, cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      drawfill(pos, sz, hl_color, cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                }\r
  \r
                if(field == ST_NAME) {\r
 +                      pos_x = position_x / 9;\r
 +                      sz_x = dimensions_x / 9;\r
 +\r
                        f = stof(getplayerkey(pl.sv_entnum, "colors"));\r
 -                      drawpic(pos, "gfx/sb_playercolor_base", '22 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -                      drawpic(pos, "gfx/sb_playercolor_shirt", '22 11 0', colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -                      drawpic(pos, "gfx/sb_playercolor_pants", '22 11 0', colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      drawpic(pos, "gfx/sb_playercolor_base", sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      drawpic(pos, "gfx/sb_playercolor_shirt", sz, colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      drawpic(pos, "gfx/sb_playercolor_pants", sz, colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
  \r
 -                      pos_x += 24;\r
 -                      drawcolorcodedstring(pos, textShortenToWidth(str, 138, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      pos_x = position_x / 4;\r
 +                      sz_x = dimensions_x / 4;\r
 +                      drawcolorcodedstring(pos, textShortenToWidth(str, sz_x, '1 1 0' * sz_y, stringwidth_colors), '1 1 0' * sz_y, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                }\r
  \r
                if(field == ST_HEALTH) {\r
 -                      pos_x += 138;\r
 -                              if(pl.sv_entnum == player_localentnum - 1 || (spectatee_status && pl.sv_entnum == spectatee_status - 1))\r
 -                                      drawcolorcodedstring(pos, "self", '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -                              else\r
 -                              {\r
 -                                      drawpic(pos, "gfx/hud/sb_health", '11 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      pos_x = position_x / 1.05;\r
 +                      sz_x = sz_y = dimensions_y;\r
  \r
 -                                      pos_x += 9;\r
 -                                              drawcolorcodedstring(pos, str, '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -                              }\r
 +                      if(pl.sv_entnum == player_localentnum - 1 || (spectatee_status && pl.sv_entnum == spectatee_status - 1))\r
 +                              drawcolorcodedstring(pos, "self", sz, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      else\r
 +                      {\r
 +                              drawpic(pos, "gfx/hud/sb_health", sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +\r
 +                              pos_x = position_x / 1.05;\r
 +                              sz_x = sz_y = dimensions_y;\r
 +                              drawcolorcodedstring(pos, str, sz, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      }\r
                }\r
        }\r
  }\r
  \r
  float fieldcounter2;\r
 -void Sbar_PrintStomachboardItemPred(vector pos, entity pl)\r
 +void Sbar_PrintStomachboardItemPred(entity pl, vector position, vector dimensions)\r
  {\r
        // shows the name of our predator\r
  \r
@@@ -1031,12 -984,12 +1031,12 @@@
  \r
                if(field == STP_NAME) {\r
                        f = stof(getplayerkey(pl.sv_entnum, "colors"));\r
 -                      drawpic(pos, "gfx/sb_playercolor_base", '22 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -                      drawpic(pos, "gfx/sb_playercolor_shirt", '22 11 0', colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -                      drawpic(pos, "gfx/sb_playercolor_pants", '22 11 0', colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      drawpic(position, "gfx/sb_playercolor_base", '22 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      drawpic(position, "gfx/sb_playercolor_shirt", '22 11 0', colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      drawpic(position, "gfx/sb_playercolor_pants", '22 11 0', colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
  \r
 -                      pos_x += 24;\r
 -                      drawcolorcodedstring(pos, textShortenToWidth(str, 122, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                      //pos_x += 24;\r
 +                      drawcolorcodedstring(position, textShortenToWidth(str, 122, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                }\r
        }\r
  }\r
@@@ -1563,6 -1516,29 +1563,29 @@@ void Sbar_DrawScoreboard(
        pos_y += 1.2 * sbar_fontsize_y;\r
        drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, sbar_fontsize)), str, sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);\r
  \r
+       // print information about respawn status\r
+       float respawn_time = getstatf(STAT_RESPAWN_TIME);\r
+       dprint(strcat(ftos(respawn_time), " --------\n"));\r
+       if(respawn_time)\r
+       {\r
+               if(respawn_time < 0)\r
+               {\r
+                       // a negative number means we are awaiting respawn, time value is still the same\r
+                       respawn_time *= -1; // remove mark now that we checked it\r
+                       if(time >= respawn_time) // don't show a negative value while the server is respawning the player (lag)\r
+                               str = strcat("^1Respawning...");\r
+                       else\r
+                               str = strcat("^1Respawning in ^3", ftos_decimals(respawn_time - time, 2), "^1 seconds...");\r
+               }\r
+               else if(time < respawn_time)\r
+                       str = strcat("You are dead, wait ^3", ftos_decimals(respawn_time - time, 2), "^7 seconds before respawning");\r
+               else if(time >= respawn_time)\r
+                       str = strcat("You are dead, press ^2", getcommandkey("primary fire", "+fire"), "^7 to respawn");\r
+ \r
+               pos_y += 1.2 * sbar_fontsize_y;\r
+               drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, sbar_fontsize)), str, sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);\r
+       }\r
+ \r
        scoreboard_bottom = pos_y + 2 * sbar_fontsize_y;\r
  }\r
  \r
@@@ -2020,6 -1996,11 +2043,6 @@@ void Sbar_Score(
  \r
  void Sbar_Status()\r
  {\r
 -      vector bottom;\r
 -      bottom_x = vid_conwidth/2;\r
 -      bottom_y = vid_conheight;\r
 -      bottom_z = 0;\r
 -\r
        float armor, health, x, a;\r
        armor = getstati(STAT_ARMOR);\r
        health = getstati(STAT_HEALTH);\r
@@@ -2027,35 -2008,54 +2050,35 @@@
        float stat_items;\r
        stat_items = getstati(STAT_ITEMS);\r
  \r
 -      vector health_pos, armor_pos, pos;\r
 -      health_pos = bottom - '43 58 0';\r
 -      armor_pos = bottom - '43 68 0';\r
 -\r
 -      if (cvar("viewsize") <= 100 && sbar_hudselector) {\r
 -              if (teamplay)\r
 -                      drawpic(bottom - '96 96 0', "gfx/hud/bg_status", '192 96 0', GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color\r
 -              else {\r
 -                      // allow for custom HUD colors in non-teamgames\r
 -                      color = stov(cvar_string("sbar_color_bg"));\r
 -\r
 -                      drawpic(bottom - '96 96 0', "gfx/hud/bg_status", '192 96 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
 -              }\r
 -      }\r
 +      if (cvar("viewsize") <= 100 && sbar_hudselector)\r
 +              Sbar_DrawPic("gfx/hud/bg_status", stov(cvar_string("hud_panel_status_background_position")), stov(cvar_string("hud_panel_status_background_scale")), TRUE);\r
  \r
        // armor\r
        x = armor;\r
        if (x > 0)\r
        {\r
 -              drawpic(armor_pos + '-8 -13.5 0', "gfx/hud/sb_armor", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -              armor_pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '12 12 0') * 0.5;\r
 -              Sbar_DrawXNum(armor_pos, x, 3, 0, 12, Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +              Sbar_DrawPic("gfx/hud/sb_armor", stov(cvar_string("hud_item_armor_icon_position")), stov(cvar_string("hud_item_armor_icon_scale")), FALSE);\r
 +              Sbar_DrawXNum(stov(cvar_string("hud_item_armor_text_position")), x, 3, 0, cvar("hud_item_armor_text_scale"), Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
        }\r
  \r
        // health\r
        x = health;\r
 -      drawpic(health_pos + '-11 16 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -      health_pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '22 22 0') * 0.5;\r
 -      Sbar_DrawXNum(health_pos, x, 3, 0, 22, Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +      Sbar_DrawPic("gfx/hud/sb_health", stov(cvar_string("hud_item_health_icon_position")), stov(cvar_string("hud_item_health_icon_scale")), FALSE);\r
 +      Sbar_DrawXNum(stov(cvar_string("hud_item_health_text_position")), x, 3, 0, cvar("hud_item_health_text_scale"), Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
  \r
        // if we are dead, we can skip the HUD from here\r
        if(health <= 0)\r
                return;\r
  \r
        // ammo\r
 -      pos_x = bottom_x + 140;\r
 -      pos_y = bottom_y - 20;\r
 -\r
        float weapon_clipload, weapon_clipsize;\r
 -      vector ammo_pos_offset;\r
  \r
        // if we are using the jetpack, show fuel ammo. Otherwise show the ammo of our weapon\r
        if(stat_items & IT_JETPACK && button_jetpack)\r
        {\r
                a = getstati(GetAmmoStat(0)); // how much fuel do we have?\r
 -              drawpic(pos - '98 18 0', GetAmmoPicture(0), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -              ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '16 16 0') * 0.5;\r
 -              Sbar_DrawXNum(pos - '118 16 0' - ammo_pos_offset, a, 3, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +              Sbar_DrawPic(GetAmmoPicture(0), stov(cvar_string("hud_item_ammo_icon_position")), stov(cvar_string("hud_item_ammo_noload_icon_scale")), FALSE);\r
 +              Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_noload_text_position")), a, 3, 0, cvar("hud_item_ammo_noload_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
        }\r
        else\r
        {\r
@@@ -2067,7 -2067,7 +2090,7 @@@
                        // if (stat_items & GetAmmoItemCode(i))\r
                        {\r
                                a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?\r
 -                              drawpic(pos - '98 18 0', GetAmmoPicture(i), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                              Sbar_DrawPic(GetAmmoPicture(i), stov(cvar_string("hud_item_ammo_icon_position")), stov(cvar_string("hud_item_ammo_icon_scale")), FALSE);\r
                                weapon_clipsize = getstati(STAT_WEAPON_CLIPSIZE);\r
  \r
                                // if the weapon we're holding is reloadable, show both its ammo and load\r
@@@ -2075,14 -2075,22 +2098,14 @@@
                                {\r
                                        weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);\r
                                        if(weapon_clipload < 0) // we're reloading\r
 -                                      {\r
 -                                              ammo_pos_offset = '1 0 0' * stringwidth("- -", FALSE, '16 16 0') * 0.5;\r
 -                                              drawstring(pos - '118 23 0' - ammo_pos_offset, "- -", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -                                      }\r
 +                                              Sbar_DrawString("- -", stov(cvar_string("hud_item_clip_load_text_position")), cvar("hud_item_clip_load_text_scale"));\r
                                        else\r
 -                                      {\r
 -                                              ammo_pos_offset = '1 0 0' * stringwidth(ftos(weapon_clipload), FALSE, '16 16 0') * 0.5;\r
 -                                              Sbar_DrawXNum(pos - '118 23 0' - ammo_pos_offset, weapon_clipload, 2, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 -                                      }\r
 -                                      ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '12 12 0') * 0.5;\r
 -                                      Sbar_DrawXNum(pos - '118 7 0' - ammo_pos_offset, a, 3, 0, 12, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                                              Sbar_DrawXNum(stov(cvar_string("hud_item_clip_load_text_position")), weapon_clipload, 2, 0, cvar("hud_item_clip_load_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                                      Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_load_text_position")), a, 3, 0, cvar("hud_item_ammo_load_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                }\r
                                else\r
                                {\r
 -                                      ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '16 16 0') * 0.5;\r
 -                                      Sbar_DrawXNum(pos - '118 16 0' - ammo_pos_offset, a, 3, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +                                      Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_noload_text_position")), a, 3, 0, cvar("hud_item_ammo_noload_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                }\r
                        }\r
                }\r
@@@ -2092,7 -2100,7 +2115,7 @@@
        entity e;\r
        e = get_weaponinfo(activeweapon);\r
        if (e && e.netname != "" && e.netname != "N/A")\r
 -              drawpic(bottom - '96 96 0', strcat("gfx/hud/bg_status_activeweapon_", e.netname), '192 96 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 +              Sbar_DrawPic(strcat("gfx/hud/bg_status_activeweapon_", e.netname), stov(cvar_string("hud_item_weapon_position")), stov(cvar_string("hud_item_weapon_scale")), FALSE);\r
  }\r
  \r
  void Sbar_Timer()\r
@@@ -3267,7 -3275,7 +3290,7 @@@ void Sbar_Draw (void
                                {\r
                                        if(l <= 8) // limit the stomach board to 9 entries due to the HUD design\r
                                        {\r
 -                                              Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
 +                                              Sbar_PrintStomachboardItem(pl, stov(cvar_string("hud_item_preylist_position")), stov(cvar_string("hud_item_preylist_scale")));\r
                                                pos_y += 1.1 * sbar_fontsize_y;\r
                                                l += 1;\r
                                        }\r
@@@ -3285,7 -3293,7 +3308,7 @@@
                        }\r
  \r
                        // draw the predator's name\r
 -                      Sbar_PrintStomachboardItemPred(bottomleft - '-76 150 0', pred);\r
 +//                    Sbar_PrintStomachboardItemPred(bottomleft - '-76 150 0', pred);\r
                }\r
  \r
                // draw status, scores, timer, ring and portrait\r

diff --combined docs/TODO.txt
index 13437e5cbff1b9653de3da1de199c9df8bdae9f7,fe0300eb636b39ad41e94ca7911d0114e2651bd9..c887881c024e94ab747b9ec93f50611b7af85799
--- 1/docs/TODO.txt
--- 2/docs/TODO.txt
+++ b/docs/TODO.txt
@@@ -204,6 -204,8 +204,6 @@@
  \r
  - 0.8: Prey - Use EF_NODRAW instead of self.alpha = -1\r
  \r
 -- 0.8: New bloom with the bloom scene brightness feature\r
 -\r
  - +0.8: Add some inclined HUD effect for more coolness, if it's possible. Maybe for the menu too\r
  \r
  - 0.8: Make crosshair size change based on distance of what you're looking at?\r
@@@ -215,41 -217,21 +215,59 @@@
  - 0.8: Do what Xonotic did to avoid conflicting versions when joining\r
  \r
  - 0.8: Use a modded version of Xonotic's menu skin?\r
- \r
++
 +- 0.8: Put HUD item positions in a text file, to allow for customizable HUD's\r
 +\r
 +- 0.8 BUG: When bunny-hopping, you don't hear the landing sound each time. Fix!\r
 +\r
 +- 0.8 NEW HUD: With the new system, put all HUD settings in one place\r
 +\r
 +- 0.8: Colorize weapon icon in accuracy\r
 +\r
 +- 0.8 NEW HUD: Make position of the HUD cvars so that scale works around the center\r
 +\r
 +- 0.8: Rename defaultVT to default-VT and so on\r
 +\r
 +- 0.8: Introduction movie (ask LH how you do it in DP)\r
 +\r
 +- +0.8 NEW HUD: A menu to edit the HUD\r
 +\r
 +- 0.8 NEW HUD: Arrange the functions in Sbar_DrawXNum the same way as in the others\r
 +\r
 +- 0.8 NEW HUD: Make HUD font scale two-sized too, so it matches everything else\r
 +\r
 +- 0.8 NEW HUD: Load and noload should have different position values for the ammo icon\r
 +\r
 +- 0.8 NEW HUD: Rename the hud cvar settings accordingly\r
 +\r
 +- 0.8 BUG: The crosshair mysteriously gets larger when you have prey\r
 +\r
 +- 0.8: Optional 3rd person view for being swallowed and prey\r
 +\r
 +- 0.8: Place server.cfg in data by default? Also, do we need the server folder any more then?\r
 +\r
 +- 0.8?: Multiple mods, and different maps and textures (so I can keep the existing VT plus a version with the Xonotic maps)\r
 +\r
 +- 0.8: Add shortcuts for video capture keys, and make sure video capture defaults are good.\r
 +\r
 +- 0.8: Port scoreboard respawn information from Xonotic.\r
  \r
- - 0.8: Orient swallow model based on the direction between you and the player eating you
++- 0.8: Orient swallow model based on the direction between you and the player eating you
++
+ - 0.8: Use a new texture I found for the stomach\r
+ \r
+ - 0.8: If you see the swallow model of a predator you swallow first, clear the model instantly\r
+ \r
+ - 0.8: Black & White view when dead?\r
+ \r
+ - 0.8: Remove model leaning, its broken\r
+ \r
+ - 0.8: Default respawn delay to something a little bigger\r
+ \r
+ - 0.8: Port the "respawning in" text from Xonotic?\r
+ \r
+ - 0.8: Define all weapons in a single text file (rename the grabber file to be general)\r
+ \r
+ - 0.8: Add patterns for stomach kicking, where you need to match some movement keys\r
+ \r
 -- 0.8: Tweak balance so that less damage is dealt and vore lasts more
++- 0.8: Tweak balance so that less damage is dealt and vore lasts more