Merge branch 'upstream_master'

.clang-tidy

@@ -121,8 +121,6 @@ CheckOptions:
     value:           ms_
   - key:             readability-identifier-naming.StaticVariablePrefix
     value:           s_
-  - key:             readability-identifier-naming.StaticVariableIgnoredRegexp
-    value:           '^(NullAddr$|aDummyNameBuf$|aModifier$|EXPLANATION$|LocalClientId$|Dir$|LOCATION_NAMES$|EditorHotkeyWasPressed$|EditorHotKeyChecktime$|FrictionFraction$|LastTime$|SkidSoundTime$|NewVal$|aRotated$).*'
   - key:             readability-identifier-naming.ClassMethodCase
     value:           CamelCase
   - key:             readability-identifier-naming.ClassCase

CMakeLists.txt

@@ -1386,6 +1386,7 @@ set(EXPECTED_DATA
   countryflags/ZW.png
   countryflags/default.png
   countryflags/index.txt
+  deadtee.png
   debug_font.png
   editor/audio_source.png
   editor/automap/basic_freeze.rules
@@ -1699,6 +1700,130 @@ set(EXPECTED_DATA
   skins/whis.png
   skins/x_ninja.png
   skins/x_spec.png
+  skins7/beaver.json
+  skins7/bluekitty.json
+  skins7/bluestripe.json
+  skins7/body/bat.png
+  skins7/body/bear.png
+  skins7/body/beaver.png
+  skins7/body/dog.png
+  skins7/body/force.png
+  skins7/body/fox.png
+  skins7/body/greensward.png
+  skins7/body/hippo.png
+  skins7/body/kitty.png
+  skins7/body/koala.png
+  skins7/body/monkey.png
+  skins7/body/mouse.png
+  skins7/body/piglet.png
+  skins7/body/raccoon.png
+  skins7/body/spiky.png
+  skins7/body/standard.png
+  skins7/body/x_ninja.png
+  skins7/bot.png
+  skins7/brownbear.json
+  skins7/bumbler.json
+  skins7/cammo.json
+  skins7/cammostripes.json
+  skins7/cavebat.json
+  skins7/decoration/hair.png
+  skins7/decoration/twinbopp.png
+  skins7/decoration/twinmello.png
+  skins7/decoration/twinpen.png
+  skins7/decoration/unibop.png
+  skins7/decoration/unimelo.png
+  skins7/decoration/unipento.png
+  skins7/default.json
+  skins7/eyes/colorable.png
+  skins7/eyes/negative.png
+  skins7/eyes/standard.png
+  skins7/eyes/standardreal.png
+  skins7/eyes/x_ninja.png
+  skins7/feet/standard.png
+  skins7/force.json
+  skins7/fox.json
+  skins7/greensward.json
+  skins7/greycoon.json
+  skins7/greyfox.json
+  skins7/hands/standard.png
+  skins7/hippo.json
+  skins7/koala.json
+  skins7/limedog.json
+  skins7/limekitty.json
+  skins7/marking/bear.png
+  skins7/marking/belly1.png
+  skins7/marking/belly2.png
+  skins7/marking/blush.png
+  skins7/marking/bug.png
+  skins7/marking/cammo1.png
+  skins7/marking/cammo2.png
+  skins7/marking/cammostripes.png
+  skins7/marking/coonfluff.png
+  skins7/marking/donny.png
+  skins7/marking/downdony.png
+  skins7/marking/duodonny.png
+  skins7/marking/fox.png
+  skins7/marking/hipbel.png
+  skins7/marking/lowcross.png
+  skins7/marking/lowpaint.png
+  skins7/marking/marksman.png
+  skins7/marking/mice.png
+  skins7/marking/mixture1.png
+  skins7/marking/mixture2.png
+  skins7/marking/monkey.png
+  skins7/marking/panda1.png
+  skins7/marking/panda2.png
+  skins7/marking/purelove.png
+  skins7/marking/saddo.png
+  skins7/marking/setisu.png
+  skins7/marking/sidemarks.png
+  skins7/marking/singu.png
+  skins7/marking/stripe.png
+  skins7/marking/striped.png
+  skins7/marking/stripes.png
+  skins7/marking/stripes2.png
+  skins7/marking/thunder.png
+  skins7/marking/tiger1.png
+  skins7/marking/tiger2.png
+  skins7/marking/toptri.png
+  skins7/marking/triangular.png
+  skins7/marking/tricircular.png
+  skins7/marking/tripledon.png
+  skins7/marking/tritri.png
+  skins7/marking/twinbelly.png
+  skins7/marking/twincross.png
+  skins7/marking/twintri.png
+  skins7/marking/uppy.png
+  skins7/marking/warpaint.png
+  skins7/marking/warstripes.png
+  skins7/marking/whisker.png
+  skins7/marking/wildpaint.png
+  skins7/marking/wildpatch.png
+  skins7/marking/yinyang.png
+  skins7/monkey.json
+  skins7/paintgre.json
+  skins7/pandabear.json
+  skins7/panther.json
+  skins7/pento.json
+  skins7/piggy.json
+  skins7/pinky.json
+  skins7/raccoon.json
+  skins7/redbopp.json
+  skins7/redstripe.json
+  skins7/saddo.json
+  skins7/setisu.json
+  skins7/snowti.json
+  skins7/spiky.json
+  skins7/swardy.json
+  skins7/tiger.json
+  skins7/tooxy.json
+  skins7/toptri.json
+  skins7/twinbop.json
+  skins7/twintri.json
+  skins7/warmouse.json
+  skins7/warpaint.json
+  skins7/x_ninja.json
+  skins7/xmas_hat.png
   strong_weak.png
   themes/auto.png
   themes/autumn.png
@@ -1986,10 +2111,13 @@ set_src(ENGINE_SHARED GLOB_RECURSE src/engine/shared
   protocol_ex.cpp
   protocol_ex.h
   protocol_ex_msgs.h
+  protocolglue.cpp
+  protocolglue.h
   ringbuffer.cpp
   ringbuffer.h
   serverinfo.cpp
   serverinfo.h
+  sixup_translate_snapshot.cpp
   snapshot.cpp
   snapshot.h
   storage.cpp
@@ -1998,6 +2126,7 @@ set_src(ENGINE_SHARED GLOB_RECURSE src/engine/shared
   teehistorian_ex.cpp
   teehistorian_ex.h
   teehistorian_ex_chunks.h
+  translation_context.h
   uuid_manager.cpp
   uuid_manager.h
   video.cpp
@@ -2149,6 +2278,7 @@ if(CLIENT)
     demoedit.cpp
     demoedit.h
     discord.cpp
+    enums.h
     favorites.cpp
     friends.cpp
     friends.h
@@ -2170,6 +2300,7 @@ if(CLIENT)
     serverbrowser_http.h
     serverbrowser_ping_cache.cpp
     serverbrowser_ping_cache.h
+    sixup_translate_system.cpp
     smooth_time.cpp
     smooth_time.h
     sound.cpp
@@ -2240,6 +2371,7 @@ if(CLIENT)
     components/menus_demo.cpp
     components/menus_ingame.cpp
     components/menus_settings.cpp
+    components/menus_settings7.cpp
     components/menus_settings_assets.cpp
     components/menus_start.cpp
     components/motd.cpp
@@ -2264,6 +2396,8 @@ if(CLIENT)
     components/skinprofiles.h
     components/skins.cpp
     components/skins.h
+    components/skins7.cpp
+    components/skins7.h
     components/sounds.cpp
     components/sounds.h
     components/spectator.cpp
@@ -2307,6 +2441,8 @@ if(CLIENT)
     render.cpp
     render.h
     render_map.cpp
+    sixup_translate_game.cpp
+    sixup_translate_snapshot.cpp
     skin.h
     ui.cpp
     ui.h

data/languages/spanish.txt

@@ -1870,24 +1870,24 @@ Show only chat messages from team members
 
 [Spectating]
 Following %s
-== 
+== Viendo a %s
 
 Example of usage
-== 
+== Ejemplo de uso
 
 Round %d/%d
-== 
+== Ronda %d/%d
 
 [Spectators]
 %d others…
-== 
+== otros %d
 
 [Team and size]
 %d\n(%d/%d)
-== 
+== %d\n(%d/%d)
 
 Team %d (%d/%d)
-== 
+== Equipo %d (%d/%d)
 
 https://wiki.ddnet.org/wiki/Mapping
-== 
+== https://wiki.ddnet.org/wiki/Mapping/es

data/skins7/beaver.json

@@ -0,0 +1,38 @@
+{"skin": {
+	"body": {
+		"filename": "beaver",
+		"custom_colors": "true",
+		"hue": 19,
+		"sat": 105,
+		"lgt": 85
+	},
+	"marking": {
+		"filename": "twinbelly",
+		"custom_colors": "true",
+		"hue": 32,
+		"sat": 59,
+		"lgt": 209,
+		"alp": 198
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 16,
+		"sat": 133,
+		"lgt": 121
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 17,
+		"sat": 129,
+		"lgt": 38
+	},
+	"eyes": {
+		"filename": "colorable",
+		"custom_colors": "true",
+		"hue": 23,
+		"sat": 202,
+		"lgt": 45
+	}}
+}

data/skins7/bluekitty.json

@@ -0,0 +1,40 @@
+{
+	"skin": {
+		"body": {
+			"filename": "kitty",
+			"custom_colors": true,
+			"hue": 132,
+			"sat": 118,
+			"lgt": 184
+		},
+		"marking": {
+			"filename": "whisker",
+			"custom_colors": true,
+			"hue": 130,
+			"sat": 109,
+			"lgt": 219,
+			"alp": 255
+		},
+		"hands": {
+			"filename": "standard",
+			"custom_colors": true,
+			"hue": 120,
+			"sat": 82,
+			"lgt": 235
+		},
+		"feet": {
+			"filename": "standard",
+			"custom_colors": true,
+			"hue": 135,
+			"sat": 82,
+			"lgt": 233
+		},
+		"eyes": {
+			"filename": "negative",
+			"custom_colors": true,
+			"hue": 137,
+			"sat": 255,
+			"lgt": 0
+		}
+	}
+}

data/skins7/bluestripe.json

@@ -0,0 +1,31 @@
+{"skin": {
+	"body": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 155,
+		"sat": 116,
+		"lgt": 122
+	},
+	"marking": {
+		"filename": "stripes",
+		"custom_colors": "false"
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 11,
+		"sat": 117,
+		"lgt": 0
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 29,
+		"sat": 173,
+		"lgt": 87
+	},
+	"eyes": {
+		"filename": "standard",
+		"custom_colors": "false"
+	}}
+}

data/skins7/brownbear.json

@@ -0,0 +1,39 @@
+{"skin": {
+	"body": {
+		"filename": "bear",
+		"custom_colors": "true",
+		"hue": 16,
+		"sat": 133,
+		"lgt": 121
+	},
+	"marking": {
+		"filename": "bear",
+		"custom_colors": "true",
+		"hue": 17,
+		"sat": 110,
+		"lgt": 168,
+		"alp": 255
+	},
+	"decoration": {
+		"filename": "hair",
+		"custom_colors": "false"
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 16,
+		"sat": 133,
+		"lgt": 121
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 17,
+		"sat": 129,
+		"lgt": 38
+	},
+	"eyes": {
+		"filename": "standard",
+		"custom_colors": "false"
+	}}
+}