From: Mario Date: Sun, 21 Jun 2020 18:49:41 +0000 (+0000) Subject: Merge branch 'bones_was_here/timeout_stuff' into 'master' X-Git-Tag: xonotic-v0.8.5~906 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=edc317efa7b44478e7bd5c2ba46eff432c603ea6;hp=9315733d04c3fab6b6ad1e3f6d8c4627ffb860b6 Merge branch 'bones_was_here/timeout_stuff' into 'master' Allow vcall timein during a timeout, and reset slowmo if SVQC shuts down during a timeout See merge request xonotic/xonotic-data.pk3dir!830 --- diff --git a/.tx/merge-base b/.tx/merge-base index 39a8b0fcd..42ea6ccdc 100644 --- a/.tx/merge-base +++ b/.tx/merge-base @@ -1 +1 @@ -Sun Jun 14 07:24:55 CEST 2020 +Sat Jun 20 07:23:43 CEST 2020 diff --git a/binds-xonotic.cfg b/binds-xonotic.cfg index 3046579ae..578aecd62 100644 --- a/binds-xonotic.cfg +++ b/binds-xonotic.cfg @@ -1,11 +1,11 @@ // alias for switching the teamselect menu -bind f5 menu_showteamselect +bind F5 menu_showteamselect -bind f6 team_auto +bind F6 team_auto -bind f7 menu_showsandboxtools -bind f8 "quickmenu" -bind f9 "cl_cmd hud minigame" +bind F7 menu_showsandboxtools +bind F8 "quickmenu" +bind F9 "cl_cmd hud minigame" // movement bind w +forward diff --git a/commands.cfg b/commands.cfg index 9218af379..1306f306b 100644 --- a/commands.cfg +++ b/commands.cfg @@ -63,7 +63,7 @@ alias dumpnotifs "qc_cmd_svmenu dumpnotifs ${* ?}" // Dump a alias dumpitems "qc_cmd_svmenu dumpitems ${* ?}" // Dump all items to the console alias dumpturrets "qc_cmd_svmenu dumpturrets ${* ?}" // Dump all turrets into turrets_dump.txt alias dumpweapons "qc_cmd_svmenu dumpweapons ${* ?}" // Dump all weapons into weapons_dump.txt -alias find "qc_cmd_svmenu find ${* ?}" // Search through entities for matching classname +alias findent "qc_cmd_svmenu findent ${* ?}" // Search through entities for matching classname alias findat "qc_cmd_svmenu findat ${* ?}" // Search through entities for matching origin alias maplist "qc_cmd_svmenu maplist ${* ?}" // Automatic control of maplist alias mx "qc_cmd_svmenu mx ${* ?}" // Send a matrix command diff --git a/common.ja_JP.po b/common.ja_JP.po index 99c47d82e..f880b2805 100644 --- a/common.ja_JP.po +++ b/common.ja_JP.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-07 07:23+0200\n" -"PO-Revision-Date: 2020-06-07 05:23+0000\n" -"Last-Translator: divVerent \n" +"PO-Revision-Date: 2020-06-17 03:18+0000\n" +"Last-Translator: Space Ace \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/team-xonotic/" "xonotic/language/ja_JP/)\n" "Language: ja_JP\n" @@ -23,12 +23,12 @@ msgstr "" #: qcsrc/client/hud/hud_config.qc:81 #, c-format msgid "^2Successfully exported to %s! (Note: It's saved in data/data/)" -msgstr "" +msgstr "^2%sへの書き出すに成功! (註: data/data/ に保存さる)" #: qcsrc/client/hud/hud_config.qc:85 #, c-format msgid "^1Couldn't write to %s" -msgstr "" +msgstr "^1%sへ書かなかった" #: qcsrc/client/hud/panel/centerprint.qc:174 #, c-format @@ -77,7 +77,7 @@ msgstr "" #: qcsrc/client/hud/panel/infomessages.qc:108 #: qcsrc/menu/xonotic/keybinder.qc:47 msgid "primary fire" -msgstr "" +msgstr "一次撃つ" #: qcsrc/client/hud/panel/infomessages.qc:110 #, c-format @@ -87,12 +87,12 @@ msgstr "" #: qcsrc/client/hud/panel/infomessages.qc:110 #: qcsrc/client/hud/panel/infomessages.qc:114 msgid "next weapon" -msgstr "" +msgstr "次の武器" #: qcsrc/client/hud/panel/infomessages.qc:110 #: qcsrc/client/hud/panel/infomessages.qc:114 msgid "previous weapon" -msgstr "" +msgstr "前の兵器" #: qcsrc/client/hud/panel/infomessages.qc:114 #, c-format @@ -107,12 +107,12 @@ msgstr "" #: qcsrc/client/hud/panel/infomessages.qc:116 #: qcsrc/common/vehicles/cl_vehicles.qc:190 msgid "drop weapon" -msgstr "" +msgstr "兵器を落と" #: qcsrc/client/hud/panel/infomessages.qc:116 #: qcsrc/menu/xonotic/keybinder.qc:48 msgid "secondary fire" -msgstr "" +msgstr "二次撃つ" #: qcsrc/client/hud/panel/infomessages.qc:119 #, c-format @@ -142,7 +142,7 @@ msgstr "" #: qcsrc/client/hud/panel/infomessages.qc:139 #: qcsrc/common/notifications/all.qh:430 msgid "jump" -msgstr "" +msgstr "飛ぶ" #: qcsrc/client/hud/panel/infomessages.qc:147 #, c-format @@ -151,37 +151,37 @@ msgstr "" #: qcsrc/client/hud/panel/infomessages.qc:153 msgid "^2Currently in ^1warmup^2 stage!" -msgstr "" +msgstr "^2現在、^1準備運動^2の段階に入っています!" #: qcsrc/client/hud/panel/infomessages.qc:168 #, c-format msgid "%sPress ^3%s%s to end warmup" -msgstr "" +msgstr "%s^3%s%sを押して準備運動を終了します" #: qcsrc/client/hud/panel/infomessages.qc:168 #: qcsrc/client/hud/panel/infomessages.qc:170 #: qcsrc/client/hud/panel/infomessages.qc:183 #: qcsrc/menu/xonotic/keybinder.qc:99 msgid "ready" -msgstr "" +msgstr "準備" #: qcsrc/client/hud/panel/infomessages.qc:170 #, c-format msgid "%sPress ^3%s%s once you are ready" -msgstr "" +msgstr "%s準備ができたら^3%s%sを押します" #: qcsrc/client/hud/panel/infomessages.qc:175 msgid "^2Waiting for others to ready up to end warmup..." -msgstr "" +msgstr "^2準備演習が終了する前に、全員の準備ができるまで待ちます..." #: qcsrc/client/hud/panel/infomessages.qc:177 msgid "^2Waiting for others to ready up..." -msgstr "" +msgstr "^2全員の準備ができるまで待ちます..." #: qcsrc/client/hud/panel/infomessages.qc:183 #, c-format msgid "^2Press ^3%s^2 to end warmup" -msgstr "" +msgstr "^2^3%s^2を押して準備運動を終了します" #: qcsrc/client/hud/panel/infomessages.qc:204 msgid "Teamnumbers are unbalanced!" @@ -8206,11 +8206,11 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:173 #: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qh:6 msgid "Enter HUD editor" -msgstr "" +msgstr "ヘッドアップディスプレイ(HUD)の編集者に入る" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qh:7 msgid "HUD" -msgstr "" +msgstr "ハッド(HUD)" #: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:21 msgid "In order for the HUD editor to show, you must first be in game." diff --git a/common.ru.po b/common.ru.po index 66972d430..67ac77581 100644 --- a/common.ru.po +++ b/common.ru.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-07 07:23+0200\n" -"PO-Revision-Date: 2020-06-08 06:05+0000\n" +"PO-Revision-Date: 2020-06-19 13:24+0000\n" "Last-Translator: Andrei Stepanov \n" "Language-Team: Russian (http://www.transifex.com/team-xonotic/xonotic/" "language/ru/)\n" @@ -3442,12 +3442,12 @@ msgstr "^BGУ %s^K1 завяли уши от собственной игры @!# #: qcsrc/common/notifications/all.inc:508 #, c-format msgid "^BG%s%s^K1 has been sublimated by ^BG%s^K1's Vaporizer%s%s" -msgstr "^BG%s%s^K1 преобразован в пар Испарителем ^BG%s^K1%s%s" +msgstr "^BG%s%s^K1 был сублимирован Испарителем ^BG%s^K1%s%s" #: qcsrc/common/notifications/all.inc:509 #, c-format msgid "^BG%s%s^K1 has been vaporized by ^BG%s^K1's Vortex%s%s" -msgstr "^BG%s%s^K1 испарён с помощью Вихря ^BG%s^K1%s%s" +msgstr "^BG%s%s^K1 был испарён с помощью Вихря ^BG%s^K1%s%s" #: qcsrc/common/notifications/all.inc:528 msgid "^F4You are now alone!" diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index 87633056d..8d219c544 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -213,7 +213,7 @@ void Draw_ShowNames_All() it.sameteam = false; } bool dead = entcs_IsDead(i) || entcs_IsSpectating(i); - if (!it.csqcmodel_isdead || it.alpha > 0) + if ((!it.csqcmodel_isdead || it.alpha > 0) && entcs.origin != it.origin) setorigin(it, entcs.origin); it.csqcmodel_isdead = dead; Draw_ShowNames(it); diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh index 49b6a5787..b349e22f2 100644 --- a/qcsrc/common/debug.qh +++ b/qcsrc/common/debug.qh @@ -335,7 +335,7 @@ STATIC_INIT(TRACE_ENT) #endif -GENERIC_COMMAND(find, "Search through entities for matching classname", false) +GENERIC_COMMAND(findent, "Search through entities for matching classname", false) { switch (request) { diff --git a/qcsrc/common/mapobjects/func/door.qc b/qcsrc/common/mapobjects/func/door.qc index 57faf5145..11196ab38 100644 --- a/qcsrc/common/mapobjects/func/door.qc +++ b/qcsrc/common/mapobjects/func/door.qc @@ -737,7 +737,10 @@ spawnfunc(func_door) } else if (!this.speed) { - this.speed = 100; + if (autocvar_sv_q3defragcompat) + this.speed = 400; + else + this.speed = 100; } settouch(this, door_touch); diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index d85b16b0e..4c2b5ff26 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -1166,7 +1166,8 @@ void Monster_Frozen_Think(entity this) { STAT(REVIVE_PROGRESS, this) = bound(0, STAT(REVIVE_PROGRESS, this) + this.ticrate * this.revive_speed, 1); SetResourceExplicit(this, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, this) * this.max_health)); - this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1); + if (this.iceblock) + this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1); if(!(this.spawnflags & MONSTERFLAG_INVINCIBLE) && this.sprite) WaypointSprite_UpdateHealth(this.sprite, GetResource(this, RES_HEALTH)); diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index fe2952711..ea2a62977 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -2474,7 +2474,8 @@ void PlayerPreThink (entity this) { STAT(REVIVE_PROGRESS, this) = bound(0, STAT(REVIVE_PROGRESS, this) + frametime * this.revive_speed, 1); SetResourceExplicit(this, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, this) * start_health)); - this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1); + if (this.iceblock) + this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1); if (STAT(REVIVE_PROGRESS, this) >= 1) Unfreeze(this, false); diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index e5363db77..48aa78bcf 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -468,7 +468,9 @@ void Ice_Think(entity this) delete(this); return; } - setorigin(this, this.owner.origin - '0 0 16'); + vector ice_org = this.owner.origin - '0 0 16'; + if (this.origin != ice_org) + setorigin(this, ice_org); this.nextthink = time; } @@ -494,6 +496,7 @@ void Freeze(entity targ, float revivespeed, int frozen_type, bool show_waypoint) entity ice = new(ice); ice.owner = targ; ice.scale = targ.scale; + // set_movetype(ice, MOVETYPE_FOLLOW) would rotate the ice model with the player setthink(ice, Ice_Think); ice.nextthink = time; ice.frame = floor(random() * 21); // ice model has 20 different looking frames