Merge branch 'master' into release

2018-06-11 21:26:34 -07:00 · 2018-06-11 21:26:34 -07:00 · 63478f494d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,8 @@
+## V1.1.0 (2018-06-08)
+
+Release for Bridal Gears.
+Added various sound effects for some hit effects so there is just nothing when they happen.
+Updated Pixi JS to 4.8.1.
+Support for custom missions.
+Made translations a submodule.
+Various fixes to xdu functions.
--- a/Js/Main.js
+++ b/Js/Main.js
@ -11,6 +11,7 @@ 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.1.0";
 let bodyLoaded = false;
 let utageLoaded = false;
 let languagesLoaded = false;
@ -30,6 +31,7 @@ const availableMstIds = [202070, 202013, 338001, 338002, 338003, 338004]//[20207

 function onBodyLoaded() {
 	bodyLoaded = true;
+	document.getElementById("title-tag").innerText = version;
 }

 (function startLoad() {
@ -240,6 +242,7 @@ function missionChanged(mstId, value) {
 		Promise.all(promises)
 		.then((success) => {
 			document.getElementById("playing-title").innerText = `${name} (${value})`;
+			document.getElementById("title-tag").innerText = name;
 			player.playFile()
 			.then((success) => {
 				if(currentMissionIndex !== currentMissionList.length - 1) {
@ -299,6 +302,7 @@ function resetMissions() {
 	currentMissionMst = 0;
 	document.getElementById("skip-button").style.cssText = "display: inline-block;";
 	document.getElementById("playing-title").innerText = 'None';
+	document.getElementById("title-tag").innerText = version;
 	document.getElementById('select-mission').value = '{Select}';
 }

@ -348,7 +352,7 @@ function openHelpModal(event) {
 	let cont = document.getElementById("modal-container");
 	cont.innerHTML = `
 	<div id="mission-modal" class="modal">
-		<span class="mission-title">YameteTomete XDUPlayer V1.1.0</span>
+		<span class="mission-title">${version}</span>
 		<div>
 			<div style="margin: 5px;">Browser Support:<br/>
 			Chromium: 57+, May work earlier with no audio<br/>
--- a/Js/Pixi.min.js
+++ b/Js/Pixi.min.js
--- a/Js/Translations
+++ b/Js/Translations
@ -1 +1 @@
-Subproject commit 9785aafc39465a98f1c60b0656133cba3ef44ce6
+Subproject commit 8ad734b4873e63ebc4d351eb3b443419b8977315
--- a/Js/XduMissions.json
+++ b/Js/XduMissions.json
@ -4400,6 +4400,15 @@
    "Name": "SI2-66:翼のバースデー2018",
    "SummaryText": "ついに来た翼の誕生日。サプライズを\n成功させるためのミッション開始ッ！\nしかし、気づかれそうになり……ッ！？"
  },
+  "201007911": {
+    "Path": "Asset/Utage/side02/Scenario/201007911.tsv.utage",
+    "MstId": 202071,
+    "Id": "201007911",
+    "LastUpdateTime": 636642672220000000,
+    "Type": 1,
+    "Name": "SI2-67:優雅なダンス",
+    "SummaryText": "社交ダンスの練習をしに来た奏のパートナー\nになったのは、まさかのマリアッ！\nいざ手を取り合って、Shall We Dance？"
+  },
  "202000111": {
    "Path": "Asset/Utage/side01/Scenario/202000111.tsv.utage",
    "MstId": 201001,
--- a/Player.html
+++ b/Player.html
@ -2,6 +2,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0" />
+		<title id="title-tag"></title>
 		<link rel="stylesheet" type="text/css" href="Css/generic.min.css">
 		<link rel="stylesheet" type="text/css" href="Css/main.min.css">
 		<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/4.5.1/pixi.min.js"></script> -->