Merge https://github.com/supertuxkart/stk-code into command-manager-prototype

Author: kimden

data/gui/screens/options/options_ui.stkgui

@@ -34,12 +34,20 @@
 
                 <!-- ************ SKIN CHOICE ************ -->
                 <div width="100%" height="fit" layout="horizontal-row">
-                    <spinner id="skinchoice" width="10f" align="center" />
+                    <spinner id="base_skinchoice" width="10f" align="center" />
                     <label height="100%" x="0" y="0" I18N="In the ui settings" text="Skin"/>
                 </div>
 
                 <spacer width="5" height="2%"/>
 
+                <div width="100%" height="fit" layout="horizontal-row">
+                    <spinner id="variant_skinchoice" width="10f" align="center" />
+                    <label height="100%" x="0" y="0" I18N="In the ui settings" text="Skin variant"/>
+                </div>
+
+                <spacer width="5" height="2%"/>
+
+                <!-- ************ MISC. CHOICE ************ -->
                 <div width="100%" height="fit" layout="horizontal-row">
                     <spinner id="minimap" width="10f" align="center" />
                     <label height="100%" x="0" y="0" I18N="In the ui settings" text="Minimap"/>
@@ -54,7 +62,7 @@
 
                 <spacer width="5" height="2%"/>
 
-                <!-- ************ GRAPHICAL EFFECTS SETTINGS ************ -->
+                <!-- ************ EXTRA UI ELEMENTS SETTINGS ************ -->
                 <div width="100%" height="fit" layout="horizontal-row">
                     <spinner id="camera_preset" width="10f" align="center" />
                     <label height="100%" x="0" y="0" I18N="In the ui settings" text="Camera"/>

data/shaders/sp_skinning.vert

@@ -1,4 +1,4 @@
-#ifdef TBO_DISABLED
+#ifdef SKINNING_TBO_DISABLED
 uniform sampler2D skinning_tex;
 #else
 uniform samplerBuffer skinning_tex;
@@ -58,7 +58,7 @@ void main()
     vec4 skinned_tangent = vec4(0.0);
     int skinning_offset = i_misc_data.x;
 
-#ifdef TBO_DISABLED
+#ifdef SKINNING_TBO_DISABLED
     mat4 joint_matrix =
         i_weight[0] * mat4(
         texelFetch(skinning_tex, ivec2(0, clamp(i_joint[0] + skinning_offset, 0, MAX_BONES)), 0),

data/shaders/sp_skinning_shadow.vert

@@ -1,6 +1,6 @@
 uniform int layer;
 
-#ifdef GL_ES
+#ifdef SKINNING_TBO_DISABLED
 uniform sampler2D skinning_tex;
 #else
 uniform samplerBuffer skinning_tex;
@@ -25,7 +25,7 @@ void main()
     vec4 skinned_position = vec4(0.0);
     int skinning_offset = i_misc_data.x;
 
-#ifdef GL_ES
+#ifdef SKINNING_TBO_DISABLED
     mat4 joint_matrix =
         i_weight[0] * mat4(
         texelFetch(skinning_tex, ivec2(0, clamp(i_joint[0] + skinning_offset, 0, MAX_BONES)), 0),

data/skins/SKIN_MAKING.md

@@ -0,0 +1,79 @@
+# Making a skin
+
+To make your own skin, the easiest way is to start with the files from a standard skin
+and modifying them as needed.
+
+There are two types of images : some will be simply stretched as a whole, others will
+have non-stretchable borders (you cannot choose which one you must use, it's hardcoded
+for each element type; though, as you will see below, for all "advanced stretching" images
+you can easily fake "simple stretch")
+
+All elements will have at least 2 properties :
+        type="X"                                sets what you're skinning with this entry
+        image="skinDirectory/imageName.png"     sets which image is used for this element
+
+Most elements also support states :
+        state="neutral"
+        state="focused"
+        state="down"
+You can thus give different looks for different states.  Not all widgets support all states,
+see entries and comments below to know what's supported.
+Note that checkboxes are an exception and have the following styles :
+    "neutral+unchecked"
+    "neutral+checked"
+    "focused+unchecked"
+    "focused+checked"
+    "deactivated+unchecked"
+    "deactivated+checked"
+
+"Advanced stretching" images are split this way :
+
+     +----+--------------------+----+
+     |    |                    |    |
+     +----+--------------------+----+
+     |    |                    |    |
+     |    |                    |    |     
+     |    |                    |    |     
+     +----+--------------------+----+
+     |    |                    |    | 
+     +----+--------------------+----+
+     
+The center border will be stretched in all directions. The 4 corners will not stretch at all.
+Horizontal borders will stretch horizontally, verticallt borders will stretch vertically.
+Use properties left_border="X" right_border="X" top_border="X" bottom_border="X" to specify
+the size of each border in pixels (setting all borders to '0' makes the whole image scaled).
+
+In some cases, you may not want vertical stretching to occur (like if the left and right sides
+of the image must not be stretched vertically, e.g. for the spinner). In this case, pass
+parameter preserve_h_aspect_ratios="true" to make the left and right areas stretch by keeping
+their aspect ratio.
+
+Some components may fill the full inner area with stuff; others will only take a smaller
+area at the center. To adjust for this, there are properties "hborder_out_portion" and "vborder_out_portion"
+that take a float from 0 to 1, representing the percentage of each border that goes out of the widget's
+area (this might include stuff like shadows, etc.). The 'h' one is for horizontal borders,
+the 'v' one is for vertical borders.
+
+Finnally : the image is split, as shown above, into 9 areas. In some cases, you may not want
+all areas to be rendered. Then you can pass parameter areas="body+left+right+top+bottom"
+and explicitely specify which parts you want to see. The 4 corner areas are only visible
+when the border that intersect at this corner are enabled.
+
+When there is a common="y" with image tag, the image will be loaded only from data/skins/common in stk-code.
+
+Any information not specified in the stkskin.xml file of a theme will be inherited from the specified
+base theme, if any. To specify a base theme, add base_theme="themename" to the `<skin>` tag.
+
+To use an icon theme, place the replacement icons (PNG or SVG) into [skin folder]/data/gui/icons
+STK will prefer these icons first, if not found it will fallback to icons from the base theme(s).
+
+For TTF specify the list like the following, for normal and digit ttf it will be added at the beginning of the
+font list in STK, so those TTF will be used first, and any missing characters will be rendered from the base
+theme font list. For color emoji ttf it will replace the base theme color emoji directly. You are not required
+to specify all types of ttf.
+
+```
+<advanced normal_ttf="xxx.ttf yyy.ttf"
+          digit_ttf="zzz.ttf"
+          color_emoji_ttf="www.ttf"/>
+```

data/skins/cartoon-coal/achievement.png

@@ -0,0 +1,30 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: SuperTuxKart
+Upstream-Contact:
+ Marianne Gagnon <[email protected]>
+ Jean-Manuel Clémençon <[email protected]>
+Source: https://supertuxkart.net
+
+Files:
+ glass_iconhighlight_focus.png
+ bubble.png
+Copyright: ???
+License: CC-BY-SA 3.0
+Comment: From peach skin
+
+Files:
+ src/Inter-UI-Black.ttf
+Copyright: Copyright 2018 The Inter UI project authors
+License: OFL 1.1 (SIL Open Font License, Version 1.1)
+Comment: Specifically using version 2.5 of the font, later versions have a different look
+
+Files:
+ src/NotoSans*
+Copyright: Copyright 2015-2016 Google Inc. All Rights Reserved.
+License: This Font Software is licensed under the SIL Open Font License, Version 1.1. This Font Software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the SIL Open Font License for the specific language, permissions and limitations governing your use of this Font Software.
+Comment: Bold/Black versions of the language-specific fonts used in the other skins
+
+Files: *
+Copyright: Copyright 2018-2020 LCP and QwertyChouskie
+License: CC-BY-SA 4.0
+Comment: Original style, most icons, and some elements by LCP, skin finished by QwertyChouskie