From 7a50205cd181bfc0622681ee8658a24895065393 Mon Sep 17 00:00:00 2001 From: louis Date: Wed, 6 Jun 2018 02:09:53 +0900 Subject: [PATCH 1/6] translations submodule: track branch use --remote in the future --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 2824128..11fbc2a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "Js/Translations"] path = Js/Translations url = https://git.poweris.moe/xdutranslations.git + branch = . From c350654ca27cdad40d7c8d42832acd21fe59c061 Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 29 Dec 2018 10:33:48 -0500 Subject: [PATCH 2/6] json: update bgmloop --- Js/BgmLoop.json | 117 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/Js/BgmLoop.json b/Js/BgmLoop.json index 94c06ed..1e0aaa2 100644 --- a/Js/BgmLoop.json +++ b/Js/BgmLoop.json @@ -324,6 +324,19 @@ "seconds": 0.0 } }, + "music_adam_weishaupt": { + "duration": 73.6201875, + "loop_end": { + "samples_48k": 3533703, + "samples_native": 2355802, + "seconds": 73.6188125 + }, + "loop_start": { + "samples_48k": 393648, + "samples_native": 262432, + "seconds": 8.201 + } + }, "music_apple": { "duration": 86.01065625, "loop_end": { @@ -376,6 +389,19 @@ "seconds": 18.59 } }, + "music_change_the_future": { + "duration": 119.41009375, + "loop_end": { + "samples_48k": 5731599, + "samples_native": 3821066, + "seconds": 119.4083125 + }, + "loop_start": { + "samples_48k": 1972320, + "samples_native": 1314880, + "seconds": 41.09 + } + }, "music_daisukisukisugi": { "duration": 93.21253125, "loop_end": { @@ -454,6 +480,19 @@ "seconds": 49.866 } }, + "music_ewigarbunt": { + "duration": 94.56709375, + "loop_end": { + "samples_48k": 4539136, + "samples_native": 3026091, + "seconds": 94.56534375 + }, + "loop_start": { + "samples_48k": 532224, + "samples_native": 354816, + "seconds": 11.088 + } + }, "music_first_love_song": { "duration": 104.9476875, "loop_end": { @@ -493,6 +532,19 @@ "seconds": 55.612 } }, + "music_fuugetsuno_shissou": { + "duration": 102.51465625, + "loop_end": { + "samples_48k": 4920636, + "samples_native": 3280424, + "seconds": 102.51325 + }, + "loop_start": { + "samples_48k": 1547376, + "samples_native": 1031584, + "seconds": 32.237 + } + }, "music_gekisou_gungnir": { "duration": 100.545375, "loop_end": { @@ -688,6 +740,19 @@ "seconds": 29.179 } }, + "music_hanasaku_yuuki": { + "duration": 98.078, + "loop_end": { + "samples_48k": 4707648, + "samples_native": 3138432, + "seconds": 98.076 + }, + "loop_start": { + "samples_48k": 1034160, + "samples_native": 689440, + "seconds": 21.545 + } + }, "music_hidamari_memoria": { "duration": 107.5283125, "loop_end": { @@ -701,6 +766,19 @@ "seconds": 17.948 } }, + "music_hitsuai_dyuoshauto": { + "duration": 112.36075, + "loop_end": { + "samples_48k": 5393221, + "samples_native": 3595481, + "seconds": 112.35878125 + }, + "loop_start": { + "samples_48k": 1906080, + "samples_native": 1270720, + "seconds": 39.71 + } + }, "music_junpaku_innocent": { "duration": 118.195375, "loop_end": { @@ -714,6 +792,19 @@ "seconds": 42.942 } }, + "music_kaban_no_kakushigoto": { + "duration": 80.6815, + "loop_end": { + "samples_48k": 3872619, + "samples_native": 2581746, + "seconds": 80.6795625 + }, + "loop_start": { + "samples_48k": 544176, + "samples_native": 362784, + "seconds": 11.337 + } + }, "music_kimitoiu_otokanade_tsukirumade": { "duration": 95.7555, "loop_end": { @@ -1052,6 +1143,19 @@ "seconds": 50.56 } }, + "music_souyoku_no_wingbeat": { + "duration": 150.00028125, + "loop_end": { + "samples_48k": 7199934, + "samples_native": 4799956, + "seconds": 149.998625 + }, + "loop_start": { + "samples_48k": 3152256, + "samples_native": 2101504, + "seconds": 65.672 + } + }, "music_stand_up_ready": { "duration": 111.54221875, "loop_end": { @@ -1104,6 +1208,19 @@ "seconds": 24.508 } }, + "music_tsunaida_tedakega_tsunagumono": { + "duration": 88.55775, + "loop_end": { + "samples_48k": 4250697, + "samples_native": 2833798, + "seconds": 88.5561875 + }, + "loop_start": { + "samples_48k": 731760, + "samples_native": 487840, + "seconds": 15.245 + } + }, "music_waikyou_shenshoujin": { "duration": 117.59053125, "loop_end": { From 64d452c7db4152f9f056981731e1f360d808b543 Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 29 Dec 2018 10:34:49 -0500 Subject: [PATCH 3/6] lang: experimental: enable russian language --- Js/Main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Js/Main.js b/Js/Main.js index 19b5d84..99c72b7 100644 --- a/Js/Main.js +++ b/Js/Main.js @@ -10,8 +10,8 @@ const shaders = new Shaders(); const textFunc = new TextFunctions(); let audio = undefined; //Cant create a audio context without user input. const player = new Player(pixiApp, utage, textFunc, audio, shaders); -const languages = ["eng", "jpn"]; -const version = "YameteTomete XDUPlayer V1.2.0"; +const languages = ["eng", "jpn", "rus"]; +const version = "YameteTomete XDUPlayer V1.2.1"; let bodyLoaded = false; let utageLoaded = false; let languagesLoaded = false; From 62b22d9f965ea2a02ff51121726c4f1571320699 Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 29 Dec 2018 11:00:00 -0500 Subject: [PATCH 4/6] russian: add font --- Css/main.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Css/main.css b/Css/main.css index 94c7144..b393e69 100644 --- a/Css/main.css +++ b/Css/main.css @@ -39,6 +39,11 @@ src: url(../Fonts/Orbitron Medium.woff2) format('woff'); } +@font-face { + font-family: PTSans; + src: url(../Fonts/PTSans.woff2) format('woff'); +} + /*@font-face { font-family: SourceSansVariable-Roman; src: url(../Fonts/SourceSansVariable-Roman.woff2) format('woff'); @@ -77,6 +82,8 @@ body { margin: 0; height: 100%; } #text-container.jpn { font-family: 'FOT-RodinNTLGPro'; } +#text-container.rus { font-family: 'PTSans'; } + #text-container #fullscreen-button { position: absolute; top: 0.5rem; left: 0.5rem; font-size: 30px; line-height: 30px; opacity: 0.35; z-index: 11; } #text-container #title { position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center; font-size: 20px; transition: opacity 0.3s; cursor: default; user-select: none; } @@ -160,4 +167,4 @@ body { margin: 0; height: 100%; } @media screen and (max-height: 600px) { #mission-modal #mission-detail { display: none; } #mission-modal #mission-icon { display: block; max-height: 20%; margin: 10px 0 10px 0; object-fit: contain; } -} \ No newline at end of file +} From 8933ba986a1bd42c7d44dc8134159cce2a2ba9eb Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 29 Dec 2018 12:02:23 -0500 Subject: [PATCH 5/6] urlparams: add lang parameter --- Js/Main.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Js/Main.js b/Js/Main.js index 99c72b7..55c82f7 100644 --- a/Js/Main.js +++ b/Js/Main.js @@ -33,9 +33,9 @@ function onBodyLoaded() { bodyLoaded = true; document.getElementById("title-tag").innerText = version; document.addEventListener('webkitfullscreenchange', onFullScreenChange, false); - document.addEventListener('mozfullscreenchange', onFullScreenChange, false); - document.addEventListener('fullscreenchange', onFullScreenChange, false); - document.addEventListener('MSFullscreenChange', onFullScreenChange, false); + document.addEventListener('mozfullscreenchange', onFullScreenChange, false); + document.addEventListener('fullscreenchange', onFullScreenChange, false); + document.addEventListener('MSFullscreenChange', onFullScreenChange, false); } (function startLoad() { @@ -77,12 +77,15 @@ function onAllLoaded(success) { document.getElementById('parent-container').style.cssText = "opacity: 1;"; onWindowResize(); window.addEventListener("resize", onWindowResize); - checkQueryParameters(); + if(urlParams['mstid'] && urlParams['id'] && utage.groupedMissions[urlParams['mstid']] && utage.groupedMissions[urlParams['mstid']].Missions[urlParams['id']]) { + document.getElementById('play-from-query').style.cssText = "position: fixed; z-index: 15; text-align: center; top: 50%; left: 50%; display: block;"; + } }, 0); } function loadLocalStorage() { try { + urlParams = commonFunctions.readQueryParameters(); //audio volume = localStorage.getItem('volume') || 0.5; volume = Number(volume); @@ -100,7 +103,7 @@ function loadLocalStorage() { document.getElementById('mute-button').innerText = "🔊"; } //language - let lang = localStorage.getItem('language') || "eng"; + let lang = urlParams['lang'] || localStorage.getItem('language') || "eng"; if(languages.includes(lang)) { selectedLang = lang; } @@ -153,13 +156,6 @@ function buildLanguageList() { selectBox.value = selectedLang; } -function checkQueryParameters() { - urlParams = commonFunctions.readQueryParameters(); - if(urlParams['mstid'] && urlParams['id'] && utage.groupedMissions[urlParams['mstid']] && utage.groupedMissions[urlParams['mstid']].Missions[urlParams['id']]) { - document.getElementById('play-from-query').style.cssText = "position: fixed; z-index: 15; text-align: center; top: 50%; left: 50%; display: block;"; - } -} - function playFromQuery(event) { missionChanged(urlParams['mstid'], urlParams['id']); document.getElementById('play-from-query').style.cssText = "display: none;"; From dbf530a333a440975e230a1af37167f1e3c9a643 Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 29 Dec 2018 12:45:27 -0500 Subject: [PATCH 6/6] urlparams: rewrite --- Js/Main.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Js/Main.js b/Js/Main.js index 55c82f7..05372c4 100644 --- a/Js/Main.js +++ b/Js/Main.js @@ -77,9 +77,7 @@ function onAllLoaded(success) { document.getElementById('parent-container').style.cssText = "opacity: 1;"; onWindowResize(); window.addEventListener("resize", onWindowResize); - if(urlParams['mstid'] && urlParams['id'] && utage.groupedMissions[urlParams['mstid']] && utage.groupedMissions[urlParams['mstid']].Missions[urlParams['id']]) { - document.getElementById('play-from-query').style.cssText = "position: fixed; z-index: 15; text-align: center; top: 50%; left: 50%; display: block;"; - } + checkQueryParameters(); }, 0); } @@ -156,6 +154,13 @@ function buildLanguageList() { selectBox.value = selectedLang; } +function checkQueryParameters() { + urlParams = commonFunctions.readQueryParameters(); + if(urlParams['mstid'] && urlParams['id'] && utage.groupedMissions[urlParams['mstid']] && utage.groupedMissions[urlParams['mstid']].Missions[urlParams['id']]) { + document.getElementById('play-from-query').style.cssText = "position: fixed; z-index: 15; text-align: center; top: 50%; left: 50%; display: block;"; + } +} + function playFromQuery(event) { missionChanged(urlParams['mstid'], urlParams['id']); document.getElementById('play-from-query').style.cssText = "display: none;";