Merge 1905cb9e5b into d265057591

CMakeLists.txt

@@ -1377,6 +1377,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
@@ -1688,6 +1689,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
@@ -1975,10 +2100,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
@@ -1987,6 +2115,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
@@ -2137,6 +2266,7 @@ if(CLIENT)
     demoedit.cpp
     demoedit.h
     discord.cpp
+    enums.h
     favorites.cpp
     friends.cpp
     friends.h
@@ -2158,6 +2288,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
@@ -2226,6 +2357,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
@@ -2242,6 +2374,8 @@ if(CLIENT)
     components/scoreboard.h
     components/skins.cpp
     components/skins.h
+    components/skins7.cpp
+    components/skins7.h
     components/sounds.cpp
     components/sounds.h
     components/spectator.cpp
@@ -2281,6 +2415,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/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"
+	}}
+}

data/skins7/bumbler.json

@@ -0,0 +1,38 @@
+{"skin": {
+	"body": {
+		"filename": "raccoon",
+		"custom_colors": "true",
+		"hue": 150,
+		"sat": 16,
+		"lgt": 29
+	},
+	"marking": {
+		"filename": "setisu",
+		"custom_colors": "true",
+		"hue": 34,
+		"sat": 183,
+		"lgt": 220,
+		"alp": 96
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 27,
+		"sat": 138,
+		"lgt": 158
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 28,
+		"sat": 103,
+		"lgt": 143
+	},
+	"eyes": {
+		"filename": "colorable",
+		"custom_colors": "true",
+		"hue": 28,
+		"sat": 107,
+		"lgt": 54
+	}}
+}

data/skins7/cammo.json

@@ -0,0 +1,35 @@
+{"skin": {
+	"body": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 81,
+		"sat": 101,
+		"lgt": 70
+	},
+	"marking": {
+		"filename": "cammo2",
+		"custom_colors": "true",
+		"hue": 76,
+		"sat": 97,
+		"lgt": 45,
+		"alp": 255
+	},
+	"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/cammostripes.json

@@ -0,0 +1,35 @@
+{"skin": {
+	"body": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 81,
+		"sat": 101,
+		"lgt": 70
+	},
+	"marking": {
+		"filename": "cammostripes",
+		"custom_colors": "true",
+		"hue": 29,
+		"sat": 142,
+		"lgt": 0,
+		"alp": 255
+	},
+	"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/cavebat.json

@@ -0,0 +1,38 @@
+{"skin": {
+	"body": {
+		"filename": "bat",
+		"custom_colors": "true",
+		"hue": 16,
+		"sat": 167,
+		"lgt": 185
+	},
+	"marking": {
+		"filename": "belly2",
+		"custom_colors": "true",
+		"hue": 10,
+		"sat": 39,
+		"lgt": 45,
+		"alp": 152
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 10,
+		"sat": 45,
+		"lgt": 72
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 14,
+		"sat": 123,
+		"lgt": 156
+	},
+	"eyes": {
+		"filename": "colorable",
+		"custom_colors": "true",
+		"hue": 8,
+		"sat": 112,
+		"lgt": 47
+	}}
+}

data/skins7/default.json

@@ -0,0 +1,27 @@
+{"skin": {
+	"body": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 27,
+		"sat": 111,
+		"lgt": 116
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 27,
+		"sat": 117,
+		"lgt": 158
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 28,
+		"sat": 135,
+		"lgt": 62
+	},
+	"eyes": {
+		"filename": "standard",
+		"custom_colors": "false"
+	}}
+}

data/skins7/force.json

@@ -0,0 +1,38 @@
+{"skin": {
+	"body": {
+		"filename": "force",
+		"custom_colors": "true",
+		"hue": 24,
+		"sat": 19,
+		"lgt": 52
+	},
+	"marking": {
+		"filename": "wildpaint",
+		"custom_colors": "true",
+		"hue": 30,
+		"sat": 54,
+		"lgt": 3,
+		"alp": 54
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 27,
+		"sat": 0,
+		"lgt": 63
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 28,
+		"sat": 0,
+		"lgt": 0
+	},
+	"eyes": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 0,
+		"sat": 0,
+		"lgt": 0
+	}}
+}

data/skins7/fox.json

@@ -0,0 +1,38 @@
+{"skin": {
+	"body": {
+		"filename": "fox",
+		"custom_colors": "true",
+		"hue": 16,
+		"sat": 210,
+		"lgt": 107
+	},
+	"marking": {
+		"filename": "fox",
+		"custom_colors": "true",
+		"hue": 16,
+		"sat": 255,
+		"lgt": 242,
+		"alp": 227
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 16,
+		"sat": 180,
+		"lgt": 99
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 16,
+		"sat": 210,
+		"lgt": 114
+	},
+	"eyes": {
+		"filename": "colorable",
+		"custom_colors": "true",
+		"hue": 21,
+		"sat": 255,
+		"lgt": 96
+	}}
+}

data/skins7/greensward.json

@@ -0,0 +1,29 @@
+{"skin": {
+	"body": {
+		"filename": "greensward",
+		"custom_colors": "true",
+		"hue": 85,
+		"sat": 255,
+		"lgt": 0
+	},
+	"marking": {
+		"filename": "duodonny",
+		"custom_colors": "true",
+		"hue": 85,
+		"sat": 255,
+		"lgt": 20,
+		"alp": 255
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "false"
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "false"
+	},
+	"eyes": {
+		"filename": "standard",
+		"custom_colors": "false"
+	}}
+}

data/skins7/greycoon.json

@@ -0,0 +1,38 @@
+{"skin": {
+	"body": {
+		"filename": "raccoon",
+		"custom_colors": "true",
+		"hue": 14,
+		"sat": 0,
+		"lgt": 147
+	},
+	"marking": {
+		"filename": "coonfluff",
+		"custom_colors": "true",
+		"hue": 23,
+		"sat": 0,
+		"lgt": 105,
+		"alp": 255
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 27,
+		"sat": 0,
+		"lgt": 171
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 19,
+		"sat": 0,
+		"lgt": 152
+	},
+	"eyes": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 16,
+		"sat": 143,
+		"lgt": 50
+	}}
+}

data/skins7/greyfox.json

@@ -0,0 +1,38 @@
+{"skin": {
+	"body": {
+		"filename": "fox",
+		"custom_colors": "true",
+		"hue": 16,
+		"sat": 10,
+		"lgt": 67
+	},
+	"marking": {
+		"filename": "cammostripes",
+		"custom_colors": "true",
+		"hue": 23,
+		"sat": 21,
+		"lgt": 191,
+		"alp": 32
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 156,
+		"sat": 28,
+		"lgt": 19
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 32,
+		"sat": 12,
+		"lgt": 56
+	},
+	"eyes": {
+		"filename": "colorable",
+		"custom_colors": "true",
+		"hue": 28,
+		"sat": 90,
+		"lgt": 65
+	}}
+}

data/skins7/hippo.json

@@ -0,0 +1,42 @@
+{"skin": {
+	"body": {
+		"filename": "hippo",
+		"custom_colors": "true",
+		"hue": 174,
+		"sat": 176,
+		"lgt": 183
+	},
+	"marking": {
+		"filename": "hipbel",
+		"custom_colors": "true",
+		"hue": 191,
+		"sat": 0,
+		"lgt": 255,
+		"alp": 178
+	},
+	"decoration": {
+		"filename": "hair",
+		"custom_colors": "false"
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 189,
+		"sat": 72,
+		"lgt": 160
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 209,
+		"sat": 50,
+		"lgt": 36
+	},
+	"eyes": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 198,
+		"sat": 196,
+		"lgt": 45
+	}}
+}

data/skins7/koala.json

@@ -0,0 +1,35 @@
+{"skin": {
+	"body": {
+		"filename": "koala",
+		"custom_colors": "true",
+		"hue": 0,
+		"sat": 0,
+		"lgt": 184
+	},
+	"marking": {
+		"filename": "twinbelly",
+		"custom_colors": "true",
+		"hue": 21,
+		"sat": 12,
+		"lgt": 226,
+		"alp": 255
+	},
+	"hands": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 0,
+		"sat": 0,
+		"lgt": 184
+	},
+	"feet": {
+		"filename": "standard",
+		"custom_colors": "true",
+		"hue": 149,
+		"sat": 4,
+		"lgt": 71
+	},
+	"eyes": {
+		"filename": "standard",
+		"custom_colors": "false"
+	}}
+}

data/skins7/limedog.json

@@ -0,0 +1,40 @@
+{
+	"skin": {
+		"body": {
+			"filename": "dog",
+			"custom_colors": true,
+			"hue": 36,
+			"sat": 185,
+			"lgt": 169
+		},
+		"marking": {
+			"filename": "whisker",
+			"custom_colors": true,
+			"hue": 0,
+			"sat": 153,
+			"lgt": 255,
+			"alp": 255
+		},
+		"hands": {
+			"filename": "standard",
+			"custom_colors": true,
+			"hue": 12,
+			"sat": 178,
+			"lgt": 136
+		},
+		"feet": {
+			"filename": "standard",
+			"custom_colors": true,
+			"hue": 14,
+			"sat": 205,
+			"lgt": 112
+		},
+		"eyes": {
+			"filename": "negative",
+			"custom_colors": true,
+			"hue": 18,
+			"sat": 180,
+			"lgt": 118
+		}
+	}
+}

data/skins7/limekitty.json

@@ -0,0 +1,40 @@
+{
+	"skin": {
+		"body": {
+			"filename": "kitty",
+			"custom_colors": true,
+			"hue": 70,
+			"sat": 98,
+			"lgt": 195
+		},
+		"marking": {
+			"filename": "whisker",
+			"custom_colors": true,
+			"hue": 69,
+			"sat": 98,
+			"lgt": 224,
+			"alp": 255
+		},
+		"hands": {
+			"filename": "standard",
+			"custom_colors": true,
+			"hue": 58,
+			"sat": 104,
+			"lgt": 239
+		},
+		"feet": {
+			"filename": "standard",
+			"custom_colors": true,
+			"hue": 58,
+			"sat": 104,
+			"lgt": 239
+		},
+		"eyes": {
+			"filename": "negative",
+			"custom_colors": true,
+			"hue": 125,
+			"sat": 250,
+			"lgt": 0
+		}
+	}
+}