Merge branch 'Mario/qc_physics_prehax' into 'master'

Merge branch Mario/qc_physics_prehax (XXL merge request)

Ported client side movement prediction to CSQC, both server and client physics are matched as a common physics.qc file.
Also moving triggers and movetypes code to common folders for better organization.

Only a few features have been added to the physics, namely fully predicted jet packs and support for slick (slippery) surfaces.

See merge request !123

diff --git a/gfx/menu/luma/background_ingame.tga b/gfx/menu/luma/background_ingame.tga
index 6ead9343b6db6e153e137f14058a946ee06600b8..547fa0904bc1d505929c97fda475cf947505df47 100644 (file)
Binary files a/gfx/menu/luma/background_ingame.tga and b/gfx/menu/luma/background_ingame.tga differ

diff --git a/gfx/menu/luma/colorbutton_c.tga b/gfx/menu/luma/colorbutton_c.tga
index 0d8eef1394ba987c9e1d75a077ef188403b21a1a..91f343e70339192491eab3787fa99dd32f3a2662 100644 (file)
Binary files a/gfx/menu/luma/colorbutton_c.tga and b/gfx/menu/luma/colorbutton_c.tga differ

diff --git a/gfx/menu/luma/colorbutton_f.tga b/gfx/menu/luma/colorbutton_f.tga
index 1a2fc860e99ad45d4fb86b05fb664b4888259e3a..0aa806b0418c56ed3bd97c0296d4f7cd6f73d89d 100644 (file)
Binary files a/gfx/menu/luma/colorbutton_f.tga and b/gfx/menu/luma/colorbutton_f.tga differ

diff --git a/gfx/menu/luma/colorbutton_n.tga b/gfx/menu/luma/colorbutton_n.tga
index 3498ad541b333959d3975dc904f0536786815ebb..bcba096780ef13ad713664c38997e05e2023dcd5 100644 (file)
Binary files a/gfx/menu/luma/colorbutton_n.tga and b/gfx/menu/luma/colorbutton_n.tga differ

diff --git a/gfx/menu/luma/gametype_nb.tga b/gfx/menu/luma/gametype_nb.tga
index 9bfb5adc4c65222fe7cf9a1ed2a917aed28de718..15d273634fa1caa6a8471eeaae9370f422e456e3 100644 (file)
Binary files a/gfx/menu/luma/gametype_nb.tga and b/gfx/menu/luma/gametype_nb.tga differ

diff --git a/gfx/menu/luma/nopreview_map.tga b/gfx/menu/luma/nopreview_map.tga
index 5fedc940b5bd40e948c57a070fd8c2b744bce924..5cd70916d5d2519328d9c0673857aa61148c6803 100644 (file)
Binary files a/gfx/menu/luma/nopreview_map.tga and b/gfx/menu/luma/nopreview_map.tga differ

diff --git a/gfx/menu/luma/skinvalues.txt b/gfx/menu/luma/skinvalues.txt
index 5a36d90e0722e389e135f6057c931b150dc673da..ed335aa1497156725ac413a9466389917556f0a4 100644 (file)
--- a/gfx/menu/luma/skinvalues.txt
+++ b/gfx/menu/luma/skinvalues.txt
@@ -35,7 +35,7 @@ ALPHA_CHARMAP_CHAR            0.85
 COLOR_CHARMAP_CHAR            '1 1 1'
 
 // crosshairpicker
-ALPHA_CROSSHAIRPICKER_CROSSHAIR 0.85
+ALPHA_CROSSHAIRPICKER_CROSSHAIR 0.6
 COLOR_CROSSHAIRPICKER_CROSSHAIR '1 1 1'
 
 // checkbox
@@ -122,8 +122,8 @@ COLOR_HEADER                  '0.96 0.99 1'
 FONTSIZE_NORMAL               12
 FONTSIZE_TITLE                16
 FONTSIZE_TOOLTIP              12
-HEIGHT_NORMAL                 1.5
-HEIGHT_TITLE                  1.5
+HEIGHT_NORMAL                 1.45
+HEIGHT_TITLE                  1.45
 HEIGHT_ZOOMEDTITLE            -1
 
 // inputbox
@@ -144,8 +144,8 @@ ALPHA_LISTBOX_SELECTED        1
 COLOR_LISTBOX_SELECTED        '0.97 0.56 0.27'
 ALPHA_LISTBOX_WAITING         0.8
 COLOR_LISTBOX_WAITING         '0.73 0.82 0.9'
-ALPHA_LISTBOX_FOCUSED         0.8
-FADEALPHA_LISTBOX_FOCUSED     0.4
+ALPHA_LISTBOX_FOCUSED         0.55
+FADEALPHA_LISTBOX_FOCUSED     0.3
 COLOR_LISTBOX_FOCUSED         '0.09 0.42 0.69'
 
 // mainmenu

diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt
index b9c69802e490e28ecc7b6b6cbebf24e3eb479204..d465f13c3661bc36bcc173160328d2390c9bebfe 100755 (executable)
--- a/gfx/menu/luminos/skinvalues.txt
+++ b/gfx/menu/luminos/skinvalues.txt
@@ -1,4 +1,4 @@
-title Luminos (default)
+title Luminos
 author sev
 
 // Colors: 'Red Green Blue'
@@ -32,9 +32,9 @@ HEIGHT_DIALOGBORDER             1
 
 // font sizes (used for everything)
 FONTSIZE_NORMAL                 12
-HEIGHT_NORMAL                   1.5
+HEIGHT_NORMAL                   1.45
 FONTSIZE_TITLE                  16
-HEIGHT_TITLE                    1.5
+HEIGHT_TITLE                    1.45
 HEIGHT_ZOOMEDTITLE              -1
 
 // general
@@ -109,7 +109,7 @@ ALPHA_LISTBOX_SELECTED          1
 COLOR_LISTBOX_WAITING           '1 1 1'
 ALPHA_LISTBOX_WAITING           0.5
 COLOR_LISTBOX_FOCUSED           '0 0.25 0.5'
-ALPHA_LISTBOX_FOCUSED           0.7
+ALPHA_LISTBOX_FOCUSED           0.6
 FADEALPHA_LISTBOX_FOCUSED       0.3
 
 // item: map list
@@ -223,7 +223,7 @@ ALPHA_CHARMAP_CHAR              0.85
 COLOR_CHARMAP_CHAR              '1 1 1'
 
 // item: crosshairpicker
-ALPHA_CROSSHAIRPICKER_CROSSHAIR 0.85
+ALPHA_CROSSHAIRPICKER_CROSSHAIR 0.6
 COLOR_CROSSHAIRPICKER_CROSSHAIR '1 1 1'
 
 // item: radio button

diff --git a/qcsrc/menu/xonotic/skinlist.qc b/qcsrc/menu/xonotic/skinlist.qc
index 46babc3f9517f5c9ae63c390e68e9d4bfdaa0960..7400b379f6c52fca110bb8387b7b9b21ef4845df 100644 (file)
--- a/qcsrc/menu/xonotic/skinlist.qc
+++ b/qcsrc/menu/xonotic/skinlist.qc
@@ -85,7 +85,7 @@ string XonoticSkinList_skinParameter(entity me, float i, float key)
 void XonoticSkinList_getSkins(entity me)
 {
        float glob, buf, i, n, fh;
-       string s;
+       string s, name;
 
        buf = buf_create();
        glob = search_begin("gfx/menu/*/skinvalues.txt", true, true);
@@ -100,7 +100,8 @@ void XonoticSkinList_getSkins(entity me)
        for(i = 0; i < n; ++i)
        {
                s = search_getfilename(glob, i);
-               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_NAME, substring(s, 9, strlen(s) - 24)); // the * part
+               name = substring(s, 9, strlen(s) - 24); // the * part
+               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_NAME, name);
                bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_TITLE, _("<TITLE>"));
                bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_AUTHOR, _("<AUTHOR>"));
                if(draw_PictureSize(strcat("/gfx/menu/", substring(s, 9, strlen(s) - 24), "/skinpreview")) == '0 0 0')
@@ -117,7 +118,12 @@ void XonoticSkinList_getSkins(entity me)
                {
                        // these two are handled by skinlist.qc
                        if(substring(s, 0, 6) == "title ")
-                               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_TITLE, substring(s, 6, strlen(s) - 6));
+                       {
+                               if (name == cvar_defstring("menu_skin"))
+                                       bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_TITLE, strcat(substring(s, 6, strlen(s) - 6), " (", _("Default"), ")"));
+                               else
+                                       bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_TITLE, substring(s, 6, strlen(s) - 6));
+                       }
                        else if(substring(s, 0, 7) == "author ")
                                bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_AUTHOR, substring(s, 7, strlen(s) - 7));
                }