diff --git a/package.json b/package.json index 4c2d46c..f0484fc 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "react-tiny-bbcode": "^0.1.4", "react-window": "^1.8.6", "recharts": "^2.2.0", - "recplayer-react": "^1.6.4", + "recplayer-react": "^1.7.1", "styled-components": "^5.2.3", "universal-cookie": "^4.0.4", "use-debounce": "^6.0.1", diff --git a/src/components/Preview.jsx b/src/components/Preview.jsx index 400419c..0e5c2aa 100644 --- a/src/components/Preview.jsx +++ b/src/components/Preview.jsx @@ -36,6 +36,9 @@ export default function Preview({ diff --git a/src/components/Recplayer.jsx b/src/components/Recplayer.jsx index b6307b6..13e5c48 100644 --- a/src/components/Recplayer.jsx +++ b/src/components/Recplayer.jsx @@ -8,6 +8,7 @@ const Recplayer = props => { const { rec, lev, + shirt, width, height, controls, @@ -57,9 +58,9 @@ const Recplayer = props => { <> {RecPlayerReact && lev ? ( { `${config.dlUrl}battlereplay/${BattleIndex}` } lev={`${config.dlUrl}level/${levelIndex}`} + shirt={[ + `${config.dlUrl}shirt/${player?.Kuski?.KuskiIndex}`, + ]} autoPlay={autoPlayRecs ? 'if-visible' : 'no'} controls /> diff --git a/src/pages/battle/RightBarContainer.jsx b/src/pages/battle/RightBarContainer.jsx index aa25dd9..8c6e157 100644 --- a/src/pages/battle/RightBarContainer.jsx +++ b/src/pages/battle/RightBarContainer.jsx @@ -139,7 +139,7 @@ const RightBarContainer = props => {
Leader history
- {allBattleTimes !== null && allBattleTimes !== [] ? ( + {allBattleTimes !== null ? ( { replay.Time, )} lev={`${config.dlUrl}level/${e.LevelIndex}`} + shirt={[ + `${config.dlUrl}shirt/${replay.KuskiData.KuskiIndex}`, + ]} height={400} controls /> diff --git a/src/pages/cup/Team.jsx b/src/pages/cup/Team.jsx index b9f1bc1..9b17520 100644 --- a/src/pages/cup/Team.jsx +++ b/src/pages/cup/Team.jsx @@ -210,6 +210,7 @@ const Team = () => { replay.Time, )}${getMergeRecUri(e.CupIndex)}`} lev={`${config.dlUrl}level/${e.LevelIndex}`} + shirt={[`${config.dlUrl}shirt/${replay.KuskiData.KuskiIndex}`]} height={400} controls /> diff --git a/src/pages/help/tabs/programs.json b/src/pages/help/tabs/programs.json index f54a9f3..0c5d6b4 100644 --- a/src/pages/help/tabs/programs.json +++ b/src/pages/help/tabs/programs.json @@ -39,7 +39,7 @@ { "n": "SLE", "d": "Smibu's Level Editor, Replay Manager and Level Manager.", "l": "https://m-l.fi/files/Elmanager.zip" }, { "n": "Vectrast", "d": "Makes bmp from lev file and back.", "l": "https://up.elma.online/u/lqrhf9h280/vectrast.zip" }, { "n": "Verzio Maker", "d": "Converts Elma levs to Across levs in the Verzio file format - Moving objects. Made by sunl.", "l": "https://up.elma.online/u/59w4avs59h/Verzio_Maker.zip" }, - { "n": "ZLE", "d": "Zebra's Level Editor.", "l": "https://up.elma.online/u/ur73jygq8m/ZLE_v1.0.zip" } + { "n": "ZLE (v1.1)", "d": "Zebra's Level Editor.", "l": "https://up.elma.online/u/3hh7dzheve/ZLE_v1.1.zip" } ] }, { "name": "LGR", "items": [ { "n": "Change LGR", "d": "Change easily lgr before entering Elma.", "l": "https://up.elma.online/u/hj7mmpj2uv/chanlgrs.rar" }, @@ -70,7 +70,7 @@ { "n": "Elma Skip", "d": "Skips from 1 to 54 internal levels.", "l": "https://up.elma.online/u/h8r92ksknc/elmaskip.zip" }, { "n": "Elma Text", "d": "Changes text in game (Only for 1.0v).", "l": "https://up.elma.online/u/fwchur0m24/elmatext.zip" }, { "n": "Elma Ultimate Dvd", "d": "Collection of the best Elma (and Across) stuff made from 1997 to 2010.", "l": "https://mega.co.nz/#!mVNhWCDZ!DoDJ7BAVP-j9Ew6k2P4x-h6eOBkUv4uswbHgPebgGaM" }, - { "n": "EOL Reso Fix", "d": "Fixes high resolution problems.", "l": "https://up.elma.online/u/uf5r4w5eh2/eolresofix.exe" }, + { "n": "EOL Reso Fix", "d": "Fixes high resolution problems. Built-in in EOL v1.0.11 and newer.", "l": "https://up.elma.online/u/uf5r4w5eh2/eolresofix.exe" }, { "n": "EOL Shirts", "d": "Download latest user shirts (.bmp files for your bmp folder).", "l": "https://api.elma.online/dl/allshirts" }, { "n": "FEM photos", "d": "All images and videos from Finnish Elma Meetings.", "l": [ { "t": "2014", "l": "http://mm.1g.fi/kuvat/FEM2014" }, @@ -102,7 +102,7 @@ ] }, { "name": "Save/Load", "items": [ { "n": "milatools", "d": "Save Load patch made by milagros.", "l": "https://up.elma.online/u/ctnubl9aos/milatools.zip" }, - { "n": "okeSL", "d": "New save load tool made by jonsykkel. - v004a", "l": "https://up.elma.online/u/z9yw27s1bs/okesl004a.zip" }, + { "n": "okeSL (v006)", "d": "New save load tool made by jonsykkel.", "l": "https://up.elma.online/u/o9l724cfy1/okesl006.zip" }, { "n": "SL Key", "d": "Makes Smibu's Save Load patch keys to be configurable.", "l": "https://up.elma.online/u/uuu2g3rrvp/slkey.zip" }, { "n": "Smibu's Save Load Patch", "d": "Save Load patch made by Smibu.", "l": "https://up.elma.online/u/o3wm9zfq71/smibu_saveload_patch.zip" } ] } diff --git a/src/pages/kuski/Preview.jsx b/src/pages/kuski/Preview.jsx index 96e119d..f2bcb39 100644 --- a/src/pages/kuski/Preview.jsx +++ b/src/pages/kuski/Preview.jsx @@ -34,6 +34,7 @@ export default function Preview({ diff --git a/src/pages/replay/index.jsx b/src/pages/replay/index.jsx index 30ea4a7..64e0df7 100644 --- a/src/pages/replay/index.jsx +++ b/src/pages/replay/index.jsx @@ -200,6 +200,7 @@ const Replay = ({ ReplayUuid, RecFileName }) => { )} diff --git a/yarn.lock b/yarn.lock index d292289..96c8c79 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14620,10 +14620,10 @@ recompose@^0.27.1: react-lifecycles-compat "^3.0.2" symbol-observable "^1.0.4" -recplayer-react@^1.6.4: - version "1.6.4" - resolved "https://registry.yarnpkg.com/recplayer-react/-/recplayer-react-1.6.4.tgz#bd9543180a7e6d90b8fc083ce4564e36b7ce40fd" - integrity sha512-Z/4CA4kM9MEg34UKSP0s1+Dh22D8qMOIGyF+BO+tVhVqwfMxeS9ruLWP0e1ZLxMwsitcTzrV1XLJeqEZ1E0sMw== +recplayer-react@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/recplayer-react/-/recplayer-react-1.7.1.tgz#c3f8cc4eaaf8bca9e0492c412c2618563a156cd0" + integrity sha512-eor8M+wMu4J8+wcvWj+rfad2Y3/BjWNWzgRxdrUcdderVS9Cclwxiy1vA+7sVyJYshiwRUGkX8tZgd/amSgVOQ== recursive-readdir@2.2.2: version "2.2.2"