More fixes

diff --git a/keybinds.txt.de b/keybinds.txt.de
index 6f2c78b511866e27162f6e4819856e92e9696a09..53f73351be4af16fce89f122d68587644eebdb23 100644 (file)
--- a/keybinds.txt.de
+++ b/keybinds.txt.de
@@ -46,7 +46,7 @@
 "+show_info"                            "Serverinfo anzeigen"
 "toggleconsole"                         "Konsole öffnen"
 "disconnect"                            "Verbindung trennen"
-"quit"                                  "Beenden"
+"menu_showquitdialog"                   "Beenden"
 ""                                      ""
 ""                                      "Teamplay"
 "messagemode2"                          "Nachricht ans Team"

diff --git a/keybinds.txt.es b/keybinds.txt.es
index e92f03b80e8ede79eb7e40347ab067e8a885d8c3..cdaa8cc956fb3f60d3347cd1194fe4ee4088ae5d 100644 (file)
--- a/keybinds.txt.es
+++ b/keybinds.txt.es
@@ -46,7 +46,7 @@
 "+show_info"                            "información del servidor"
 "toggleconsole"                         "entrar en la consola"
 "disconnect"                            "desconectar"
-"quit"                                  "salir"
+"menu_showquitdialog"                   "salir"
 ""                                      ""
 ""                                      "Juego en equipo"
 "messagemode2"                          "chat de equipo"

diff --git a/keybinds.txt.fr b/keybinds.txt.fr
index c5cb242b18313d34341344a6e2dfbb9833476f3f..cc63be3a6e112ef2901703465f95ed00ec85e716 100644 (file)
--- a/keybinds.txt.fr
+++ b/keybinds.txt.fr
@@ -46,7 +46,7 @@
 "+show_info"                            "information serveur"
 "toggleconsole"                         "ouvrir la console"
 "disconnect"                            "se déconnecter"
-"quit"                                  "quitter"
+"menu_showquitdialog"                   "quitter"
 ""                                      ""
 ""                                      "Équipe"
 "messagemode2"                          "chat d'équipe"

diff --git a/keybinds.txt.hu b/keybinds.txt.hu
index d20eec65d6936ee10f64387433f1e39c73a2657c..618b079f6b03ec0456338760c5524c1e1fd93cb4 100644 (file)
--- a/keybinds.txt.hu
+++ b/keybinds.txt.hu
@@ -46,7 +46,7 @@
 "+show_info"                            "kiszolgáló info"
 "toggleconsole"                         "konzolba lépés"
 "disconnect"                            "lekapcsolodás"
-"quit"                                  "kilépés"
+"menu_showquitdialog"                   "kilépés"
 ""                                      ""
 ""                                      "Csapatjáték"
 "messagemode2"                          "csapat beszélgetés"

diff --git a/keybinds.txt.it b/keybinds.txt.it
index 82baa6e536b5e892be955e44e8e48058e2357c01..68c044acc188055ac621ef8d66fe34e6a76d8c1d 100644 (file)
--- a/keybinds.txt.it
+++ b/keybinds.txt.it
@@ -46,7 +46,7 @@
 "+show_info"                            "info del server"
 "toggleconsole"                         "apri console"
 "disconnect"                            "disconnetti"
-"quit"                                  "esci"
+"menu_showquitdialog"                   "esci"
 ""                                      ""
 ""                                      "Teamplay"
 "messagemode2"                          "chat di squadra"

diff --git a/keybinds.txt.ru b/keybinds.txt.ru
index ed46d02f174cc6a053832a08a0572f5300b1b55d..ee484cf155b94dd534b8bfd0d94b07c5a4e7bfc3 100644 (file)
--- a/keybinds.txt.ru
+++ b/keybinds.txt.ru
@@ -46,7 +46,7 @@
 "+show_info"                            "сведения о сервере"
 "toggleconsole"                         "открыть консоль"
 "disconnect"                            "отключиться"
-"quit"                                  "выйти"
+"menu_showquitdialog"                   "выйти"
 ""                                      ""
 ""                                      "Командная игра"
 "messagemode2"                          "чат команды"

diff --git a/keybinds.txt.uk b/keybinds.txt.uk
index 2772c16bd10b7db55fef6728de2b8dfe8dee8131..9284c172e91a7ad131de0cd86582136c82151ee7 100644 (file)
--- a/keybinds.txt.uk
+++ b/keybinds.txt.uk
@@ -46,7 +46,7 @@
 "+show_info"                            "відомості про сервер"
 "toggleconsole"                         "увійти в консоль"
 "disconnect"                            "роз'єднатися"
-"quit"                                  "вийти"
+"menu_showquitdialog"                   "вийти"
 ""                                      ""
 ""                                      "Командна гра"
 "messagemode2"                          "командний чат"

diff --git a/tooltips.db b/tooltips.db
index 5e2a0e83b1c7014ab6b1f6e04492c703cbd57ddd..cc121df0325a90eb2153f5242cda694f3903cdec 100644 (file)
--- a/tooltips.db
+++ b/tooltips.db
@@ -100,6 +100,7 @@
 \vid_bitsperpixel\How many bits per pixel (BPP) to render at, 32 is recommended
 \vid_fullscreen\Enable fullscreen mode (default: enabled)
 \vid_vsync\Enable vertical synchronization to prevent tearing, will cap your fps to the screen refresh rate (default: disabled)
+\gl_texture_anisotropy\Anisotropic filtering quality (default: 1x)
 \r_glsl\Enable OpenGL 2.0 pixel shaders for lightning (default: enabled)
 \gl_vbo\Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering (default: Vertex and Triangles)
 \r_depthfirst\Eliminate overdraw by rendering a depth-only version of the scene before the normal rendering starts (default: disabled)
@@ -129,7 +130,6 @@
 \cl_gentle\Replace blood and gibs with content that does not have any gore effects (default: disabled)
 \cl_nogibs\Reduce the amount of gibs or remove them completely (default: lots)
 \v_kicktime\How long a view kick from damage lasts (default: 0)
-\gl_texture_anisotropy\Anisotropic filtering quality (default: 1x)
 \r_glsl_deluxemapping\Use per-pixel lighting effects (default: enabled)
 \r_shadow_gloss\Enable the use of glossmaps on textures supporting it (default: enabled)
 \gl_flashblend\Enable faster but uglier dynamic lights by rendering bright coronas instead of real dynamic lights (default: disabled)
@@ -147,8 +147,7 @@
 \r_coronas_occlusionquery\Fade coronas according to visibility (default: enabled)
 \r_bloom\Enable bloom effect, which brightens the neighboring pixels of very bright pixels. Has a big impact on performance. (default: disabled)
 \r_hdr\Higher quality version of bloom, which has a huge impact on performance. (default: disabled)
-\r_motionblur\Motion blur strength - 0.5 recommended
-\r_damageblur\Amount of motion blur when hurt - 0.4 recommended
+\r_motionblur\Motion blur strength - 0.4 recommended
 
 \XonoticSettingsDialog/Audio\Audio settings
 \mastervolume\-